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

Timestamp:

Feb 22, 2011 10:59:08 AM (14 years ago)

Author:

vboxsync

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

70158

Message:

vboxshell: flow control and interrupts when running scripts

File:

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

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

@@ -181 +181 @@
     except KeyboardInterrupt:
         print "Interrupted."
+        ctx['interrupt'] = True
         if p.cancelable:
             print "Canceling task..."
@@ -489 +490 @@
 
     # We need to catch all exceptions here, to close file
+    except KeyboardInterrupt:
+        ctx['interrupt'] = True
     except:
         traceback.print_exc()
@@ -691 +694 @@
     try:
         ops[cmd]()
+    except KeyboardInterrupt:
+        ctx['interrupt'] = True
     except Exception, e:
         printErr(ctx,e)
@@ -1118 +1123 @@
         except KeyboardInterrupt:
             print "Interrupted."
+            ctx['interrupt'] = True
             if progress.cancelable:
                 progress.cancel()
@@ -1735 +1741 @@
    return 0
 
-
 def runScriptCmd(ctx, args):
     if (len(args) != 2):
@@ -1747 +1752 @@
 
     try:
-        for line in lf:
+        lines = lf.readlines()
+        ctx['scriptLine'] = 0
+        ctx['interrupt'] = False
+        while ctx['scriptLine'] < len(lines):
+            line = lines[ctx['scriptLine']]
+            ctx['scriptLine'] = ctx['scriptLine'] + 1
             done = runCommand(ctx, line)
-            if done != 0: break
+            if done != 0 or ctx['interrupt']:
+                break
+
     except Exception,e:
         printErr(ctx,e)
@@ -3156 +3168 @@
 
     cmdClosedVm(ctx, mach, lambda ctx,mach,a: mach.detachHostPciDevice(hostaddr))
+    return 0
+
+def gotoCmd(ctx, args):
+    if (len(args) < 2):
+        print "usage: goto line"
+        return 0
+
+    line = int(args[1])
+
+    ctx['scriptLine'] = line
+
     return 0
 
@@ -3246 +3269 @@
             'lspci': ['List PCI devices attached to the VM: lspci Win32', lspciCmd, 0],
             'attachpci': ['Attach host PCI device to the VM: attachpci Win32 01:00.0', attachpciCmd, 0],
-            'detachpci': ['Detach host PCI device from the VM: detachpci Win32 01:00.0', detachpciCmd, 0]
+            'detachpci': ['Detach host PCI device from the VM: detachpci Win32 01:00.0', detachpciCmd, 0],
+            'goto': ['Go to line in script (script-only)', gotoCmd, 0]
             }
 
@@ -3473 +3497 @@
            'typeInGuest': typeInGuest,
            '_machlist': None,
-           'prompt': g_prompt
+           'prompt': g_prompt,
+           'scriptLine': 0,
+           'interrupt': False
            }
     interpret(ctx)