From 7a86ddfbb677c37b143d501b8f592f03f5471394 Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Tue, 20 Apr 2010 18:58:58 +0200 Subject: [PATCH] move enabled backends option to BaseApplication --- weboob/frontends/videoob/application.py | 9 +-------- weboob/tools/application/base.py | 3 +++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/weboob/frontends/videoob/application.py b/weboob/frontends/videoob/application.py index 151ff086..787d5230 100644 --- a/weboob/frontends/videoob/application.py +++ b/weboob/frontends/videoob/application.py @@ -25,15 +25,8 @@ class Videoob(ConsoleApplication): APPNAME = 'videoob' CONFIG = {} - def configure_parser(self, parser): - parser.add_option('-b', '--backends', help='what backend(s) to enable (comma separated)') - def main(self, argv): - names = None - if self.options.backends: - names = self.options.backends.split(',') - - self.weboob.load_modules(ICapVideoProvider, names=names) + self.weboob.load_modules(ICapVideoProvider, names=self.enabled_backends) return self.process_command(*argv[1:]) @ConsoleApplication.command('Get video information') diff --git a/weboob/tools/application/base.py b/weboob/tools/application/base.py index 16d5540e..2ccde9cd 100644 --- a/weboob/tools/application/base.py +++ b/weboob/tools/application/base.py @@ -107,9 +107,11 @@ class BaseApplication(object): def run(klass): app = klass() 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') + app._configure_parser(parser) app.configure_parser(parser) app.options, args = parser.parse_args(sys.argv) if app.options.debug: @@ -122,6 +124,7 @@ class BaseApplication(object): 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 try: sys.exit(app.main(args)) except KeyboardInterrupt: