From d0d0f9f72d113076e6b188a2c3b7342f30ae4115 Mon Sep 17 00:00:00 2001 From: "Jip J. Dekker" Date: Tue, 17 Jun 2014 22:11:22 +0200 Subject: [PATCH] GUI as the default command without arguments --- GUI/gui.py | 1 + fourmi.py | 9 +++++++-- gui_launcher.py | 7 ------- 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 gui_launcher.py diff --git a/GUI/gui.py b/GUI/gui.py index 466ef98..9b16cef 100644 --- a/GUI/gui.py +++ b/GUI/gui.py @@ -1,4 +1,5 @@ from Tkinter import * +import os class ConfigImporter(): def __init__(self, filename): diff --git a/fourmi.py b/fourmi.py index e6d7e9a..e6ddf12 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] [--include= | --exclude=] search @@ -24,14 +25,15 @@ Options: """ from twisted.internet import reactor + from scrapy.crawler import Crawler -from scrapy import log, signals -from scrapy.utils.project import get_project_settings +from scrapy import signals 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): @@ -79,3 +81,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()