Changeset 21331 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 7, 2009 1:47:28 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49676

Message:

Python shell: adding shell command, repeat count for runScript

File:

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

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

@@ -236 +236 @@
     progress = vb.openRemoteSession(session, uuid, type, "")
     progress.waitForCompletion(-1)
-    completed = progress.completed
-    rc = int(progress.resultCode)
-    print "Completed:", completed, "rc:",hex(rc&0xffffffff)
+    rc = long(progress.resultCode)
+    #print "Completed:", progress.completed, "rc:",hex(rc&0xffffffff)
     if rc == 0:
         # we ignore exceptions to allow starting VM even if
@@ -333 +332 @@
     ops={'pause' :     lambda: console.pause(),
          'resume':     lambda: console.resume(),
-         'powerdown':  lambda: console.powerDown(),
+         'powerdown':  lambda: console.powerDown().waitForCompletion(-1),
          'powerbutton':  lambda: console.powerButton(),
          'stats':      lambda: guestStats(ctx, mach),
@@ -675 +674 @@
 
 def runScriptCmd(ctx, args):
-    if (len(args) != 2):
-        print "usage: runScript <script>"
-        return 0
+    import time
+    if (len(args) < 2 or len (args) > 4):
+        print "usage: runScript <script> <times> <pause>"
+        return 0
+
+    if len (args) >= 3:
+        times = int(args[2])
+        if g_verbose:
+            print "repeating %d times" %(times)
+    else:
+        times = 1
+
+    if len (args) >= 4:
+        pause = int(args[3])
+    else:
+        pause = 0
+    
     try:
         lf = open(args[1], 'r')
@@ -684 +697 @@
         return 0
 
+    script = []
     try:
         for line in lf:
-            done = runCommand(ctx, line)
-            if done != 0: break
+            script.append(line)
+
+        for i in range(times):
+            for line in script:
+                done = runCommand(ctx, line)
+                if done != 0: break
+            if g_verbose:
+                print "%d done" %(i)
+            if i != times - 1 and pause != 0:
+                time.sleep(pause)
     except Exception,e:
         print "error:",e
@@ -695 +717 @@
     return 0
 
+
+def runShellCmd(ctx, args):
+    if len (args) < 2:
+        print "usage: shell <command>"
+    expr = ' '.join(args[1:])
+    try:
+        os.system(expr)
+    except Exception,e:
+        print "error:",e
+        if g_verbose:
+                traceback.print_exc()
+    return 0
 
 aliases = {'s':'start',
@@ -728 +762 @@
             'showLog':['Show log file of the VM, : showLog Win32', showLogCmd, 0],
             'reloadExt':['Reload custom extensions: reloadExt', reloadExtCmd, 0],
-            'runScript':['Run VBox script: runScript script.vbox', runScriptCmd, 0],
+            'runScript':['Run VBox script: runScript script.vbox <times>', runScriptCmd, 0],
+            'shell':['Execute system shell command: shell ls -l', runShellCmd, 0],
             }