* Fixing missing undefined option for audio tracks (thanks to danielly2020)

Author: cdgriffith

CHANGES

@@ -4,6 +4,7 @@
 
 * Fixing #654 Failed to import attachment due to bad mime type gathering (thanks to larsk2)
 * Fixing #659 current profile panel won't open (thanks to danielly2020)
+* Fixing missing undefined option for audio tracks (thanks to danielly2020)
 * Fixing missing unittests for common encoder options
 * Fixing some extra spaces in commands
 * Fixing logs were showing red for info commands

fastflix/audio_processing.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from copy import deepcopy
 
-from iso639 import Lang
 from iso639.exceptions import InvalidLanguageValue
 from box import Box
 
 from fastflix.models.profiles import AudioMatch, MatchType, MatchItem
+from fastflix.language import Language
 
 
 def apply_audio_filters(
@@ -55,7 +55,7 @@ def apply_audio_filters(
             subset_tracks = []
             for track in original_tracks:
                 try:
-                    if Lang(audio_match.match_input) == Lang(track.tags["language"]):
+                    if Language(audio_match.match_input) == Language(track.tags["language"]):
                         subset_tracks.append((track, audio_match))
                 except (InvalidLanguageValue, KeyError):
                     pass

fastflix/language.py

@@ -11,6 +11,7 @@
 from pathlib import Path
 import importlib.resources
 
+from iso639 import Lang
 from platformdirs import user_data_dir
 from box import Box
 
@@ -19,7 +20,7 @@
     language_file = str(lf.resolve())
 
 
-__all__ = ["t", "translate"]
+__all__ = ["t", "translate", "Language"]
 
 config = os.getenv("FF_CONFIG")
 if config:
@@ -58,3 +59,18 @@ def translate(text):
 
 
 t = translate
+
+
+class Language(Lang):
+    _data = Lang._data.copy()
+    _data["name"]["Undefined"] = {
+        "pt1": "un",
+        "pt2b": "und",
+        "pt2t": "und",
+        "pt3": "und",
+        "pt5": "",
+        "name": "Undefined",
+    }
+    _data["pt2b"]["und"] = {"name": "Undefined", "pt1": "un", "pt2t": "und", "pt3": "und", "pt5": ""}
+    _data["pt3"]["und"] = {"name": "Undefined", "pt2b": "und", "pt1": "un", "pt2t": "und", "pt5": ""}
+    _data["pt1"]["un"] = {"name": "Undefined", "pt2b": "und", "pt2t": "und", "pt3": "und", "pt5": ""}

fastflix/widgets/panels/audio_panel.py

@@ -3,11 +3,11 @@
 import logging
 
 from box import Box
-from iso639 import Lang, iter_langs
+from iso639 import iter_langs
 from iso639.exceptions import InvalidLanguageValue
 from PySide6 import QtGui, QtWidgets
 
-from fastflix.language import t
+from fastflix.language import t, Language
 from fastflix.models.encode import AudioTrack
 from fastflix.models.profiles import Profile
 from fastflix.models.fastflix_app import FastFlixApp
@@ -18,7 +18,7 @@
 from fastflix.widgets.windows.audio_conversion import AudioConversion
 from fastflix.widgets.windows.disposition import Disposition
 
-language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1]
+language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1] + ["Undefined"]
 logger = logging.getLogger("fastflix")
 
 disposition_options = [
@@ -84,7 +84,7 @@ def __init__(
         self.widgets.language.setMaximumWidth(150)
         if audio_track.language:
             try:
-                lang = Lang(audio_track.language).name
+                lang = Language(audio_track.language).name
             except InvalidLanguageValue:
                 pass
             else:
@@ -215,7 +215,7 @@ def enabled(self):
     def language(self) -> str:
         if self.widgets.language.currentIndex() == 0:
             return ""
-        return Lang(self.widgets.language.currentText()).pt2b
+        return Language(self.widgets.language.currentText()).pt2b
 
     @property
     def title(self) -> str:

fastflix/widgets/panels/queue_panel.py

@@ -6,8 +6,6 @@
 import logging
 import os
 from pathlib import Path
-
-# import tracemalloc
 import gc
 
 from platformdirs import user_data_dir

fastflix/widgets/panels/subtitle_panel.py

@@ -3,11 +3,11 @@
 from typing import Union
 
 from box import Box
-from iso639 import Lang, iter_langs
+from iso639 import iter_langs
 from iso639.exceptions import InvalidLanguageValue
 from PySide6 import QtCore, QtGui, QtWidgets
 
-from fastflix.language import t
+from fastflix.language import t, Language
 from fastflix.models.encode import SubtitleTrack
 from fastflix.models.fastflix_app import FastFlixApp
 from fastflix.resources import loading_movie, get_icon
@@ -40,7 +40,7 @@
     "xsub": "text",
 }
 
-language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1]
+language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1] + ["Undefined"]
 
 # TODO give warning about exact time needed for text based subtitles
 
