Implement a WizardExit exception in dialog_wizard
[snf-image-creator] / image_creator / dialog_main.py
index 6e1ea99..3082a1c 100644 (file)
@@ -39,36 +39,40 @@ import os
 import textwrap
 import signal
 import StringIO
+import optparse
 
 from image_creator import __version__ as version
 from image_creator.util import FatalError, MD5
-from image_creator.output.dialog import InitializationOutput, GaugeOutput
+from image_creator.output.dialog import GaugeOutput, InfoBoxOutput
 from image_creator.disk import Disk
 from image_creator.os_type import os_cls
 from image_creator.kamaki_wrapper import Kamaki, ClientError
 from image_creator.help import get_help_file
+from image_creator.dialog_wizard import wizard
 
 MSGBOX_WIDTH = 60
 YESNO_WIDTH = 50
 MENU_WIDTH = 70
 INPUTBOX_WIDTH = 70
 CHECKBOX_WIDTH = 70
+HELP_WIDTH = 70
+INFOBOX_WIDTH = 70
 
 CONFIGURATION_TASKS = [
- ("Partition table manipulation", ["FixPartitionTable"],
-  ["linux", "windows"]),
- ("File system resize",
-  ["FilesystemResizeUnmounted", "FilesystemResizeMounted"],
-  ["linux", "windows"]),
- ("Swap partition configuration", ["AddSwap"], ["linux"]),
- ("SSH keys removal", ["DeleteSSHKeys"], ["linux"]),
- ("Temporal RDP disabling", ["DisableRemoteDesktopConnections"], ["windows"]),
- ("SELinux relabeling at next boot", ["SELinuxAutorelabel"],
-  ["linux"]),
- ("Hostname/Computer Name assignment", ["AssignHostname"],
-  ["windows", "linux"]),
- ("Password change", ["ChangePassword"], ["windows", "linux"]),
- ("File injection", ["EnforcePersonality"], ["windows", "linux"])
+    ("Partition table manipulation", ["FixPartitionTable"],
+        ["linux", "windows"]),
+    ("File system resize",
+        ["FilesystemResizeUnmounted", "FilesystemResizeMounted"],
+        ["linux", "windows"]),
+    ("Swap partition configuration", ["AddSwap"], ["linux"]),
+    ("SSH keys removal", ["DeleteSSHKeys"], ["linux"]),
+    ("Temporal RDP disabling", ["DisableRemoteDesktopConnections"],
+        ["windows"]),
+    ("SELinux relabeling at next boot", ["SELinuxAutorelabel"], ["linux"]),
+    ("Hostname/Computer Name assignment", ["AssignHostname"],
+        ["windows", "linux"]),
+    ("Password change", ["ChangePassword"], ["windows", "linux"]),
+    ("File injection", ["EnforcePersonality"], ["windows", "linux"])
 ]
 
 
@@ -76,14 +80,80 @@ class Reset(Exception):
     pass
 
 
+class metadata_monitor(object):
+    def __init__(self, session, meta):
+        self.session = session
+        self.meta = meta
+
+    def __enter__(self):
+        self.old = {}
+        for (k, v) in self.meta.items():
+            self.old[k] = v
+
+    def __exit__(self, type, value, traceback):
+        d = self.session['dialog']
+
+        altered = {}
+        added = {}
+
+        for (k, v) in self.meta.items():
+            if k not in self.old:
+                added[k] = v
+            elif self.old[k] != v:
+                altered[k] = v
+
+        if not (len(added) or len(altered)):
+            return
+
+        msg = "The last action has changed some image properties:\n\n"
+        if len(added):
+            msg += "New image properties:\n"
+            for (k, v) in added.items():
+                msg += '    %s: "%s"\n' % (k, v)
+            msg += "\n"
+        if len(altered):
+            msg += "Updated image properties:\n"
+            for (k, v) in altered.items():
+                msg += '    %s: "%s" -> "%s"\n' % (k, self.old[k], v)
+            msg += "\n"
+
+        self.session['metadata'].update(added)
+        self.session['metadata'].update(altered)
+        d.msgbox(msg, title="Image Property Changes", width=MSGBOX_WIDTH)
+
+
+def extract_metadata_string(session):
+    metadata = ['%s=%s' % (k, v) for (k, v) in session['metadata'].items()]
+
+    if 'task_metadata' in session:
+        metadata.extend("%s=yes" % m for m in session['task_metadata'])
+
+    return '\n'.join(metadata) + '\n'
+
+
 def confirm_exit(d, msg=''):
     return not d.yesno("%s Do you want to exit?" % msg, width=YESNO_WIDTH)
 
 
 def confirm_reset(d):
