Merge branch 'config-options'

Author: slamora

device_inventory/__init__.py

@@ -1,4 +1,4 @@
-VERSION = (7, 0, 3, 'alpha', 4)
+VERSION = (7, 0, 3, 'alpha', 5)
 
 
 def get_version():

device_inventory/config.ini

@@ -1,10 +1,10 @@
 [DEFAULT]
-EQUIP = 1
-DONOR = no
-ID = no
+EQUIP = 0
+PID = no
+_ID = no
 TIME = no
 LABEL = yes
-OBS = yes
+COMMENT = yes
 SAVE = yes
 OFFLINE = yes
 MOVE = no

device_inventory/donator.py

@@ -30,22 +30,30 @@ def is_connected():
 
 
 def get_user_input():
-    # XXX configurable user input fields
-    label = raw_input("Label ID: ")
-    comment = raw_input("Comment: ")
+    user_input = {}
+    for field in ['label', 'comment', 'pid', '_id']:
+        if settings.getboolean('DEFAULT', field):
+            value = raw_input("%s: " % field).strip()
+            if value:
+                user_input[field] = value
 
     # Ask user for choosing the Device.type
+    do_equip = settings.get('DEFAULT', 'EQUIP')
     CHOICES = dict((key, value) for value, key in Computer.TYPES)
     formated_choices = "\n".join(["{0}. {1}".format(k,v) for k, v in CHOICES.items()])
     choose_msg = "Choose device type \n{0}\nType: ".format(formated_choices)
     device_type = None
     while device_type not in CHOICES.keys():
         try:
-            device_type = int(raw_input(choose_msg))
+            if do_equip in ["1", "2", "3", "4", "5"]:
+                device_type = int(do_equip)
+            else:
+                device_type = int(raw_input(choose_msg))
         except ValueError:
             print("Invalid choice.")
+    user_input['device_type'] = CHOICES[device_type]
 
-    return dict(label=label, comment=comment, device_type=CHOICES[device_type])
+    return user_input
 
 
 def main(argv=None):