update converters types

subliminal/converters/__init__.py

@@ -4,4 +4,4 @@
 
 if TYPE_CHECKING:
     # Tuple of language (alpha3, country, script), with country and script optional
-    LanguageTuple = tuple[str] | tuple[str, str | None] | tuple[str, str | None, str | None]
+    LanguageTuple = tuple[str, str | None, str | None]

subliminal/converters/addic7ed.py

@@ -16,27 +16,29 @@ class Addic7edConverter(LanguageReverseConverter):
     def __init__(self) -> None:
         self.name_converter = language_converters['name']
         self.from_addic7ed: dict[str, LanguageTuple] = {
-            'Català': ('cat',),
-            'Chinese (Simplified)': ('zho',),
-            'Chinese (Traditional)': ('zho',),
-            'Euskera': ('eus',),
-            'Galego': ('glg',),
-            'Greek': ('ell',),
-            'Malay': ('msa',),
-            'Portuguese (Brazilian)': ('por', 'BR'),
+            'Català': ('cat', None, None),
+            'Chinese (Simplified)': ('zho', None, None),
+            'Chinese (Traditional)': ('zho', None, None),
+            'Euskera': ('eus', None, None),
+            'French (Canadian)': ('fra', 'CA', None),
+            'Galego': ('glg', None, None),
+            'Greek': ('ell', None, None),
+            'Malay': ('msa', None, None),
+            'Portuguese (Brazilian)': ('por', 'BR', None),
             'Serbian (Cyrillic)': ('srp', None, 'Cyrl'),
-            'Serbian (Latin)': ('srp',),
-            'Spanish (Latin America)': ('spa',),
-            'Spanish (Spain)': ('spa',),
+            'Serbian (Latin)': ('srp', None, None),
+            'Spanish (Latin America)': ('spa', None, None),
+            'Spanish (Spain)': ('spa', None, None),
         }
         self.to_addic7ed: dict[LanguageTuple, str] = {
-            ('cat',): 'Català',
-            ('zho',): 'Chinese (Simplified)',
-            ('eus',): 'Euskera',
-            ('glg',): 'Galego',
-            ('ell',): 'Greek',
-            ('msa',): 'Malay',
-            ('por', 'BR'): 'Portuguese (Brazilian)',
+            ('cat', None, None): 'Català',
+            ('zho', None, None): 'Chinese (Simplified)',
+            ('eus', None, None): 'Euskera',
+            ('fra', 'CA', None): 'French (Canadian)',
+            ('glg', None, None): 'Galego',
+            ('ell', None, None): 'Greek',
+            ('msa', None, None): 'Malay',
+            ('por', 'BR', None): 'Portuguese (Brazilian)',
             ('srp', None, 'Cyrl'): 'Serbian (Cyrillic)',
         }
         self.codes = self.name_converter.codes | set(self.from_addic7ed.keys())