-    return not d.yesno(
-        "Are you sure you want to reset everything?",
-        width=YESNO_WIDTH)
+    return not d.yesno("Are you sure you want to reset everything?",
+                       width=YESNO_WIDTH, defaultno=1)
+
+
+def update_background_title(session):
+    d = session['dialog']
+    dev = session['device']
+
+    MB = 2 ** 20
+
+    size = (dev.size + MB - 1) // MB
+    shrinked = 'shrinked' in session and session['shrinked']
+    postfix = " (shrinked)" if shrinked else ''
+
+    title = "OS: %s, Distro: %s, Size: %dMB%s" % \
+            (dev.ostype, dev.distro, size, postfix)
+
+    d.setBackgroundTitle(title)
 
 
 def extract_image(session):
@@ -127,15 +197,15 @@ def extract_image(session):
 
         if len(overwrite) > 0:
             if d.yesno("The following file(s) exist:\n"
-                        "%s\nDo you want to overwrite them?" %
-                        "\n".join(overwrite), width=YESNO_WIDTH):
+                       "%s\nDo you want to overwrite them?" %
+                       "\n".join(overwrite), width=YESNO_WIDTH):
                 continue
 
         out = GaugeOutput(d, "Image Extraction", "Extracting image...")
         try:
             dev = session['device']
             if "checksum" not in session:
-                size = dev.meta['SIZE']
+                size = dev.size
                 md5 = MD5(out)
                 session['checksum'] = md5.compute(session['snapshot'], size)
 
@@ -145,11 +215,8 @@ def extract_image(session):
 
             # Extract metadata file
             out.output("Extracting metadata file...")
-            metastring = '\n'.join(
-                ['%s=%s' % (k, v) for (k, v) in session['metadata'].items()])
-            metastring += '\n'
             with open('%s.meta' % path, 'w') as f:
-                f.write(metastring)
+                f.write(extract_metadata_string(session))
             out.success('done')
 
             # Extract md5sum file
@@ -170,7 +237,7 @@ def extract_image(session):
 
 def upload_image(session):
     d = session["dialog"]
-    size = session['device'].meta['SIZE']
+    size = session['device'].size
 
     if "account" not in session:
         d.msgbox("You need to provide your ~okeanos login username before you "
@@ -199,10 +266,10 @@ def upload_image(session):
         break
 
     out = GaugeOutput(d, "Image Upload", "Uploading...")
-    if 'checksum' not in session:
-        md5 = MD5(out)
-        session['checksum'] = md5.compute(session['snapshot'], size)
     try:
+        if 'checksum' not in session:
+            md5 = MD5(out)
+            session['checksum'] = md5.compute(session['snapshot'], size)
         kamaki = Kamaki(session['account'], session['token'], out)
         try:
             # Upload image file
@@ -212,9 +279,7 @@ def upload_image(session):
                                                   "Uploading missing blocks")
             # Upload metadata file
             out.output("Uploading metadata file...")
-            metastring = '\n'.join(
-                ['%s=%s' % (k, v) for (k, v) in session['metadata'].items()])
-            metastring += '\n'
+            metastring = extract_metadata_string(session)
             kamaki.upload(StringIO.StringIO(metastring), size=len(metastring),
                           remote_path="%s.meta" % filename)
             out.success("done")
@@ -257,14 +322,13 @@ def register_image(session):
         return False
 
     if "upload" not in session:
-        d.msgbox("You need to have an image uploaded to pithos+ before you "
-                 "can register it to cyclades",
-                 width=MSGBOX_WIDTH)
+        d.msgbox("You need to upload the image to pithos+ before you can "
+                 "register it to cyclades", width=MSGBOX_WIDTH)
         return False
 
     while 1:
