Bump version to 0.2.2
[snf-image-creator] / image_creator / dialog_wizard.py
index f283320..66f6bbf 100644 (file)
@@ -40,6 +40,7 @@ import StringIO
 from image_creator.kamaki_wrapper import Kamaki, ClientError
 from image_creator.util import MD5, FatalError
 from image_creator.output.cli import OutputWthProgress
+from image_creator.dialog_util import extract_image, update_background_title
 
 PAGE_WIDTH = 70
 
@@ -100,9 +101,11 @@ class WizardRadioListPage(WizardPage):
             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))
+            (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
@@ -131,9 +134,10 @@ class WizardInputPage(WizardPage):
 
         init = w[self.name] if self.name in w else self.init_value
         while True:
-            (code, answer) = d.inputbox(self.message, init=init,
-                width=PAGE_WIDTH, ok_label="Next", cancel="Back",
-                title="(%d/%d) %s" % (index + 1, total, self.title))
+            (code, answer) = \
+                d.inputbox(self.message, init=init,
+                           width=PAGE_WIDTH, ok_label="Next", cancel="Back",
+                           title="(%d/%d) %s" % (index + 1, total, self.title))
 
             if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
                 return self.PREV
@@ -159,8 +163,8 @@ class WizardYesNoPage(WizardPage):
 
         while True:
             ret = d.yesno(self.message, width=PAGE_WIDTH, ok_label="Yes",
-                    cancel="Back", extra_button=1, extra_label="Quit",
-                    title="(%d/%d) %s" % (index + 1, total, self.title))
+                          cancel="Back", extra_button=1, extra_label="Quit",
+                          title="(%d/%d) %s" % (index + 1, total, self.title))
 
             if ret == d.DIALOG_CANCEL:
                 return self.PREV
@@ -171,22 +175,31 @@ class WizardYesNoPage(WizardPage):
 
 
 def wizard(session):
+    init_account = Kamaki.get_account()
+    if init_account is None:
+        init_account = ""
+
+    init_token = Kamaki.get_token()
+    if init_token is None:
+        init_token = ""
 
     name = WizardInputPage("ImageName", "Please provide a name for the image:",
-                      title="Image Name", init=session['device'].distro)
+                           title="Image Name", init=session['device'].distro)
     descr = WizardInputPage("ImageDescription",
-        "Please provide a description for the image:",
-        title="Image Description", empty=True,
-        init=session['metadata']['DESCRIPTION'] if 'DESCRIPTION' in
-        session['metadata'] else '')
+                            "Please provide a description for the image:",
+                            title="Image Description", empty=True,
+                            init=session['metadata']['DESCRIPTION'] if
+                            'DESCRIPTION' in session['metadata'] else '')
     account = WizardInputPage("account",
-        "Please provide your ~okeanos account e-mail:",
-        title="~okeanos account information", init=Kamaki.get_account())
+                              "Please provide your ~okeanos account e-mail:",
+                              title="~okeanos account information",
+                              init=init_account)
     token = WizardInputPage("token",
-        "Please provide your ~okeanos account token:",
-        title="~okeanos account token", init=Kamaki.get_token())
+                            "Please provide your ~okeanos account token:",
+                            title="~okeanos account token",
+                            init=init_token)
 
-    msg = "Do you wish to continue with the image extraction process?"
+    msg = "All necessary information has been gathered. Confirm and Proceed."
     proceed = WizardYesNoPage(msg, title="Confirmation")
 
     w = Wizard(session)
@@ -198,14 +211,14 @@ def wizard(session):
     w.add_page(proceed)
 
     if w.run():
-        extract_image(session)
+        create_image(session)
     else:
         return False
 
     return True
 
 
-def extract_image(session):
+def create_image(session):
     d = session['dialog']
     disk = session['disk']
     device = session['device']
@@ -213,72 +226,76 @@ def extract_image(session):
     image_os = session['image_os']
     wizard = session['wizard']
 
