Disconnected the property creation function

The function used to create a new property has been changed to be a callback function, so that later on a UI might use a dialog.

1 files changed, 16 insertions, 7 deletions

diff --git a/4grab.py b/4grab.py
index fd12c32..f2b8da8 100755
--- a/4grab.py
+++ b/4grab.py
@@ -26,9 +26,18 @@ import config
 import download
 import progressbar
 
+def raw_input_with_default(default, prompt):
+    inp = raw_input("%s (default=%s): " % (prompt, default))
+    if inp == "":
+        return default
+    return inp
+
 base_url = "http://boards.4chan.org/"
 parser = optparse.OptionParser()
 downloader = download.Downloader(progressbar.Progress)
+conf = config.Configuration()
+
+conf.set_optioncreator(raw_input_with_default)
 
 def walk_with_wizard(baseurl):
     wzrd_msg = "Pilates! *SHAZAM* Here they come!"
@@ -54,8 +63,8 @@ def walk_with_wizard(baseurl):
                                            [thread])
     else:
         inp = raw_input("Which category would you like to download? ")
-        config.Configuration().set_category(inp)
-        baseurl = "%s%s/" % (baseurl, config.Configuration().get_category())
+        conf.set_category(inp)
+        baseurl = "%s%s/" % (baseurl, conf.get_category())
 
         print wzrd_msg
         t = downloader.get_thread_links(baseurl)
@@ -109,15 +118,15 @@ if options.wizard and (options.tempcat
     exit(1)
 
 if options.confval:
-    if not config.Configuration().option_exists(options.confval[0]):
+    if not conf.option_exists(options.confval[0]):
         print ("%s: error: %s is not a "
                "valid configuration option") % (sys.argv[0],
                                         options.confval[0])
         exit(1)
     print "Setting", options.confval[0], "to", options.confval[1]
-    config.Configuration().set_option(options.confval[0],
+    conf.set_option(options.confval[0],
                                       options.confval[1])
-    config.Configuration().save()
+    conf.save()
     exit(0)
 
 elif options.wizard:
@@ -150,9 +159,9 @@ elif options.thread:
     exit(0)
 
 elif options.tempcat:
-    config.Configuration().set_category(options.tempcat)
+    conf.set_category(options.tempcat)
 
-base_url = "%s%s/" % (base_url, config.Configuration().get_category())
+base_url = "%s%s/" % (base_url, conf.get_category())
 
 try:
     t = downloader.get_thread_links(base_url)