implemented draft of config globalization

[findit] / src / main.py

diff --git a/src/main.py b/src/main.py
index cd1bafb..732dec0 100755 (executable)
--- a/src/main.py
+++ b/src/main.py
@@ -5,7 +5,7 @@
 
 import sys
 
-from config import Config
+from config import config
 from misc import _
 
 __progname__ = 'FindIT'
@@ -15,14 +15,13 @@ __version__ = '0.2.0'
 
 class Control(object):
     def __init__(self):
-        config = Config ###()
 
         self.abstrac = Abstraction()
 
         if(len(sys.argv) > 1):
             Cli_Presentation(self.abstrac)  ###
         else:
-            Gtk_Presentation(config, self.abstrac)  ###
+            Gtk_Presentation(self.abstrac)  ###
 
 #==============================================================================
 
@@ -58,13 +57,7 @@ class Cli_Presentation(object):
         parser.add_option('--license', action='callback', callback=self._license)
         (options, args) = parser.parse_args()
 
-        config = {}
-        config['search'] = options.search
-        config['outtype'] = options.output
-        config['ignore_dirs'] = ['/dev', '/proc', '/sys', '/mnt']
-        config['start_path'], config['count'] = options.params.split()
-
-        self.show_search_toplevel(config)
+        self.show_search_toplevel()
 
     def _about(self, *a):
         print self.abstrac.comments
@@ -74,20 +67,18 @@ class Cli_Presentation(object):
         print self.abstrac.license
         sys.exit()
 
-    def show_search_toplevel(self, config):
+    def show_search_toplevel(self):
         search_module = __import__(config['search'] + '.search')
-        search_toplevel = search_module.search.Control('cli', config).run()
+        search_toplevel = search_module.search.Control('cli').run()
 
 #==============================================================================
 
 class Gtk_Presentation(object):
     """Main window class."""
 
-    def __init__(self, config, abstrac):
+    def __init__(self, abstrac):
         import gtk
 
-        self.config = config
-
         def _create_menu():
             """Create main menu."""
             menubar = gtk.MenuBar()
@@ -122,7 +113,7 @@ class Gtk_Presentation(object):
 
             # Activate radio tool button
             for btn in search_tbtns:
-                if btn.get_name() == self.config['search']:
+                if btn.get_name() == config['search']:
                     btn.set_active(True)
 
             return toolbar
@@ -152,7 +143,7 @@ class Gtk_Presentation(object):
         self.vbox = gtk.VBox(False, 4)
         self.vbox.pack_start(menu, False, False, 0)
         self.vbox.pack_start(toolbar, False, False, 0)
-        self.show_search_toplevel(None, self.config['search'])
+        self.show_search_toplevel(None, config['search'])
 
         window.add(self.vbox)
         window.show_all()
@@ -163,7 +154,7 @@ class Gtk_Presentation(object):
         print 'Entering <' + searchtype + '> search mode...'
 
         search_module = __import__(searchtype + '.search')
-        search_toplevel = search_module.search.Control('gtk', self.config).run()
+        search_toplevel = search_module.search.Control('gtk').run()
 
         try:
             self.vbox.remove(self.vbox.get_children()[2])
@@ -177,11 +168,10 @@ class Gtk_Presentation(object):
 class Hildon_Presentation(object):
     """Main window class."""
 
-    def __init__(self, config):
+    def __init__(self):
         import gtk
         import hildon
 
-        self.config = config
 
 #==============================================================================