🐛 Fix CLI when using --minimal output in certain cases (#103)

* 🐛 Fix CLI when using --minimal output in certain cases Happen when used with -a (alternative) * ✔️ Add tests
jawah · Sep 16, 2021 · 26be638 · 26be638
1 parent 4db2367
commit 26be638
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 2 deletions.
diff --git a/charset_normalizer/cli/normalizer.py b/charset_normalizer/cli/normalizer.py
@@ -195,7 +195,7 @@ def cli_detect(argv: List[str] = None) -> int:
 
             if len(matches) > 1 and args.alternatives:
                 for el in matches:
-                    if el != matches:
+                    if el != best_guess:
                         x_.append(
                             CliDetectionResult(
                                 abspath(my_file.name),
@@ -273,7 +273,16 @@ def cli_detect(argv: List[str] = None) -> int:
             )
         )
     else:
-        print(", ".join([el.encoding if el.encoding else "undefined" for el in x_]))
+        for my_file in args.files:
+            print(
+                ", ".join(
+                    [
+                        el.encoding if el.encoding else "undefined"
+                        for el in x_
+                        if el.path == abspath(my_file.name)
+                    ]
+                )
+            )
 
     return 0
 

diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -65,6 +65,46 @@ def test_multiple_file(self):
             )
         )
 
+    def test_with_alternative(self):
+        self.assertEqual(
+            0,
+            cli_detect(
+                [
+                    '-a',
+                    './data/sample.1.ar.srt',
+                    './data/sample.1.he.srt',
+                    './data/sample-chinese.txt'
+                ]
+            )
+        )
+
+    def test_with_minimal_output(self):
+        self.assertEqual(
+            0,
+            cli_detect(
+                [
+                    '-m',
+                    './data/sample.1.ar.srt',
+                    './data/sample.1.he.srt',
+                    './data/sample-chinese.txt'
+                ]
+            )
+        )
+
+    def test_with_minimal_and_alt(self):
+        self.assertEqual(
+            0,
+            cli_detect(
+                [
+                    '-m',
+                    '-a',
+                    './data/sample.1.ar.srt',
+                    './data/sample.1.he.srt',
+                    './data/sample-chinese.txt'
+                ]
+            )
+        )
+
     def test_non_existent_file(self):
 
         with self.assertRaises(SystemExit) as cm: