Use strings instead of bools

Author: Managor

tests/test_tldr.py

@@ -21,7 +21,7 @@ def test_whole_page(page_name, monkeypatch):
             sys.stdout = io.StringIO()
             sys.stdout.buffer = types.SimpleNamespace()
             sys.stdout.buffer.write = lambda x: sys.stdout.write(x.decode("utf-8"))
-            tldr.output(f_original, True, True)
+            tldr.output(f_original, "both")
 
             sys.stdout.seek(0)
             tldr_output = sys.stdout.read().encode("utf-8")
@@ -39,7 +39,7 @@ def test_markdown_mode(page_name):
         sys.stdout = io.StringIO()
         sys.stdout.buffer = types.SimpleNamespace()
         sys.stdout.buffer.write = lambda x: sys.stdout.write(x.decode("utf-8"))
-        tldr.output(d_original.splitlines(), True, True, plain=True)
+        tldr.output(d_original.splitlines(), "both", plain=True)
 
         sys.stdout.seek(0)
         tldr_output = sys.stdout.read().encode("utf-8")

tldr.py

@@ -415,7 +415,7 @@ def colors_of(key: str) -> Tuple[str, str, List[str]]:
     return (color, on_color, attrs)
 
 
-def output(page: str, short: bool, long: bool, plain: bool = False) -> None:
+def output(page: str, display_option_length: str, plain: bool = False) -> None:
     def emphasise_example(x: str) -> str:
         # Use ANSI escapes to enable italics at the start and disable at the end
         # Also use the color yellow to differentiate from the default green
@@ -479,11 +479,10 @@ def emphasise_example(x: str) -> str:
             line = line.replace(r'\}\}', '__ESCAPED_CLOSE__')
 
             # Extract long or short options from placeholders
-            if not (short and long):
-                if short:
-                    line = re.sub(r'{{\[([^|]+)\|[^|]+?\]}}', r'\1', line)
-                elif long:
-                    line = re.sub(r'{{\[[^|]+\|([^|]+?)\]}}', r'\1', line)
+            if display_option_length == "short":
+                line = re.sub(r'{{\[([^|]+)\|[^|]+?\]}}', r'\1', line)
+            elif display_option_length == "long":
+                line = re.sub(r'{{\[[^|]+\|([^|]+?)\]}}', r'\1', line)
 
             elements = [' ' * 2 * LEADING_SPACES_NUM]
             for item in COMMAND_SPLIT_REGEX.split(line):
@@ -640,23 +639,20 @@ def main() -> None:
     parser = create_parser()
 
     options = parser.parse_args()
-    short = False
-    long = True
+    display_option_length = "long"
     if not (options.short_options or options.long_options):
         if os.environ.get('TLDR_OPTIONS') == "short":
-            short = True
-            long = False
+            display_option_length = "short"
         elif os.environ.get('TLDR_OPTIONS') == "long":
-            short = False
-            long = True
+            display_option_length = "long"
         elif os.environ.get('TLDR_OPTIONS') == "both":
-            short = True
-            long = True
+            display_option_length = "both"
     if options.short_options:
-        short = True
-        long = False
+        display_option_length = "short"
     if options.long_options:
-        long = True
+        display_option_length = "long"
+    if options.short_options and options.long_options:
+        display_option_length = "both"
     colorama.init(strip=options.color)
     if options.color is False:
         os.environ["FORCE_COLOR"] = "true"
@@ -675,8 +671,7 @@ def main() -> None:
             if file_path.exists():
                 with file_path.open(encoding='utf-8') as open_file:
                     output(open_file.read().encode('utf-8').splitlines(),
-                           short,
-                           long,
+                           display_option_length,
                            plain=options.markdown)
     elif options.search:
         search_term = options.search.lower()
@@ -710,7 +705,7 @@ def main() -> None:
                     " send a pull request to: https://github.com/tldr-pages/tldr"
                 ).format(cmd=command))
             else:
-                output(results[0][0], short, long, plain=options.markdown)
+                output(results[0][0], display_option_length, plain=options.markdown)
                 if results[1:]:
                     platforms_str = [result[1] for result in results[1:]]
                     are_multiple_platforms = len(platforms_str) > 1