-        (code, answer) = d.inputbox("Please provide a registration name:"
-                                " be registered:", width=INPUTBOX_WIDTH)
+        (code, answer) = d.inputbox("Please provide a registration name:",
+                                    width=INPUTBOX_WIDTH)
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             return False
 
@@ -274,12 +338,18 @@ def register_image(session):
             continue
         break
 
+    metadata = {}
+    metadata.update(session['metadata'])
+    if 'task_metadata' in session:
+        for key in session['task_metadata']:
+            metadata[key] = 'yes'
+
     out = GaugeOutput(d, "Image Registration", "Registrating image...")
     try:
         out.output("Registring image to cyclades...")
         try:
             kamaki = Kamaki(session['account'], session['token'], out)
-            kamaki.register(name, session['upload'], session['metadata'])
+            kamaki.register(name, session['upload'], metadata)
             out.success('done')
         except ClientError as e:
             d.msgbox("Error in pithos+ client: %s" % e.message)
@@ -295,21 +365,29 @@ def register_image(session):
 def kamaki_menu(session):
     d = session['dialog']
     default_item = "Account"
+
+    account = Kamaki.get_account()
+    if account:
+        session['account'] = account
+
+    token = Kamaki.get_token()
+    if token:
+        session['token'] = token
+
     while 1:
         account = session["account"] if "account" in session else "<none>"
         token = session["token"] if "token" in session else "<none>"
         upload = session["upload"] if "upload" in session else "<none>"
+
+        choices = [("Account", "Change your ~okeanos username: %s" % account),
+                   ("Token", "Change your ~okeanos token: %s" % token),
+                   ("Upload", "Upload image to pithos+"),
+                   ("Register", "Register the image to cyclades: %s" % upload)]
+
         (code, choice) = d.menu(
-            "Choose one of the following or press <Back> to go back.",
-            width=MENU_WIDTH,
-            choices=[("Account", "Change your ~okeanos username: %s" %
-                      account),
-                     ("Token", "Change your ~okeanos token: %s" % token),
-                     ("Upload", "Upload image to pithos+"),
-                     ("Register", "Register image to cyclades: %s" % upload)],
-            cancel="Back",
-            default_item=default_item,
-            help_button=1,
+            text="Choose one of the following or press <Back> to go back.",
+            width=MENU_WIDTH, choices=choices, cancel="Back", height=13,
+            menu_height=5, default_item=default_item,
             title="Image Registration Menu")
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
@@ -327,6 +405,7 @@ def kamaki_menu(session):
                     del session["account"]
             else:
                 session["account"] = answer.strip()
+                Kamaki.save_account(session['account'])
                 default_item = "Token"
         elif choice == "Token":
             default_item = "Token"
@@ -340,6 +419,7 @@ def kamaki_menu(session):
                 del session["token"]
             else:
                 session["token"] = answer.strip()
+                Kamaki.save_token(session['account'])
                 default_item = "Upload"
         elif choice == "Upload":
             if upload_image(session):
@@ -371,7 +451,7 @@ def add_property(session):
 
     while 1:
         (code, answer) = d.inputbox("Please provide a value for image "
-                                   "property %s" % name, width=INPUTBOX_WIDTH)
+                                    "property %s" % name, width=INPUTBOX_WIDTH)
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             return False
 
@@ -397,22 +477,22 @@ def modify_properties(session):
 
         (code, choice) = d.menu(
             "In this menu you can edit existing image properties or add new "
-            "ones. Be carefull! Most properties have special meaning and "
+            "ones. Be careful! Most properties have special meaning and "
             "alter the image deployment behaviour. Press <HELP> to see more "
             "information about image properties. Press <BACK> when done.",
-            height=18,
-            width=MENU_WIDTH,
-            choices=choices, menu_height=10,
-            ok_label="EDIT", extra_button=1, extra_label="ADD", cancel="BACK",
-            help_button=1, help_label="HELP", title="Image Metadata")
+            height=18, width=MENU_WIDTH, choices=choices, menu_height=10,
+            ok_label="Edit", extra_button=1, extra_label="Add", cancel="Back",
+            help_button=1, title="Image Properties")
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
-            break
+            return True
         # Edit button
         elif code == d.DIALOG_OK:
