When in wizard mode, allow local image dumping

[snf-image-creator] / image_creator / dialog_wizard.py

diff --git a/image_creator/dialog_wizard.py b/image_creator/dialog_wizard.py
index 8e122a8..f283320 100644 (file)
--- a/image_creator/dialog_wizard.py
+++ b/image_creator/dialog_wizard.py
@@ -44,6 +44,10 @@ from image_creator.output.cli import OutputWthProgress
 PAGE_WIDTH = 70
 
 
+class WizardExit(Exception):
+    pass
+
+
 class Wizard:
     def __init__(self, session):
         self.session = session
@@ -56,7 +60,10 @@ class Wizard:
     def run(self):
         idx = 0
         while True:
-            idx += self.pages[idx].run(self.session, idx, len(self.pages))
+            try:
+                idx += self.pages[idx].run(self.session, idx, len(self.pages))
+            except WizardExit:
+                return False
 
             if idx >= len(self.pages):
                 break
@@ -69,12 +76,46 @@ class Wizard:
 class WizardPage:
     NEXT = 1
     PREV = -1
-    EXIT = -255
 
     def run(self, session, index, total):
         raise NotImplementedError
 
 
+class WizardRadioListPage(WizardPage):
+
+    def __init__(self, name, message, choices, **kargs):
+        self.name = name
+        self.message = message
+        self.choices = choices
+        self.title = kargs['title'] if 'title' in kargs else ''
+        self.default = kargs['default'] if 'default' in kargs else 0
+
+    def run(self, session, index, total):
+        d = session['dialog']
+        w = session['wizard']
+
+        choices = []
+        for i in range(len(self.choices)):
+            default = 1 if i == self.default else 0
+            choices.append((self.choices[i][0], self.choices[i][1], default))
+
+        while True:
+            (code, answer) = d.radiolist(self.message, width=PAGE_WIDTH,
+                ok_label="Next", cancel="Back", choices=choices,
+                title="(%d/%d) %s" % (index + 1, total, self.title))
+
+            if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
+                return self.PREV
+
+            for i in range(len(choices)):
+                if self.choices[i] == answer:
+                    self.default = i
+                    w[name] = i
+                    break
+
+            return self.NEXT
+
+
 class WizardInputPage(WizardPage):
 
     def __init__(self, name, message, **kargs):
@@ -124,7 +165,7 @@ class WizardYesNoPage(WizardPage):
             if ret == d.DIALOG_CANCEL:
                 return self.PREV
             elif ret == d.DIALOG_EXTRA:
-                return self.EXIT
+                raise WizardExit
             elif ret == d.DIALOG_OK:
                 return self.NEXT
 
@@ -165,6 +206,7 @@ def wizard(session):
 
 
 def extract_image(session):
+    d = session['dialog']
     disk = session['disk']
     device = session['device']
     snapshot = session['snapshot']
@@ -177,7 +219,7 @@ def extract_image(session):
     device.out = out
     image_os.out = out
 
-    out.output()
+    out.clear()
 
     #Sysprep
     device.mount(False)
@@ -187,11 +229,13 @@ def extract_image(session):
 
     #Shrink
     size = device.shrink()
+
     metadata.update(device.meta)
+    metadata['DESCRIPTION'] = wizard['ImageDescription']
 
     #MD5
     md5 = MD5(out)
-    checksum = md5.compute(snapshot, size)
+    session['checksum'] = md5.compute(snapshot, size)
 
     #Metadata
     metastring = '\n'.join(
@@ -216,7 +260,7 @@ def extract_image(session):
                       remote_path="%s.%s" % (name, 'meta'))
         out.success('done')
         out.output("(4/4)  Uploading md5sum file...", False)
-        md5sumstr = '%s %s\n' % (checksum, name)
+        md5sumstr = '%s %s\n' % (session['checksum'], name)
         kamaki.upload(StringIO.StringIO(md5sumstr), size=len(md5sumstr),
                       remote_path="%s.%s" % (name, 'md5sum'))
         out.success('done')
@@ -226,7 +270,15 @@ def extract_image(session):
         kamaki.register(wizard['ImageName'], pithos_file, metadata)
         out.success('done')
         out.output()
+
     except ClientError as e:
         raise FatalError("Pithos client: %d %s" % (e.status, e.message))
 
+    msg = "The image was successfully uploaded and registered to " \
+          "~okeanos. Would you like to keep a local copy of the image?"
+    if not d.yesno(msg, width=PAGE_WIDTH):
+        getattr(__import__("image_creator.dialog_main",
+                fromlist=['image_creator']), "extract_image")(session)
+
+
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :