Changeset 28756 in vbox for trunk

Timestamp:

Apr 26, 2010 3:27:50 PM (15 years ago)

Author:

vboxsync

Message:

vboxshell: more WS stuff

File:

• trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -153 +153 @@
     'magenta':'\033[35m'
     }
-def colored(str,color):
+def colored(string,color):
     if not g_hascolors:
-        return str
+        return string
     global term_colors
     col = term_colors.get(color,None)
     if col:
-        return col+str+'\033[0m'
-    else:
-        return str
+        return col+str(string)+'\033[0m'
+    else:
+        return string
 
 if g_hasreadline:
@@ -268 +268 @@
 
 def colVm(ctx,vm):
-    return colored(str(vm), 'blue')
+    return colored(vm, 'blue')
 
 def createVm(ctx,name,kind,base):
@@ -1335 +1335 @@
 def connectCmd(ctx, args):
     if (len(args) > 4):
-        print "usage: connect [url] [username] [passwd]"
+        print "usage: connect url <username> <passwd>"
         return 0
 
@@ -1357 +1357 @@
         passwd = ""
 
+    ctx['wsinfo'] = [url, user, passwd]
     vbox = ctx['global'].platform.connect(url, user, passwd)
     ctx['vb'] = vbox
@@ -1379 +1380 @@
 
     ctx['vb'] = None
+    return 0
+
+def reconnectCmd(ctx, args):
+    if ctx['wsinfo'] is None:
+        print "Never connected..."
+        return 0
+
+    try:
+        ctx['global'].platform.disconnect()
+    except:
+        pass
+
+    [url,user,passwd] = ctx['wsinfo']
+    ctx['vb'] = ctx['global'].platform.connect(url, user, passwd)
+    print "Running VirtualBox version %s" %(ctx['vb'].version)
     return 0
 
@@ -2155 +2171 @@
         print "Unknown command: '%s', type 'help' for list of known commands" %(c)
         return 0
+    if ctx['remote'] and ctx['vb'] is None:
+        if c not in ['connect', 'reconnect', 'help', 'quit']:
+            print "First connect to remote server with %s command." %(colored('connect', 'blue'))
+            return 0
     return ci[1](ctx, args)
 
@@ -2216 +2236 @@
 def interpret(ctx):
     if ctx['remote']:
-        commands['connect'] = ["Connect to remote VBox instance", connectCmd, 0]
+        commands['connect'] = ["Connect to remote VBox instance: connect http://server:18083 user password", connectCmd, 0]
         commands['disconnect'] = ["Disconnect from remote VBox instance", disconnectCmd, 0]
+        commands['reconnect'] = ["Reconnect to remote VBox instance", reconnectCmd, 0]
+        ctx['wsinfo'] = ["http://localhost:18083", "", ""]
 
     vbox = ctx['vb']