-            (code, answer) = d.inputbox("Please provide a new value for "
-                    "the image property with name `%s':" % choice,
-                    init=session['metadata'][choice], width=INPUTBOX_WIDTH)
+            (code, answer) = d.inputbox("Please provide a new value for the "
+                                        "image property with name `%s':" %
+                                        choice,
+                                        init=session['metadata'][choice],
+                                        width=INPUTBOX_WIDTH)
             if code not in (d.DIALOG_CANCEL, d.DIALOG_ESC):
                 value = answer.strip()
                 if len(value) == 0:
@@ -423,6 +503,10 @@ def modify_properties(session):
         # ADD button
         elif code == d.DIALOG_EXTRA:
             add_property(session)
+        elif code == 'help':
+            help_file = get_help_file("image_properties")
+            assert os.path.exists(help_file)
+            d.textbox(help_file, title="Image Properties", width=70, height=40)
 
 
 def delete_properties(session):
@@ -434,13 +518,17 @@ def delete_properties(session):
 
     (code, to_delete) = d.checklist("Choose which properties to delete:",
                                     choices=choices, width=CHECKBOX_WIDTH)
-    count = len(to_delete)
+
     # If the user exits with ESC or CANCEL, the returned tag list is empty.
     for i in to_delete:
         del session['metadata'][i]
 
-    if count > 0:
-        d.msgbox("%d image properties were deleted.", width=MSGBOX_WIDTH)
+    cnt = len(to_delete)
+    if cnt > 0:
+        d.msgbox("%d image properties were deleted." % cnt, width=MSGBOX_WIDTH)
+        return True
+    else:
+        return False
 
 
 def exclude_tasks(session):
@@ -458,7 +546,7 @@ def exclude_tasks(session):
                        "Do you wish to enable it?", width=YESNO_WIDTH):
             session['excluded_tasks'].remove(-1)
         else:
-            return
+            return False
 
     for (msg, task, osfamily) in CONFIGURATION_TASKS:
         if session['metadata']['OSFAMILY'] in osfamily:
@@ -470,23 +558,23 @@ def exclude_tasks(session):
 
     while 1:
         (code, tags) = d.checklist(
-            "Please choose which configuration tasks you would like to "
-            "prevent from running during image deployment. "
-            "Press <No Config> to supress any configuration. "
-            "Press <Help> for more help on the image deployment configuration "
-            "tasks.", height=19, list_height=8,
-            title="Exclude Configuration Tasks", choices=choices,
-            width=CHECKBOX_WIDTH, help_button=1, extra_button=1,
-            extra_label="No Config")
+            text="Please choose which configuration tasks you would like to "
+                 "prevent from running during image deployment. "
+                 "Press <No Config> to supress any configuration. "
+                 "Press <Help> for more help on the image deployment "
+                 "configuration tasks.",
+            choices=choices, height=19, list_height=8, width=CHECKBOX_WIDTH,
+            help_button=1, extra_button=1, extra_label="No Config",
+            title="Exclude Configuration Tasks")
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
-            break
+            return False
         elif code == d.DIALOG_HELP:
             help_file = get_help_file("configuration_tasks")
             assert os.path.exists(help_file)
             d.textbox(help_file, title="Configuration Tasks",
-                                                        width=70, height=40)
-            continue
+                      width=70, height=40)
+        # No Config button
         elif code == d.DIALOG_EXTRA:
             session['excluded_tasks'] = [-1]
             session['task_metadata'] = ["EXCLUDE_ALL_TASKS"]
@@ -500,21 +588,42 @@ def exclude_tasks(session):
             for task in session['excluded_tasks']:
                 exclude_metadata.extend(CONFIGURATION_TASKS[task][1])
 
-            session['task_metadata'] = \
-                        map(lambda x: "EXCLUDE_TASK_%s" % x, exclude_metadata)
+            session['task_metadata'] = map(lambda x: "EXCLUDE_TASK_%s" % x,
+                                           exclude_metadata)
             break
 
+    return True
+
 
 def sysprep(session):
     d = session['dialog']
     image_os = session['image_os']
 
