diff --git a/scripts/monboob b/scripts/monboob index 84bd30bd4348a3f8719b520225485774b7d99b5c..5cf92671ab23bd72e982b1bf53f2f38a65e34e57 100755 --- a/scripts/monboob +++ b/scripts/monboob @@ -43,7 +43,7 @@ class Monboob(ConsoleApplication): def main(self, argv): self.load_config() - self.weboob.load_backends(ICapMessages, storage=self.create_storage()) + self.load_backends(ICapMessages, storage=self.create_storage()) return self.process_command(*argv[1:]) diff --git a/weboob/frontends/boobank/boobank.py b/weboob/frontends/boobank/boobank.py index 307822b85223add58c7e2cc57502d9d60b984ce0..b07da4531ec005e80a148bcec2a75c531992a88a 100644 --- a/weboob/frontends/boobank/boobank.py +++ b/weboob/frontends/boobank/boobank.py @@ -36,7 +36,7 @@ class Boobank(ConsoleApplication): APPNAME = 'boobank' def main(self, argv): - self.weboob.load_backends(ICapBank, names=self.enabled_backends) + self.load_backends(ICapBank, names=self.enabled_backends) return self.process_command(*argv[1:]) @ConsoleApplication.command('List every available accounts') diff --git a/weboob/frontends/dummy/application.py b/weboob/frontends/dummy/application.py index 687ece30213f40de0c8c9950173bf22bbc72245b..c641f972924887295b2aa4057dca9eba8fefdbf7 100644 --- a/weboob/frontends/dummy/application.py +++ b/weboob/frontends/dummy/application.py @@ -29,7 +29,7 @@ class Dummy(BaseApplication): APPNAME = 'dummy' def main(self, argv): - self.weboob.load_backends() + self.load_backends() for backend in self.weboob.iter_backends(): print 'Backend [%s]' % backend.name diff --git a/weboob/frontends/havesex/application.py b/weboob/frontends/havesex/application.py index d5f1d2b920e1f8f595b3eec624b2ffb620bd2979..890722b4d99c0fc832f559f6ad3433cc4dbe0db7 100644 --- a/weboob/frontends/havesex/application.py +++ b/weboob/frontends/havesex/application.py @@ -27,7 +27,7 @@ class HaveSex(PromptApplication): def main(self, argv): self.load_config() - self.weboob.load_backends(ICapDating, storage=self.create_storage(self.STORAGE_FILENAME)) + self.load_backends(ICapDating, storage=self.create_storage(self.STORAGE_FILENAME)) return self.loop() diff --git a/weboob/frontends/qvideoob/application.py b/weboob/frontends/qvideoob/application.py index db32bb8c850706ec523fa1d806a85f2e6ef75c96..91c70a554d07c1ca1721c349579ed18de392cc3f 100644 --- a/weboob/frontends/qvideoob/application.py +++ b/weboob/frontends/qvideoob/application.py @@ -31,7 +31,7 @@ class QVideoob(QtApplication): } } def main(self, argv): - self.weboob.load_modules(ICapVideoProvider, names=self.enabled_backends) + self.load_modules(ICapVideoProvider) self.load_config() self.main_window = MainWindow(self.config, self.weboob) diff --git a/weboob/frontends/travel/application.py b/weboob/frontends/travel/application.py index 533af09363a1bc47c3f8eaa34bcc7da314909fb0..7a1182a5c37b91317cf30862c1e4a69fcb0cadeb 100644 --- a/weboob/frontends/travel/application.py +++ b/weboob/frontends/travel/application.py @@ -25,7 +25,7 @@ class Travel(ConsoleApplication): APPNAME = 'travel' def main(self, argv): - self.weboob.load_modules(ICapTravel) + self.load_modules(ICapTravel) return self.process_command(*argv[1:]) diff --git a/weboob/frontends/travel_ui/application.py b/weboob/frontends/travel_ui/application.py index 493f2f98d60819ed9984089b3274b4f517cabf9b..2438d1b6bd943fcfc092033d2ccecada951d981e 100644 --- a/weboob/frontends/travel_ui/application.py +++ b/weboob/frontends/travel_ui/application.py @@ -146,10 +146,10 @@ def refresh(self): backend.iter_station_search(self.combo_dest.get_current_text()): for departure in \ backend.iter_station_departures(station.id, arrival.id): - self.treestore.append(None, - [departure.type, - departure.time, - departure.arrival_station, + self.treestore.append(None, + [departure.type, + departure.time, + departure.arrival_station, departure.information]) @@ -159,6 +159,6 @@ class Travel(BaseApplication): def main(self, argv): "main fonction" - self.weboob.load_modules(ICapTravel) + self.load_modules(ICapTravel) TransilienUI(self.weboob) gtk.main() diff --git a/weboob/frontends/videoob/application.py b/weboob/frontends/videoob/application.py index 8390d1e1b7d48f5ecdcb92914d16f78b4f2b6533..c14495260359c82f78d1522961a9e3eac23c075f 100644 --- a/weboob/frontends/videoob/application.py +++ b/weboob/frontends/videoob/application.py @@ -26,7 +26,7 @@ class Videoob(ConsoleApplication): CONFIG = {} def main(self, argv): - self.weboob.load_modules(ICapVideoProvider, names=self.enabled_backends) + self.load_modules(ICapVideoProvider) return self.process_command(*argv[1:]) @ConsoleApplication.command('Get video information') diff --git a/weboob/frontends/wetboobs/application.py b/weboob/frontends/wetboobs/application.py index b84ff21c17760bc55c0a0030d8a7e8221cbc5374..a65fc8ccdff1483aec1cd57e497489a805802288 100644 --- a/weboob/frontends/wetboobs/application.py +++ b/weboob/frontends/wetboobs/application.py @@ -25,7 +25,7 @@ class WetBoobs(ConsoleApplication): APPNAME = 'wetboobs' def main(self, argv): - self.weboob.load_modules(ICapWeather) + self.load_modules(ICapWeather) return self.process_command(*argv[1:]) diff --git a/weboob/tools/application/base.py b/weboob/tools/application/base.py index e0e16cda570cd8e79b0bafcf6f5ab3ec4c776970..870325fd6b3c71c5081f26b564f741ba22d82710 100644 --- a/weboob/tools/application/base.py +++ b/weboob/tools/application/base.py @@ -106,14 +106,24 @@ def configure_parser(self, parser): def _configure_parser(self, parser): pass + def load_backends(self, caps=None, names=None, *args, **kwargs): + if names is None: + names = self._enabled_backends + self.weboob.load_backends(caps, names, *args, **kwargs) + + def load_modules(self, caps=None, names=None, *args, **kwargs): + if names is None: + names = self._enabled_backends + self.weboob.load_backends(caps, names, *args, **kwargs) + @classmethod def run(klass): app = klass() - parser = OptionParser('Usage: %prog [options (-h for help)] URL...') + parser = OptionParser('Usage: %prog [options (-h for help)] URL...') parser.add_option('-b', '--backends', help='what backend(s) to enable (comma separated)') - parser.add_option('-d', '--debug', action='store_true', help='display debug messages') - parser.add_option('-q', '--quiet', action='store_true', help='display only error messages') - parser.add_option('-v', '--verbose', action='store_true', help='display info messages') + parser.add_option('-d', '--debug', action='store_true', help='display debug messages') + parser.add_option('-q', '--quiet', action='store_true', help='display only error messages') + parser.add_option('-v', '--verbose', action='store_true', help='display info messages') app._configure_parser(parser) app.configure_parser(parser) app.options, args = parser.parse_args(sys.argv) @@ -127,7 +137,7 @@ def run(klass): level = logging.WARNING log_format = '%(asctime)s:%(levelname)s:%(filename)s:%(lineno)d:%(funcName)s %(message)s' logging.basicConfig(stream=sys.stdout, level=level, format=log_format) - app.enabled_backends = app.options.backends.split(',') if app.options.backends else None + app._enabled_backends = app.options.backends.split(',') if app.options.backends else None try: sys.exit(app.main(args)) except KeyboardInterrupt: