From 3f73fade27d6b335f1988061f40e4df80f53bbdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petter=20Kraab=C3=B8l?= Date: Tue, 26 Mar 2019 14:45:18 +0100 Subject: [PATCH] Updated arguments. --- setup.py | 2 +- tcd/__init__.py | 10 ++++++++-- tcd/arguments.py | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 0cb43c1..537780b 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,6 @@ tests_require=test_requirements, url='https://github.com/PetterKraabol/Twitch-Chat-Downloader', package_data={'tcd': ['settings.reference.json']}, - version='3.0.2', + version='3.0.3', zip_safe=True, ) diff --git a/tcd/__init__.py b/tcd/__init__.py index d0e30bf..141871b 100644 --- a/tcd/__init__.py +++ b/tcd/__init__.py @@ -18,7 +18,7 @@ def main(): parser.add_argument('-v', f'--{Arguments.Name.VIDEO}', type=str, help='Video IDs separated by commas') parser.add_argument('-c', f'--{Arguments.Name.CHANNEL}', type=str, help='Channel names separated by commas') parser.add_argument(f'--{Arguments.Name.FIRST}', type=int, default=5, help='Download chat from the last n VODs') - parser.add_argument(f'--{Arguments.Name.CLIENT_ID}', type=str, help='Twitch client ID') + parser.add_argument(f'--{Arguments.Name.CLIENT_ID.replace("_", "-")}', type=str, help='Twitch client ID') parser.add_argument(f'--{Arguments.Name.VERBOSE}', action='store_true', help='Verbose output') parser.add_argument('-q', f'--{Arguments.Name.QUIET}', action='store_true') parser.add_argument('-o', f'--{Arguments.Name.OUTPUT}', type=str, help='Output directory', default='./') @@ -28,7 +28,8 @@ def main(): parser.add_argument(f'--{Arguments.Name.VERSION}', action='store_true', help='Settings version') parser.add_argument(f'--{Arguments.Name.FORMATS}', action='store_true', help='List available formats') parser.add_argument(f'--{Arguments.Name.PREVIEW}', action='store_true', help='Preview output') - parser.add_argument(f'--{Arguments.Name.SETTINGS_FILE}', type=str, + parser.add_argument(f'--{Arguments.Name.SETTINGS}', action='store_true', help='Preview output') + parser.add_argument(f'--{Arguments.Name.SETTINGS_FILE.replace("_", "-")}', type=str, default=str(Path.home()) + '/.config/tcd/settings.json', help='Settings file location') parser.add_argument(f'--{Arguments.Name.DEBUG}', action='store_true', help='Print debug messages') @@ -42,6 +43,11 @@ def main(): Logger().log('Twitch Chat Downloader {}'.format(Settings().config.get('version', '')), retain=False) return + # Print settings file location + if Arguments().settings: + Logger().log(str(Settings().filepath)) + return + # Client ID Settings().config['client_id'] = Arguments().client_id or Settings().config.get('client_id', None) or input( 'Twitch client ID: ').strip() diff --git a/tcd/arguments.py b/tcd/arguments.py index 1afff09..9c93ac4 100644 --- a/tcd/arguments.py +++ b/tcd/arguments.py @@ -9,7 +9,8 @@ class Arguments(metaclass=Singleton): """ class Name: - SETTINGS_FILE: str = 'settings' + SETTINGS_FILE: str = 'settings_file' + SETTINGS: str = 'settings' INIT: str = 'init' VERBOSE: str = 'verbose' QUIET: str = 'quiet' @@ -37,6 +38,7 @@ def __init__(self, arguments: Optional[Dict[str, Union[str, bool, int]]] = None) # Required arguments and booleans self.settings_file: str = arguments[Arguments.Name.SETTINGS_FILE] + self.settings: str = arguments[Arguments.Name.SETTINGS] self.init: bool = arguments[Arguments.Name.INIT] self.verbose: bool = arguments[Arguments.Name.VERBOSE] self.debug: bool = arguments[Arguments.Name.DEBUG]