@@ -177,7 +177,7 @@ def init_language(self, sub_track: SubtitleTrack):
         self.widgets.language.addItems(language_list)
         self.widgets.language.setMaximumWidth(110)
         try:
-            self.widgets.language.setCurrentIndex(language_list.index(Lang(sub_track.language).name))
+            self.widgets.language.setCurrentIndex(language_list.index(Language(sub_track.language).name))
         except Exception:
             self.widgets.language.setCurrentIndex(language_list.index("English"))
         self.widgets.language.currentIndexChanged.connect(self.page_update)
@@ -212,7 +212,7 @@ def enabled(self):
 
     @property
     def language(self):
-        return Lang(self.widgets.language.currentText()).pt2b
+        return Language(self.widgets.language.currentText()).pt2b
 
     @property
     def burn_in(self):
@@ -295,11 +295,11 @@ def lang_match(self, track: Union[Subtitle, dict], ignore_first=False):
             self._first_selected = True
             return True
         try:
-            track_lang = Lang(language)
+            track_lang = Language(language)
         except InvalidLanguageValue:
             return True
         else:
-            if Lang(self.app.fastflix.config.opt("subtitle_language")) == track_lang:
+            if Language(self.app.fastflix.config.opt("subtitle_language")) == track_lang:
                 if (
                     not ignore_first
                     and self.app.fastflix.config.opt("subtitle_select_first_matching")

fastflix/widgets/settings.py

@@ -4,12 +4,12 @@
 import shutil
 from pathlib import Path
 
-from iso639 import Lang, iter_langs
+from iso639 import iter_langs
 from iso639.exceptions import InvalidLanguageValue
 from PySide6 import QtCore, QtGui, QtWidgets
 
 from fastflix.exceptions import FastFlixInternalException
-from fastflix.language import t
+from fastflix.language import t, Language
 from fastflix.models.fastflix_app import FastFlixApp
 from fastflix.shared import error_message, link
 
@@ -91,7 +91,7 @@ def __init__(self, app: FastFlixApp, main, *args, **kwargs):
             # index = known_language_list.index("Chinese (Traditional)")
 
             else:
-                index = known_language_list.index(Lang(self.app.fastflix.config.language).name)
+                index = known_language_list.index(Language(self.app.fastflix.config.language).name)
         except (IndexError, InvalidLanguageValue):
             logger.exception(f"{t('Could not find language for')} {self.app.fastflix.config.language}")
             index = known_language_list.index("English")
@@ -320,7 +320,7 @@ def save(self):
             # self.app.fastflix.config.language = "cht"
 
             else:
-                self.app.fastflix.config.language = Lang(self.language_combo.currentText()).pt3
+                self.app.fastflix.config.language = Language(self.language_combo.currentText()).pt3
         except InvalidLanguageValue:
             error_message(
                 f"{t('Could not set language to')} {self.language_combo.currentText()}\n {t('Please report this issue')}"

fastflix/widgets/windows/profile_window.py

@@ -3,20 +3,20 @@
 import logging
 
 from box import Box
-from iso639 import Lang, iter_langs
+from iso639 import iter_langs
 from PySide6 import QtCore, QtWidgets
 
 from fastflix.exceptions import FastFlixError
 from fastflix.flix import ffmpeg_valid_color_primaries, ffmpeg_valid_color_transfers, ffmpeg_valid_color_space
-from fastflix.language import t
+from fastflix.language import t, Language
 from fastflix.widgets.panels.abstract_list import FlixList
 from fastflix.models.fastflix_app import FastFlixApp
 from fastflix.models.encode import x265Settings, setting_types
 from fastflix.models.profiles import AudioMatch, Profile, MatchItem, MatchType, AdvancedOptions
 from fastflix.shared import error_message
 from fastflix.encoders.common.audio import channel_list
 
-language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1]
+language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1] + ["Undefined"]
 
 logger = logging.getLogger("fastflix")
 
@@ -143,7 +143,7 @@ def get_settings(self):
         elif match_item_enum == MatchItem.TRACK:
             match_input_value = self.match_input.currentText()
         elif match_item_enum == MatchItem.LANGUAGE:
-            match_input_value = Lang(self.match_input.currentText()).pt2b
+            match_input_value = Language(self.match_input.currentText()).pt2b
         elif match_item_enum == MatchItem.CHANNELS:
             match_input_value = str(self.match_input.currentIndex())
         else:
@@ -495,7 +495,7 @@ def save(self):
             subtitle_enabled = False
         elif self.subtitle_select.sub_language.currentIndex() != 0:
             subtitle_select_preferred_language = True
-            sub_lang = Lang(self.subtitle_select.sub_language.currentText()).pt2b
+            sub_lang = Language(self.subtitle_select.sub_language.currentText()).pt2b
 
         self.advanced_options.color_space = (
             None