diff --git a/GUI/configImporter.py b/GUI/configImporter.py new file mode 100644 index 0000000..622cf1b --- /dev/null +++ b/GUI/configImporter.py @@ -0,0 +1,30 @@ +import ConfigParser + + +class ConfigImporter(): + def __init__(self, filename): + """Read the filename into the parser.""" + self.filename = filename + self.parser = ConfigParser.ConfigParser() + self.parser.read(self.filename) + + def load_common_attributes(self): + """Loads common attributes from the initialized file.""" + try: + return self.parser.get('GUI_Options', 'CommonParameters') + except: + return 'One, Two, Three' + + def load_output_types(self): + """Loads output types from the initialized file.""" + try: + return self.parser.get('GUI_Options', 'OutputTypes') + except: + return 'csv' + + def load_always_attributes(self): + """Loads attributes that are always searched for from the initialized file.""" + try: + return self.parser.get('GUI_Options', 'AlwaysParameters') + except: + return 'Name, Weight' diff --git a/GUI/gui.py b/GUI/gui.py index 9b16cef..6e71bd1 100644 --- a/GUI/gui.py +++ b/GUI/gui.py @@ -1,38 +1,11 @@ from Tkinter import * import os -class ConfigImporter(): - def __init__(self, filename): - """Read the filename into the parser.""" - import ConfigParser - self.filename = filename - self.parser = ConfigParser.ConfigParser() - self.parser.read(self.filename) +from configImporter import * - def load_common_attributes(self): - """Loads common attributes from the initialized file.""" - try: - return self.parser.get('GUI_Options', 'CommonParameters') - except: - return 'One, Two, Three' - - def load_output_types(self): - """Loads output types from the initialized file.""" - try: - return self.parser.get('GUI_Options', 'OutputTypes') - except: - return 'csv' - - def load_always_attributes(self): - """Loads attributes that are always searched for from the initialized file.""" - try: - return self.parser.get('GUI_Options', 'AlwaysParameters') - except: - return 'Name, Weight' - class GUI(): - def __init__(self, search, config_file='GUI/gui.cfg', sourceloader = None, in_source=True): + def __init__(self, search, config_file='GUI/gui.cfg', sourceloader=None, in_source=True): """Boots the window, configuration.""" if in_source: current_dir = os.path.dirname(os.path.abspath(__file__)) @@ -168,7 +141,7 @@ class GUI(): print "No known class, {}, {}".format(name, var) self.values = values - if all([values.get(i)!='' for i in self.required_variables]): + if all([values.get(i) != '' for i in self.required_variables]): self.finish_with_search = True self.window.destroy() else: diff --git a/fourmi.py b/fourmi.py index 86f2808..18397ab 100755 --- a/fourmi.py +++ b/fourmi.py @@ -3,6 +3,7 @@ Fourmi, a web scraper build to search specific information for a given compound (and it's pseudonyms). Usage: + fourmi fourmi search fourmi [options] search fourmi [options] [-v | -vv | -vvv] [--include= | --exclude=] search @@ -24,6 +25,7 @@ Options: """ from twisted.internet import reactor + from scrapy.crawler import Crawler from scrapy import signals, log import docopt @@ -31,6 +33,7 @@ import docopt from FourmiCrawler.spider import FourmiSpider from utils.configurator import Configurator from utils.sourceloader import SourceLoader +from GUI import gui def setup_crawler(compound, settings, source_loader, attributes): @@ -82,3 +85,6 @@ if __name__ == '__main__': elif arguments["list"]: print "-== Available Sources ==-" print str(loader) + else: + gui_window = gui.GUI(search, sourceloader=SourceLoader()) + gui_window.run() diff --git a/gui_launcher.py b/gui_launcher.py deleted file mode 100644 index bd356bd..0000000 --- a/gui_launcher.py +++ /dev/null @@ -1,7 +0,0 @@ -from fourmi import search -from GUI import gui -from utils.sourceloader import SourceLoader - - -gui_window = gui.GUI(search, sourceloader=SourceLoader()) -gui_window.run()