@@ -45,16 +47,22 @@ def convert(self, alpha3: str, country: str | None = None, script: str | None =
         """Convert an alpha3 language code with an alpha2 country code and a script code into a custom code."""
         if (alpha3, country, script) in self.to_addic7ed:
             return self.to_addic7ed[(alpha3, country, script)]
-        if (alpha3, country) in self.to_addic7ed:
-            return self.to_addic7ed[(alpha3, country)]
-        if (alpha3,) in self.to_addic7ed:
-            return self.to_addic7ed[(alpha3,)]
+        if (alpha3, country, None) in self.to_addic7ed:
+            return self.to_addic7ed[(alpha3, country, None)]
+        if (alpha3, None, None) in self.to_addic7ed:
+            return self.to_addic7ed[(alpha3, None, None)]
 
-        return self.name_converter.convert(alpha3, country, script)  # type: ignore[no-any-return]
+        return self.name_converter.convert(alpha3, country, script)
 
     def reverse(self, code: str) -> LanguageTuple:
         """Reverse a custom code into alpha3, country and script code."""
         if code in self.from_addic7ed:
-            return self.from_addic7ed[code]
+            ret = self.from_addic7ed[code]
+            if len(ret) == 1:
+                return (*ret, None, None)
+            if len(ret) == 2:
+                return (*ret, None)
+            # if len(ret) == 3:
+            return ret
 
-        return self.name_converter.reverse(code)  # type: ignore[no-any-return]
+        return self.name_converter.reverse(code)

subliminal/converters/opensubtitlescom.py

@@ -18,33 +18,35 @@ class OpenSubtitlesComConverter(LanguageReverseConverter):
 
     def __init__(self) -> None:
         self.alpha2_converter = language_converters['alpha2']
-        self.from_opensubtitlescom: dict[str, LanguageTuple] = {
+        self.from_opensubtitlescom: dict[str, tuple[str, str | None]] = {
             'pt-br': ('por', 'BR'),
             'pt-pt': ('por', 'PT'),
             'zh-cn': ('zho', 'CN'),
             'zh-tw': ('zho', 'TW'),
             'ze': ('zho', 'US'),
             'me': ('srp', 'ME'),
-            'sy': ('syr',),
-            'ma': ('mni',),
-            'at': ('ast',),
+            'sy': ('syr', None),
+            'ma': ('mni', None),
+            'at': ('ast', None),
+        }
+        self.to_opensubtitlescom: dict[tuple[str, str | None], str] = {
+            v: k for k, v in self.from_opensubtitlescom.items()
         }
-        self.to_opensubtitlescom: dict[LanguageTuple, str] = {v: k for k, v in self.from_opensubtitlescom.items()}
         self.codes = self.alpha2_converter.codes | set(self.from_opensubtitlescom.keys())
 
     def convert(self, alpha3: str, country: str | None = None, script: str | None = None) -> str:
         """Convert an alpha3 language code with an alpha2 country code and a script code into a custom code."""
         if (alpha3, country) in self.to_opensubtitlescom:
             return self.to_opensubtitlescom[(alpha3, country)]
-        if (alpha3,) in self.to_opensubtitlescom:
-            return self.to_opensubtitlescom[(alpha3,)]
+        if (alpha3, None) in self.to_opensubtitlescom:
+            return self.to_opensubtitlescom[(alpha3, None)]
 
-        return self.alpha2_converter.convert(alpha3, country, script)  # type: ignore[no-any-return]
+        return self.alpha2_converter.convert(alpha3, country, script)
 
     def reverse(self, code: str) -> LanguageTuple:
         """Reverse a custom code into alpha3, country and script code."""
         code_lower = code.lower()
         if code_lower in self.from_opensubtitlescom:
-            return self.from_opensubtitlescom[code_lower]
+            return (*self.from_opensubtitlescom[code_lower], None)
 
-        return self.alpha2_converter.reverse(code)  # type: ignore[no-any-return]
+        return self.alpha2_converter.reverse(code)

subliminal/converters/tvsubtitles.py

@@ -15,29 +15,29 @@ class TVsubtitlesConverter(LanguageReverseConverter):
 
     def __init__(self) -> None:
         self.alpha2_converter = language_converters['alpha2']
-        self.from_tvsubtitles: dict[str, LanguageTuple] = {
+        self.from_tvsubtitles: dict[str, tuple[str, str | None]] = {
             'br': ('por', 'BR'),
-            'ua': ('ukr',),
-            'gr': ('ell',),
-            'cn': ('zho',),
-            'jp': ('jpn',),
-            'cz': ('ces',),
+            'ua': ('ukr', None),
+            'gr': ('ell', None),
+            'cn': ('zho', None),
+            'jp': ('jpn', None),
+            'cz': ('ces', None),
         }
-        self.to_tvsubtitles: dict[LanguageTuple, str] = {v: k for k, v in self.from_tvsubtitles.items()}
+        self.to_tvsubtitles: dict[tuple[str, str | None], str] = {v: k for k, v in self.from_tvsubtitles.items()}
         self.codes = self.alpha2_converter.codes | set(self.from_tvsubtitles.keys())
 
     def convert(self, alpha3: str, country: str | None = None, script: str | None = None) -> str:
         """Convert an alpha3 language code with an alpha2 country code and a script code into a custom code."""
         if (alpha3, country) in self.to_tvsubtitles:
             return self.to_tvsubtitles[(alpha3, country)]
-        if (alpha3,) in self.to_tvsubtitles:
-            return self.to_tvsubtitles[(alpha3,)]
+        if (alpha3, None) in self.to_tvsubtitles:
+            return self.to_tvsubtitles[(alpha3, None)]
 
-        return self.alpha2_converter.convert(alpha3, country, script)  # type: ignore[no-any-return]
+        return self.alpha2_converter.convert(alpha3, country, script)
 
     def reverse(self, code: str) -> LanguageTuple:
         """Reverse a custom code into alpha3, country and script code."""
         if code in self.from_tvsubtitles:
-            return self.from_tvsubtitles[code]
+            return (*self.from_tvsubtitles[code], None)
 
-        return self.alpha2_converter.reverse(code)  # type: ignore[no-any-return]
+        return self.alpha2_converter.reverse(code)