-    syspreps = image_os.list_syspreps()
+    # Is the image already shrinked?
+    if 'shrinked' in session and session['shrinked']:
+        msg = "It seems you have shrinked the image. Running system " \
+              "preparation tasks on a shrinked image is dangerous."
+
+        if d.yesno("%s\n\nDo you really want to continue?" % msg,
+                   width=YESNO_WIDTH, defaultno=1):
+            return
+
+    wrapper = textwrap.TextWrapper(width=65)
 
-    wrapper = textwrap.TextWrapper()
-    wrapper.width = 65
-    sysprep_help = "System Preperation Tasks"
-    sysprep_help += "\n%s\n\n" % ('=' * len(sysprep_help))
+    help_title = "System Preperation Tasks"
+    sysprep_help = "%s\n%s\n\n" % (help_title, '=' * len(help_title))
+
+    if 'exec_syspreps' not in session:
+        session['exec_syspreps'] = []
+
+    all_syspreps = image_os.list_syspreps()
+    # Only give the user the choice between syspreps that have not ran yet
+    syspreps = [s for s in all_syspreps if s not in session['exec_syspreps']]
+
+    if len(syspreps) == 0:
+        d.msgbox("No system preparation task available to run!",
+                 title="System Preperation", width=MSGBOX_WIDTH)
+        return
 
     while 1:
         choices = []
@@ -522,9 +631,9 @@ def sysprep(session):
         for sysprep in syspreps:
             name, descr = image_os.sysprep_info(sysprep)
             display_name = name.replace('-', ' ').capitalize()
-            sysprep_help += "%s\n%s\n%s\n\n" % \
-                            (display_name, '-' * len(display_name),
-                            wrapper.fill(" ".join(descr.split())))
+            sysprep_help += "%s\n" % display_name
+            sysprep_help += "%s\n" % ('-' * len(display_name))
+            sysprep_help += "%s\n\n" % wrapper.fill(" ".join(descr.split()))
             enabled = 1 if sysprep.enabled else 0
             choices.append((str(index + 1), display_name, enabled))
             index += 1
@@ -532,66 +641,134 @@ def sysprep(session):
         (code, tags) = d.checklist(
             "Please choose which system preperation tasks you would like to "
             "run on the image. Press <Help> to see details about the system "
-            "preperation tasks.",
-            title="Run system preperation tasks", choices=choices,
-            width=70, ok_label="Run", help_button=1)
+            "preperation tasks.", title="Run system preperation tasks",
+            choices=choices, width=70, ok_label="Run", help_button=1)
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
+            return False
+        elif code == d.DIALOG_HELP:
+            d.scrollbox(sysprep_help, width=HELP_WIDTH)
+        elif code == d.DIALOG_OK:
+            # Enable selected syspreps and disable the rest
+            for i in range(len(syspreps)):
+                if str(i + 1) in tags:
+                    image_os.enable_sysprep(syspreps[i])
+                    session['exec_syspreps'].append(syspreps[i])
+                else:
+                    image_os.disable_sysprep(syspreps[i])
+
+            out = InfoBoxOutput(d, "Image Configuration")
+            try:
+                dev = session['device']
+                dev.out = out
+                dev.mount(readonly=False)
+                try:
+                    # The checksum is invalid. We have mounted the image rw
+                    if 'checksum' in session:
+                        del session['checksum']
+
+                    # Monitor the metadata changes during syspreps
+                    with metadata_monitor(session, image_os.meta):
+                        image_os.out = out
+                        image_os.do_sysprep()
+                        image_os.out.finalize()
+
+                    # Disable syspreps that have ran
+                    for sysprep in session['exec_syspreps']:
+                        image_os.disable_sysprep(sysprep)
+
+                finally:
+                    dev.umount()
+            finally:
+                out.cleanup()
             break
-        if code == d.DIALOG_HELP:
-            d.scrollbox(sysprep_help, width=70)
-            continue
+    return True
 
 
-def customize_menu(session):
+def shrink(session):
     d = session['dialog']
