Don't check the token if -t is not defined

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

diff --git a/image_creator/dialog_menu.py b/image_creator/dialog_menu.py
index d54af2a..55bcd4e 100644 (file)
--- a/image_creator/dialog_menu.py
+++ b/image_creator/dialog_menu.py
@@ -110,15 +110,21 @@ class metadata_monitor(object):
 def upload_image(session):
     d = session["dialog"]
     dev = session['device']
+    meta = session['metadata']
     size = dev.size
 
     if "account" not in session:
-        d.msgbox("You need to provide your ~okeanos account before you "
+        d.msgbox("You need to provide your ~okeanos credentials before you "
                  "can upload images to pithos+", width=SMALL_WIDTH)
         return False
 
     while 1:
-        init = session["upload"] if "upload" in session else ''
+        if 'upload' in session:
+            init = session['upload']
+        elif 'OS' in meta:
+            init = "%s.diskdump" % meta['OS']
+        else:
+            init = ""
         (code, answer) = d.inputbox("Please provide a filename:", init=init,
                                     width=WIDTH)
 
@@ -189,13 +195,13 @@ def register_image(session):
 
     if "account" not in session:
         d.msgbox("You need to provide your ~okeanos credentians before you "
-                 "can register an images to cyclades",
+                 "can register an images with cyclades",
                  width=SMALL_WIDTH)
         return False
 
     if "pithos_uri" not in session:
         d.msgbox("You need to upload the image to pithos+ before you can "
-                 "register it to cyclades", width=SMALL_WIDTH)
+                 "register it with cyclades", width=SMALL_WIDTH)
         return False
 
     while 1:
@@ -209,7 +215,7 @@ def register_image(session):
             d.msgbox("Registration name cannot be empty", width=SMALL_WIDTH)
             continue
 
-        ret = d.yesno("Make the image public?\\nA public image is accessible"
+        ret = d.yesno("Make the image public?\\nA public image is accessible "
                       "by every user of the service.", defaultno=1,
                       width=WIDTH)
         if ret not in (0, 1):
@@ -283,7 +289,7 @@ def kamaki_menu(session):
         if choice == "Account":
             default_item = "Account"
             (code, answer) = d.inputbox(
-                "Please provide your ~okeanos token:",
+                "Please provide your ~okeanos authentication token:",
                 init=session["account"]['auth_token'] if "account" in session
                 else '', width=WIDTH)
             if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
@@ -664,6 +670,10 @@ def main_menu(session):
                 d.infobox("Resetting snf-image-creator. Please wait...",
                           width=SMALL_WIDTH)
                 raise Reset
+        elif choice == "Help":
+            d.msgbox("For help, check the online documentation:\n\nhttp://www"
+                     ".synnefo.org/docs/snf-image-creator/latest/",
+                     width=WIDTH, title="Help")
         elif choice in actions:
             actions[choice](session)