-    out = OutputWthProgress(True)
-    #Initialize the output
-    disk.out = out
-    device.out = out
-    image_os.out = out
-
-    out.clear()
+    # Save Kamaki credentials
+    Kamaki.save_account(wizard['account'])
+    Kamaki.save_token(wizard['token'])
 
-    #Sysprep
-    device.mount(False)
-    image_os.do_sysprep()
-    metadata = image_os.meta
-    device.umount()
+    with_progress = OutputWthProgress(True)
+    out = disk.out
+    out.add(with_progress)
+    try:
+        out.clear()
 
-    #Shrink
-    size = device.shrink()
+        #Sysprep
+        device.mount(False)
+        image_os.do_sysprep()
+        metadata = image_os.meta
+        device.umount()
 
-    metadata.update(device.meta)
-    metadata['DESCRIPTION'] = wizard['ImageDescription']
+        #Shrink
+        size = device.shrink()
+        session['shrinked'] = True
+        update_background_title(session)
 
-    #MD5
-    md5 = MD5(out)
-    session['checksum'] = md5.compute(snapshot, size)
+        metadata.update(device.meta)
+        metadata['DESCRIPTION'] = wizard['ImageDescription']
 
-    #Metadata
-    metastring = '\n'.join(
-        ['%s=%s' % (key, value) for (key, value) in metadata.items()])
-    metastring += '\n'
+        #MD5
+        md5 = MD5(out)
+        session['checksum'] = md5.compute(snapshot, size)
 
-    out.output()
-    try:
-        out.output("Uploading image to pithos:")
-        kamaki = Kamaki(wizard['account'], wizard['token'], out)
-
-        name = "%s-%s.diskdump" % (wizard['ImageName'],
-                                   time.strftime("%Y%m%d%H%M"))
-        pithos_file = ""
-        with open(snapshot, 'rb') as f:
-            pithos_file = kamaki.upload(f, size, name,
-                                         "(1/4)  Calculating block hashes",
-                                         "(2/4)  Uploading missing blocks")
-
-        out.output("(3/4)  Uploading metadata file...", False)
-        kamaki.upload(StringIO.StringIO(metastring), size=len(metastring),
-                      remote_path="%s.%s" % (name, 'meta'))
-        out.success('done')
-        out.output("(4/4)  Uploading md5sum file...", False)
-        md5sumstr = '%s %s\n' % (session['checksum'], name)
-        kamaki.upload(StringIO.StringIO(md5sumstr), size=len(md5sumstr),
-                      remote_path="%s.%s" % (name, 'md5sum'))
-        out.success('done')
-        out.output()
+        #Metadata
+        metastring = '\n'.join(
+            ['%s=%s' % (key, value) for (key, value) in metadata.items()])
+        metastring += '\n'
 
-        out.output('Registring image to ~okeanos...', False)
-        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 " \
+        try:
+            out.output("Uploading image to pithos:")
+            kamaki = Kamaki(wizard['account'], wizard['token'], out)
+
+            name = "%s-%s.diskdump" % (wizard['ImageName'],
+                                       time.strftime("%Y%m%d%H%M"))
+            pithos_file = ""
+            with open(snapshot, 'rb') as f:
+                pithos_file = kamaki.upload(f, size, name,
+                                            "(1/4)  Calculating block hashes",
+                                            "(2/4)  Uploading missing blocks")
+
+            out.output("(3/4)  Uploading metadata file ...", False)
+            kamaki.upload(StringIO.StringIO(metastring), size=len(metastring),
+                          remote_path="%s.%s" % (name, 'meta'))
+            out.success('done')
+            out.output("(4/4)  Uploading md5sum file ...", False)
+            md5sumstr = '%s %s\n' % (session['checksum'], name)
+            kamaki.upload(StringIO.StringIO(md5sumstr), size=len(md5sumstr),
+                          remote_path="%s.%s" % (name, 'md5sum'))
+            out.success('done')
+            out.output()
+
+            out.output('Registering image with ~okeanos ...', False)
+            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))
+    finally:
+        out.remove(with_progress)
+
+    msg = "The image was successfully uploaded and registered with " \
           "~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)
-
+        extract_image(session)
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :