daemonized-mode: add interactive shell support

$ targetcli --help
Usage: /usr/bin/targetcli [--version|--help|CMD|--disable-daemon|--interactive]
[...]
  -i, --interactive	Enter interactive shell in daemonized mode
See man page for more information.

$ targetcli -i
targetcli shell version 2.1.51
Entering targetcli interactive mode for daemonized approach.
Type 'exit' to quit.

/> pwd
/
/> cd /iscsi
/> pwd
/iscsi
/> exit

Fixes: #160
Signed-off-by: Prasanna Kumar Kalever <[email protected]>

Author: Prasanna Kumar Kalever

scripts/targetcli

@@ -67,12 +67,13 @@ class TargetCLI(ConfigShell):
                     }
 
 def usage():
-    print("Usage: %s [--version|--help|CMD|--disable-daemon]" % sys.argv[0], file=err)
+    print("Usage: %s [--version|--help|CMD|--disable-daemon|--interactive]" % sys.argv[0], file=err)
     print("  --version\t\tPrint version", file=err)
     print("  --help\t\tPrint this information", file=err)
     print("  CMD\t\t\tRun targetcli shell command and exit", file=err)
     print("  <nothing>\t\tEnter configuration shell", file=err)
     print("  --disable-daemon\tTurn-off the global auto use daemon flag", file=err)
+    print("  -i, --interactive\tEnter interactive shell in daemonized mode", file=err)
     print("See man page for more information.", file=err)
     sys.exit(-1)
 
@@ -159,9 +160,8 @@ def call_daemon(shell, req):
 
     sock.send(b'-END@OF@DATA-')
     sock.close()
-    sys.exit(0)
 
-def get_arguments(shell):
+def switch_to_daemon(shell, interactive):
     readline.set_completer(completer)
     readline.set_completer_delims('')
 
@@ -170,29 +170,43 @@ def get_arguments(shell):
     else:
         readline.parse_and_bind("tab: complete")
 
-    if len(sys.argv) > 1:
+    if len(sys.argv) > 1 and not interactive:
         command = " ".join(sys.argv[1:])
+        call_daemon(shell, command.encode())
+        sys.exit(0)
+
+    if interactive:
+        shell.con.display("targetcli shell version %s\n"
+                          "Entering targetcli interactive mode for daemonized approach.\n"
+                          "Type 'exit' to quit.\n"
+                          % targetcli_version)
     else:
-        inputs = []
         shell.con.display("targetcli shell version %s\n"
-                        "Entering targetcli batch mode for daemonized approach.\n"
-                        "Enter multiple commands separated by newline and "
-                        "type 'exit' to run them all in one go.\n"
-                        % targetcli_version)
-        while True:
-            shell.con.raw_write("/> ")
-            command = six.moves.input()
-            if command.lower() == "exit":
-                break
+                          "Entering targetcli batch mode for daemonized approach.\n"
+                          "Enter multiple commands separated by newline and "
+                          "type 'exit' to run them all in one go.\n"
+                          % targetcli_version)
+
+    inputs = []
+    while True:
+        real_exit=False
+        shell.con.raw_write("/> ")
+        command = six.moves.input()
+        if command.lower() == "exit":
+            real_exit=True
+        if not interactive:
             inputs.append(command)
-        command = '%'.join(inputs)  # delimit multiple commands with '%'
-
-    if not command:
-        sys.exit(1)
-
-    usage_version(command);
+            command = '%'.join(inputs)  # delimit multiple commands with '%'
+        if real_exit:
+            if interactive:
+                break
+            else:
+                call_daemon(shell, command.encode())
+                sys.exit(0)
+        if interactive:
+            call_daemon(shell, command.encode())
 
-    return command
+    sys.exit(0)
 
 def main():
     '''
@@ -219,13 +233,16 @@ def main():
         use_daemon = True
 
     disable_daemon=False
+    interactive_mode=False
     if len(sys.argv) > 1:
         usage_version(sys.argv[1])
         if sys.argv[1] in ("disable-daemon", "--disable-daemon"):
             disable_daemon=True
+        elif sys.argv[1] in ("interactive", "--interactive", "-i"):
+            interactive_mode=True
 
     if use_daemon and not disable_daemon:
-        call_daemon(shell, get_arguments(shell).encode())
+        switch_to_daemon(shell, interactive_mode)
         # does not return
 
     try:

targetclid.8

@@ -49,6 +49,29 @@ Enter multiple commands separated by newline and type 'exit' to run them all in
 /> exit
 .br
 .TP
+You can also use interactive mode,
+.br
+$ targetcli -i
+.br
+targetcli shell version 2.1.51
+.br
+Entering targetcli interactive mode for daemonized approach.
+.br
+Type 'exit' to quit.
+.br
+/> pwd
+.br
+/
+.br
+/> cd /iscsi
+.br
+/> pwd
+.br
+/iscsi
+.br
+/> exit
+.br
+.TP
 You can set preference to stop using daemonized mode even when the daemon is not running,
 .br
 $ targetcli --disable-daemon