Changeset 11816 in vbox for trunk/src/libs/xpcom18a4/python

Timestamp:

Aug 29, 2008 1:39:52 PM (16 years ago)

Author:

vboxsync

Message:

fixed minor issues with completion and others

File:

• trunk/src/libs/xpcom18a4/python/sample/vboxshell.py (modified) (6 diffs)

trunk/src/libs/xpcom18a4/python/sample/vboxshell.py

@@ -1 +1 @@
 #!/usr/bin/python
 #
-####################################################################################
-# This program is a simple interactive shell for VirtualBox. You can query         #
-# information and issue commands from a simple command line.                       #
-#                                                                                  #
-# It also provides you with examples on how to use VirtualBox' Python API.         #
-# This shell is even somewhat documented and supports TAB-completion and history   #
-# if you have Python readline installed.                                           #
-#                                                                                  #
-#                                                Enjoy.                            #
-####################################################################################
+#################################################################################
+# This program is a simple interactive shell for VirtualBox. You can query      #
+# information and issue commands from a simple command line.                    #
+#                                                                               #
+# It also provides you with examples on how to use VirtualBox' Python API.      #
+# This shell is even somewhat documented and supports TAB-completion and        #
+# history if you have Python readline installed.                                #
+#                                                                               #
+#                                                Enjoy.                         #
+#################################################################################
 #
 # To make it work, the following variables have to be set.
@@ -21 +21 @@
 # To allow library resolution
 #  export LD_LIBRARY_PATH=$VBOX_PROGRAM_PATH
-# Additionally, on 64-bit Solaris, you need to use 64-bit Python from /usr/bin/amd64/python
-# and due to quirks in native modules loading of Python do the following:
+# Additionally, on 64-bit Solaris, you need to use 64-bit Python from 
+# /usr/bin/amd64/python and due to quirks in native modules loading of 
+# Python do the following:
 #   mkdir $VBOX_PROGRAM_PATH/64
 #   ln -s $VBOX_PROGRAM_PATH/VBoxPython.so $VBOX_PROGRAM_PATH/64/VBoxPython.so 
@@ -81 +82 @@
             if word[:n] == text:
                 matches.append(word)
+            word = str(m.id)[1:-1]
+            if word[:n] == text:
+                    matches.append(word)
 
         return matches
@@ -165 +169 @@
     mach = None
     for m in getMachines(ctx):
-        if m.id == id or m.name == id:
+        if str(m.id) == '{'+id+'}' or m.name == id:
             mach = m
             break
@@ -175 +179 @@
         return None
     id = args[1]
-    return machById(ctx, id)
+    m = machById(ctx, id)
+    if m == None:
+        print "Machine '%s' is unknown, use list command to find available machines" %(id)
+    return m
 
 def helpCmd(ctx, args):
@@ -227 +234 @@
         type = args[2]
     else:
-        type = "gui"
+        type = "GUI/Qt4"
     startVm(ctx['mgr'], ctx['vb'], mach, type)
     return 0