Moved filessearch parameters from main to files.search
[findit] / src / main.py
index e118510..2f65db1 100755 (executable)
@@ -59,19 +59,9 @@ class Cli_Presentation(object):
         parser.add_option('--license', action='callback', callback=self._license)
         (options, args) = parser.parse_args()
 
-        self.search = options.search
-
-        self.options = {}
-        self.options['outtype'] = options.output
-        self.options['ignore_dirs'] = config['files']['ignore_dirs']
-
-        self.params = options.params.split()
-        self.options['start_path'] = self.params[0]
-        self.options['count'] = self.params[1]
-        try:
-            self.options['file_filter'] = self.params[2]
-        except IndexError:
-            self.options['file_filter'] = '*.*'
+        self.search  = options.search
+        self.outtype = options.output
+        self.params  = options.params.split()
 
     def _about(self, *a):
         print self.abstrac.comments
@@ -83,7 +73,7 @@ class Cli_Presentation(object):
 
     def show_search_toplevel(self):
         search_module = __import__(self.search + '.search')
-        search_toplevel = search_module.search.Control('Cli', self.options).run()
+        search_toplevel = search_module.search.Control('Cli', self.outtype, self.params).run()
 
     def run(self):
         self.show_search_toplevel()