Read ~okeanos account/token from kamaki

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

diff --git a/image_creator/dialog_main.py b/image_creator/dialog_main.py
index 6870fd8..52b463f 100644 (file)
--- a/image_creator/dialog_main.py
+++ b/image_creator/dialog_main.py
@@ -39,6 +39,7 @@ import os
 import textwrap
 import signal
 import StringIO
+import optparse
 
 from image_creator import __version__ as version
 from image_creator.util import FatalError, MD5
@@ -264,10 +265,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
@@ -363,6 +364,8 @@ def register_image(session):
 def kamaki_menu(session):
     d = session['dialog']
     default_item = "Account"
+
+    (session['account'], session['token']) = Kamaki.saved_credentials()
     while 1:
         account = session["account"] if "account" in session else "<none>"
         token = session["token"] if "token" in session else "<none>"
@@ -375,8 +378,9 @@ def kamaki_menu(session):
 
         (code, choice) = d.menu(
             text="Choose one of the following or press <Back> to go back.",
-            width=MENU_WIDTH, choices=choices, cancel="Back",
-            default_item=default_item, title="Image Registration Menu")
+            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):
             return False
@@ -393,6 +397,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"
@@ -406,6 +411,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):
@@ -607,7 +613,8 @@ def sysprep(session):
     syspreps = [s for s in all_syspreps if s not in session['exec_syspreps']]
 
     if len(syspreps) == 0:
-        d.msgbox("No system preparation task left to run!", width=MSGBOX_WIDTH)
+        d.msgbox("No system preparation task available to run!",
+                 title="System Preperation", width=MSGBOX_WIDTH)
         return
 
     while 1:
@@ -677,7 +684,8 @@ def shrink(session):
     shrinked = 'shrinked' in session and session['shrinked']
 
     if shrinked:
-        d.msgbox("You have already shrinked your image!")
+        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 " \
@@ -790,19 +798,26 @@ def select_file(d, media):
     return media
 
 
+def wizard(session):
+    pass
+
+
 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)
 
-    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 = GaugeOutput(d, "Initialization", "Initializing...")
     disk = Disk(media, out)
@@ -844,7 +859,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.distro, dev.ostype))
+
+        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
+
+            exit_msg = "You have not selected if you want to run " \
+                       "snf-image-creator in wizard or expert mode."
+            if confirm_exit(d, exit_msg):
+                break
+
         d.infobox("Thank you for using snf-image-creator. Bye", width=53)
     finally:
         disk.cleanup()