+    dev = session['device']
+
+    shrinked = 'shrinked' in session and session['shrinked']
+
+    if shrinked:
+        d.msgbox("The image is already shrinked!", title="Image Shrinking",
+                 width=MSGBOX_WIDTH)
+        return True
+
+    msg = "This operation will shrink the last partition of the image to " \
+          "reduce the total image size. If the last partition is a swap " \
+          "partition, then this partition is removed and the partition " \
+          "before that is shrinked. The removed swap partition will be " \
+          "recreated during image deployment."
+
+    if not d.yesno("%s\n\nDo you want to continue?" % msg, width=70,
+                   height=12, title="Image Shrinking"):
+        with metadata_monitor(session, dev.meta):
+            dev.out = InfoBoxOutput(d, "Image Shrinking", height=4)
+            dev.shrink()
+            dev.out.finalize()
+
+        session['shrinked'] = True
+        update_background_title(session)
+    else:
+        return False
+
+    return True
+
+
+def customization_menu(session):
+    d = session['dialog']
+
+    choices = [("Sysprep", "Run various image preperation tasks"),
+               ("Shrink", "Shrink image"),
+               ("View/Modify", "View/Modify image properties"),
+               ("Delete", "Delete image properties"),
+               ("Exclude", "Exclude various deployment tasks from running")]
+
+    default_item = 0
 
-    default_item = "Sysprep"
     actions = {"Sysprep": sysprep,
+               "Shrink": shrink,
                "View/Modify": modify_properties,
                "Delete": delete_properties,
                "Exclude": exclude_tasks}
     while 1:
         (code, choice) = d.menu(
-            "Choose one of the following or press <Back> to exit.",
-            width=MENU_WIDTH,
-            choices=[("Sysprep", "Run various image preperation tasks"),
-                     ("Shrink", "Shrink image"),
-                     ("View/Modify", "View/Modify image properties"),
-                     ("Delete", "Delete image properties"),
-                     ("Exclude",
-                      "Exclude various deployment tasks from running")],
-            cancel="Back",
-            default_item=default_item,
+            text="Choose one of the following or press <Back> to exit.",
+            width=MENU_WIDTH, choices=choices, cancel="Back", height=13,
+            menu_height=len(choices), default_item=choices[default_item][0],
             title="Image Customization Menu")
 
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             break
         elif choice in actions:
-            default_item = choice
-            actions[choice](session)
+            default_item = [entry[0] for entry in choices].index(choice)
+            if actions[choice](session):
+                default_item = (default_item + 1) % len(choices)
 
 
 def main_menu(session):
     d = session['dialog']
     dev = session['device']
-    d.setBackgroundTitle("OS: %s, Distro: %s" % (dev.ostype, dev.distro))
-    actions = {"Customize": customize_menu,
-               "Register": kamaki_menu,
-               "Extract": extract_image}
+
+    update_background_title(session)
+
+    choices = [("Customize", "Customize image & ~okeanos deployment options"),
+               ("Register", "Register image to ~okeanos"),
+               ("Extract", "Dump image to local file system"),
+               ("Reset", "Reset everything and start over again"),
+               ("Help", "Get help for using snf-image-creator")]
+
     default_item = "Customize"
 
+    actions = {"Customize": customization_menu, "Register": kamaki_menu,
+               "Extract": extract_image}
     while 1:
         (code, choice) = d.menu(
-            "Choose one of the following or press <Exit> to exit.",
-            width=MENU_WIDTH,
-            choices=[("Customize",
-                      "Customize image and ~okeanos deployment options"),
-                     ("Register", "Register image to ~okeanos"),
-                     ("Extract", "Dump image to local file system"),
-                     ("Reset", "Reset everything and start over again"),
-                     ("Help", "Get help for using snf-image-creator")],
-            cancel="Exit", menu_height=5, height=13, default_item=default_item,
+            text="Choose one of the following or press <Exit> to exit.",
+            width=MENU_WIDTH, choices=choices, cancel="Exit", height=13,
+            default_item=default_item, menu_height=len(choices),
             title="Image Creator for ~okeanos (snf-image-creator version %s)" %
                   version)
 
@@ -600,7 +777,8 @@ def main_menu(session):
                 break
         elif choice == "Reset":
             if confirm_reset(d):
-                d.infobox("Resetting snf-image-creator. Please wait...")
+                d.infobox("Resetting snf-image-creator. Please wait...",
+                          width=INFOBOX_WIDTH)
                 raise Reset
         elif choice in actions:
             actions[choice](session)
@@ -611,13 +789,13 @@ def select_file(d, media):
     while 1:
         if media is not None:
             if not os.path.exists(media):
