Version 5.12.3 (#674)

* Fixing #673 changing subtitle language in the UI did not take effect in the command (thanks to danielly2020)
* Fixing #673 extract subtitle command was looking for subtitle index, not absolute index (thanks to danielly2020)

Author: cdgriffith

CHANGES

@@ -1,8 +1,13 @@
 # Changelog
 
+## Version 5.12.3
+
+* Fixing #673 changing subtitle langauge in the UI did not take effect in the command (thanks to danielly2020)
+* Fixing #673 extract subtitle command was looking for subtitle index, not absolute index (thanks to danielly2020)
+
 ## Version 5.12.2
 
-* Fixing #671 Switching to the NVEncC AV1 encoder will break FastFlix (thanks to Krawk)
+* Fixing #670 #671 Switching to the NVEncC AV1 encoder will break FastFlix (thanks to Krawk and EfxAceituna)
 * Fixing error switching between copy and other encoders will break FastFlix
 
 ## Version 5.12.1

fastflix/data/languages.yaml

@@ -11086,3 +11086,18 @@ Disable interlace check:
   ukr: Вимкнути перевірку чересстрочності
   kor: 인터레이스 검사 비활성화
   ron: Dezactivați verificarea intercalării
+Could not extract subtitle track:
+  eng: Could not extract subtitle track
+  deu: Untertitelspur konnte nicht extrahiert werden
+  fra: Impossible d'extraire la piste des sous-titres
+  ita: Impossibile estrarre la traccia dei sottotitoli
+  spa: No se ha podido extraer la pista de subtítulos
+  jpn: 字幕トラックを抽出できませんでした
+  rus: Не удалось извлечь дорожку субтитров
+  por: Não foi possível extrair a faixa de legendas
+  swe: Det gick inte att extrahera undertextspår
+  pol: Nie można wyodrębnić ścieżki napisów
+  chs: 无法提取字幕音轨
+  ukr: Не вдалося витягти доріжку субтитрів
+  kor: 자막 트랙을 추출할 수 없습니다.
+  ron: Nu s-a putut extrage pista de subtitrare

fastflix/version.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-__version__ = "5.12.2"
+__version__ = "5.12.3"
 __author__ = "Chris Griffith"

fastflix/widgets/background_tasks.py

@@ -46,17 +46,18 @@ def run(self):
 
 
 class ExtractSubtitleSRT(QtCore.QThread):
-    def __init__(self, app: FastFlixApp, main, index, signal):
+    def __init__(self, app: FastFlixApp, main, index, signal, language):
         super().__init__(main)
         self.main = main
         self.app = app
         self.index = index
         self.signal = signal
+        self.language = language
 
     def run(self):
-        filename = str(Path(self.main.output_video).parent / f"{self.main.output_video}.{self.index}.srt").replace(
-            "\\", "/"
-        )
+        filename = str(
+            Path(self.main.output_video).parent / f"{self.main.output_video}.{self.index}.{self.language}.srt"
+        ).replace("\\", "/")
         self.main.thread_logging_signal.emit(f"INFO:{t('Extracting subtitles to')} {filename}")
 
         try:
@@ -67,7 +68,7 @@ def run(self):
                     "-i",
                     self.main.input_video,
                     "-map",
-                    f"0:{self.index}",
+                    f"0:s:{self.index}",
                     "-c",
                     "srt",
                     "-f",
@@ -82,7 +83,8 @@ def run(self):
         else:
             if result.returncode != 0:
                 self.main.thread_logging_signal.emit(
-                    f"WARNING:{t('Could not extract subtitle track')} {self.index}: {result.stdout}"
+                    f"WARNING:{t('Could not extract subtitle track')} "
+                    f"{self.index}: {result.stdout.decode('utf-8', errors='ignore')}"
                 )
             else:
                 self.main.thread_logging_signal.emit(f"INFO:{t('Extracted subtitles successfully')}")

fastflix/widgets/panels/subtitle_panel.py

@@ -167,7 +167,9 @@ def init_move_buttons(self):
         return layout
 
     def extract(self):
-        worker = ExtractSubtitleSRT(self.parent.app, self.parent.main, self.index, self.extract_completed_signal)
+        worker = ExtractSubtitleSRT(
+            self.parent.app, self.parent.main, self.index, self.extract_completed_signal, language=self.language
+        )
         worker.start()
         self.gif_label.show()
         self.widgets.extract.hide()
@@ -180,7 +182,7 @@ def init_language(self, sub_track: SubtitleTrack):
             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)
+        self.widgets.language.currentIndexChanged.connect(self.update_language)
         layout = QtWidgets.QHBoxLayout()
         layout.addWidget(QtWidgets.QLabel(t("Language")))
         layout.addWidget(self.widgets.language)
@@ -240,6 +242,12 @@ def update_burn_in(self):
         self.updating_burn = False
         self.page_update()
 
+    def update_language(self):
+        if not self.loading:
+            sub_track = self.app.fastflix.current_video.subtitle_tracks[self.index]
+            sub_track.language = self.language
+            self.page_update()
+
     def page_update(self):
         if not self.loading:
             self.check_dis_button()
@@ -367,10 +375,6 @@ def new_source(self):
                     first_default.widgets.burn_in.setChecked(True)
 
         super()._new_source(self.tracks)
-        self.get_settings()
-
-    def get_settings(self):
-        return  # TODO remove
 
     def reload(self, original_tracks):
         clear_list(self.tracks)

fastflix/widgets/video_options.py

@@ -173,8 +173,6 @@ def get_settings(self):
 
         if getattr(self.main.current_encoder, "enable_audio", False):
             self.audio.update_audio_settings()
-        if getattr(self.main.current_encoder, "enable_subtitles", False):
-            self.subtitles.get_settings()
         if getattr(self.main.current_encoder, "enable_attachments", False):
             self.attachments.update_cover_settings()