From c2f5f7a3e721b67bb80b8daaa97cd6ee28ffbbf8 Mon Sep 17 00:00:00 2001 From: Samuel Date: Sun, 2 Aug 2020 17:20:56 -0500 Subject: [PATCH 01/11] Continue on internet connection failure --- tldr.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tldr.py b/tldr.py index 998ee73..5fb7d29 100755 --- a/tldr.py +++ b/tldr.py @@ -188,10 +188,10 @@ def get_page(command, remote=None, platforms=None, languages=None): return get_page_for_platform(command, platform, remote, language) except HTTPError as err: if err.code != 404: - raise + continue except URLError: if not PAGES_SOURCE_LOCATION.startswith('file://'): - raise + continue return False @@ -269,7 +269,7 @@ def output(page): colored( line.replace('>', '').replace('<', ''), *colors_of('description') - ) + ) sys.stdout.buffer.write(line.encode('utf-8')) elif line[0] == '-': line = '\n' + ' ' * LEADING_SPACES_NUM + \ From 249de6e600d25b63ce353d355baef7e06615215f Mon Sep 17 00:00:00 2001 From: Samuel Woon Date: Mon, 3 Aug 2020 16:46:29 -0500 Subject: [PATCH 02/11] Update tldr.py --- tldr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tldr.py b/tldr.py index 5fb7d29..f4f86d6 100755 --- a/tldr.py +++ b/tldr.py @@ -188,10 +188,10 @@ def get_page(command, remote=None, platforms=None, languages=None): return get_page_for_platform(command, platform, remote, language) except HTTPError as err: if err.code != 404: - continue + raise except URLError: if not PAGES_SOURCE_LOCATION.startswith('file://'): - continue + pass return False From baae0c82851111bec01bf69c7c688443ed84e906 Mon Sep 17 00:00:00 2001 From: Samuel Woon Date: Mon, 3 Aug 2020 17:31:41 -0500 Subject: [PATCH 03/11] Update tldr.py --- tldr.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tldr.py b/tldr.py index f4f86d6..9ddfb20 100755 --- a/tldr.py +++ b/tldr.py @@ -187,11 +187,9 @@ def get_page(command, remote=None, platforms=None, languages=None): try: return get_page_for_platform(command, platform, remote, language) except HTTPError as err: - if err.code != 404: - raise + pass except URLError: - if not PAGES_SOURCE_LOCATION.startswith('file://'): - pass + pass return False From 880103aa27a1f5d64a8f0f5581826c584fb44ad4 Mon Sep 17 00:00:00 2001 From: samuel-w Date: Mon, 3 Aug 2020 22:11:51 -0500 Subject: [PATCH 04/11] Store exception for later --- tldr.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/tldr.py b/tldr.py index 9ddfb20..bbd168d 100755 --- a/tldr.py +++ b/tldr.py @@ -176,6 +176,7 @@ def get_language_list(): def get_page(command, remote=None, platforms=None, languages=None): + returnErr = {} if platforms is None: platforms = get_platform_list() if languages is None: @@ -185,13 +186,21 @@ def get_page(command, remote=None, platforms=None, languages=None): if platform is None: continue try: - return get_page_for_platform(command, platform, remote, language) + return {"entry": get_page_for_platform(command, platform, remote, language), "error": False} except HTTPError as err: +<<<<<<< Updated upstream pass except URLError: pass +======= + if err.code != 404: + returnErr = {"entry": err, "error": True} + except URLError as err: + if not PAGES_SOURCE_LOCATION.startswith('file://'): + returnErr = {"entry": err, "error": True} +>>>>>>> Stashed changes - return False + return returnErr DEFAULT_COLORS = { @@ -403,6 +412,7 @@ def main(): with open(command, encoding='utf-8') as open_file: output(open_file.read().encode('utf-8').splitlines()) else: +<<<<<<< Updated upstream try: command = '-'.join(options.command) result = get_page( @@ -420,7 +430,26 @@ def main(): else: output(result) except URLError as e: +======= + command = '-'.join(options.command) + result = get_page( + command, + options.source, + options.platform, + options.language + ) + print(result) + if result.get("entry"): + output(result['entry']) + elif result['error']: +>>>>>>> Stashed changes sys.exit("Error fetching from tldr: {}".format(e)) + else: + sys.exit(( + "`{cmd}` documentation is not available. " + "Consider contributing Pull Request to " + "https://github.com/tldr-pages/tldr" + ).format(cmd=command)) def cli(): From dc6b3220e63a3917122530a894f63074105940b3 Mon Sep 17 00:00:00 2001 From: samuel-w Date: Mon, 3 Aug 2020 22:14:49 -0500 Subject: [PATCH 05/11] Lint --- tldr.py | 36 ++++++++---------------------------- 1 file changed, 8 insertions(+), 28 deletions(-) diff --git a/tldr.py b/tldr.py index bbd168d..f377f25 100755 --- a/tldr.py +++ b/tldr.py @@ -186,19 +186,19 @@ def get_page(command, remote=None, platforms=None, languages=None): if platform is None: continue try: - return {"entry": get_page_for_platform(command, platform, remote, language), "error": False} + return { + "entry": get_page_for_platform( + command, + platform, + remote, + language), + "error": False} except HTTPError as err: -<<<<<<< Updated upstream - pass - except URLError: - pass -======= if err.code != 404: returnErr = {"entry": err, "error": True} except URLError as err: if not PAGES_SOURCE_LOCATION.startswith('file://'): returnErr = {"entry": err, "error": True} ->>>>>>> Stashed changes return returnErr @@ -412,25 +412,6 @@ def main(): with open(command, encoding='utf-8') as open_file: output(open_file.read().encode('utf-8').splitlines()) else: -<<<<<<< Updated upstream - try: - command = '-'.join(options.command) - result = get_page( - command, - options.source, - options.platform, - options.language - ) - if not result: - print(( - "`{cmd}` documentation is not available. " - "Consider contributing Pull Request to " - "https://github.com/tldr-pages/tldr" - ).format(cmd=command), file=sys.stderr) - else: - output(result) - except URLError as e: -======= command = '-'.join(options.command) result = get_page( command, @@ -442,8 +423,7 @@ def main(): if result.get("entry"): output(result['entry']) elif result['error']: ->>>>>>> Stashed changes - sys.exit("Error fetching from tldr: {}".format(e)) + sys.exit("Error fetching from tldr: {}".format(result['error'])) else: sys.exit(( "`{cmd}` documentation is not available. " From afe5124b6d1570cfa73f4091f83193d405ae4f29 Mon Sep 17 00:00:00 2001 From: samuel-w Date: Mon, 3 Aug 2020 22:18:02 -0500 Subject: [PATCH 06/11] Remove debug print --- tldr.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tldr.py b/tldr.py index f377f25..6ccd3f9 100755 --- a/tldr.py +++ b/tldr.py @@ -419,7 +419,6 @@ def main(): options.platform, options.language ) - print(result) if result.get("entry"): output(result['entry']) elif result['error']: From 048a58970f229a94db24a9d1cd605aa4afdb5ef1 Mon Sep 17 00:00:00 2001 From: samuel-w Date: Mon, 3 Aug 2020 22:23:25 -0500 Subject: [PATCH 07/11] Fix code order --- tldr.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tldr.py b/tldr.py index 6ccd3f9..c81c300 100755 --- a/tldr.py +++ b/tldr.py @@ -419,10 +419,10 @@ def main(): options.platform, options.language ) - if result.get("entry"): + if result['error']: + sys.exit("Error fetching from tldr: {}".format(result['entry'])) + elif result.get("entry"): output(result['entry']) - elif result['error']: - sys.exit("Error fetching from tldr: {}".format(result['error'])) else: sys.exit(( "`{cmd}` documentation is not available. " From 1e6bac579a7a04eb4d456a1af4ad77fc061ac22d Mon Sep 17 00:00:00 2001 From: samuel-w Date: Tue, 4 Aug 2020 01:35:46 -0500 Subject: [PATCH 08/11] Fix crash --- tldr.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tldr.py b/tldr.py index c81c300..58d0cd3 100755 --- a/tldr.py +++ b/tldr.py @@ -419,7 +419,7 @@ def main(): options.platform, options.language ) - if result['error']: + if result.get('error'): sys.exit("Error fetching from tldr: {}".format(result['entry'])) elif result.get("entry"): output(result['entry']) @@ -440,3 +440,5 @@ def cli(): if __name__ == "__main__": cli() +y']) + else: From c87f5c0f8736ef55eac8b5450ad18b4d251434fb Mon Sep 17 00:00:00 2001 From: samuel-w Date: Tue, 4 Aug 2020 01:36:56 -0500 Subject: [PATCH 09/11] Fix crash --- tldr.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tldr.py b/tldr.py index 58d0cd3..611e26d 100755 --- a/tldr.py +++ b/tldr.py @@ -440,5 +440,3 @@ def cli(): if __name__ == "__main__": cli() -y']) - else: From 3aa2fd28fed938922485116b309344bec3d5ce51 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Fri, 28 Aug 2020 01:17:12 -0400 Subject: [PATCH 10/11] fix indentation --- tldr.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tldr.py b/tldr.py index 611e26d..627a049 100755 --- a/tldr.py +++ b/tldr.py @@ -75,8 +75,8 @@ def load_page_from_cache(command, platform, language): with open(get_cache_file_path( command, platform, - language), 'rb' - ) as cache_file: + language + ), 'rb') as cache_file: cache_file_contents = cache_file.read() return cache_file_contents except Exception: From 9df6f68d5fc6beb2ecbe12b51c1920e17cd63221 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Fri, 28 Aug 2020 01:17:34 -0400 Subject: [PATCH 11/11] Update tldr.py --- tldr.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tldr.py b/tldr.py index 627a049..f5b98d7 100755 --- a/tldr.py +++ b/tldr.py @@ -191,8 +191,10 @@ def get_page(command, remote=None, platforms=None, languages=None): command, platform, remote, - language), - "error": False} + language + ), + "error": False + } except HTTPError as err: if err.code != 404: returnErr = {"entry": err, "error": True}