-                d.msgbox("The file you choose does not exist",
+                d.msgbox("The file `%s' you choose does not exist." % media,
                          width=MSGBOX_WIDTH)
             else:
                 break
 
         (code, media) = d.fselect(root, 10, 50,
-                                 title="Please select input media")
+                                  title="Please select input media")
         if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
             if confirm_exit(d, "You canceled the media selection dialog box."):
                 sys.exit(0)
@@ -629,21 +807,26 @@ def select_file(d, media):
 
 
 def image_creator(d):
-    basename = os.path.basename(sys.argv[0])
-    usage = "Usage: %s [input_media]" % basename
-    if len(sys.argv) > 2:
-        sys.stderr.write("%s\n" % usage)
-        return 1
+
+    usage = "Usage: %prog [options] [<input_media>]"
+    parser = optparse.OptionParser(version=version, usage=usage)
+
+    options, args = parser.parse_args(sys.argv[1:])
+
+    if len(args) > 1:
+        parser.error("Wrong numver of arguments")
+
+    d.setBackgroundTitle('snf-image-creator')
 
     if os.geteuid() != 0:
-        raise FatalError("You must run %s as root" % basename)
+        raise FatalError("You must run %s as root" % parser.get_prog_name())
 
-    media = select_file(d, sys.argv[1] if len(sys.argv) == 2 else None)
+    media = select_file(d, args[0] if len(args) == 1 else None)
 
-    out = InitializationOutput(d)
+    out = GaugeOutput(d, "Initialization", "Initializing...")
     disk = Disk(media, out)
 
-    def signal_handler(signum, fram):
+    def signal_handler(signum, frame):
         out.cleanup()
         disk.cleanup()
 
@@ -652,21 +835,26 @@ def image_creator(d):
         snapshot = disk.snapshot()
         dev = disk.get_device(snapshot)
 
-        out.output("Collecting image metadata...")
-        metadata = dev.meta
+        metadata = {}
+        for (key, value) in dev.meta.items():
+            metadata[str(key)] = str(value)
+
         dev.mount(readonly=True)
+        out.output("Collecting image metadata...")
         cls = os_cls(dev.distro, dev.ostype)
         image_os = cls(dev.root, dev.g, out)
         dev.umount()
-        metadata.update(image_os.meta)
+
+        for (key, value) in image_os.meta.items():
+            metadata[str(key)] = str(value)
+
         out.success("done")
         out.cleanup()
 
         # Make sure the signal handler does not call out.cleanup again
         def dummy(self):
             pass
-        instancemethod = type(InitializationOutput.cleanup)
-        out.cleanup = instancemethod(dummy, out, InitializationOutput)
+        out.cleanup = type(GaugeOutput.cleanup)(dummy, out, GaugeOutput)
 
         session = {"dialog": d,
                    "disk": disk,
@@ -675,7 +863,28 @@ def image_creator(d):
                    "image_os": image_os,
                    "metadata": metadata}
 
-        main_menu(session)
+        msg = "snf-image-creator detected a %s system on the input media. " \
+              "Would you like to run a wizards to assists you through the " \
+              "image creation process?\n\nChoose <Yes> to run the wizard, " \
+              "<No> to run the snf-image-creator in expert mode or press " \
+              "ESC to quit the program." \
+              % (dev.ostype if dev.ostype == dev.distro else "%s (%s)" %
+                 (dev.ostype, dev.distro))
+
+        update_background_title(session)
+
+        while True:
+            code = d.yesno(msg, width=YESNO_WIDTH, height=12)
+            if code == d.DIALOG_OK:
+                if wizard(session):
+                    break
+            elif code == d.DIALOG_CANCEL:
+                main_menu(session)
+                break
+
+            if confirm_exit(d):
+                break
+
         d.infobox("Thank you for using snf-image-creator. Bye", width=53)
     finally:
         disk.cleanup()
@@ -701,7 +910,7 @@ def main():
                 sys.exit(ret)
             except FatalError as e:
                 msg = textwrap.fill(str(e), width=70)
-                d.infobox(msg, width=70, title="Fatal Error")
+                d.infobox(msg, width=INFOBOX_WIDTH, title="Fatal Error")
                 sys.exit(1)
         except Reset:
             continue