safety fixes

Author: cdgriffith

CHANGES

@@ -3,7 +3,7 @@
 ## Version 5.12.0
 
 * Adding automatic downloads for rigaya encoders on Windows
-* Adding audio normalization (thanks to Xoanon88)
+* Adding #45 audio normalization (thanks to HannesJo0139, Marco Ravich, Kirill, Werner Robitza, Type-Delta, Xoanon88)
 * Adding ability to add subtitle or audio track
 * Fixing custom_crf not being found (thanks to Norbert)
 

fastflix/data/languages.yaml

@@ -10797,3 +10797,11 @@ Add Audio Track:
   eng: Add Audio Track
 Add Text Based Subtitle Track:
   eng: Add Text Based Subtitle Track
+Audio Normalization:
+  eng: Audio Normalization
+This will run the audio normalization process on all streams of:
+  eng: This will run the audio normalization process on all streams of
+"and create an output file with audio format ":
+  eng: "and create an output file with audio format "
+Please make sure the source and output files are specified:
+  eng: Please make sure the source and output files are specified

fastflix/encoders/modify/settings_panel.py

@@ -9,7 +9,7 @@
 from fastflix.language import t
 from fastflix.models.encode import ModifySettings
 from fastflix.models.fastflix_app import FastFlixApp
-from fastflix.shared import message
+from fastflix.shared import message, yes_no_message
 from fastflix.widgets.background_tasks import AudioNoramlize
 from fastflix.resources import loading_movie, get_icon
 
@@ -40,17 +40,21 @@ def __init__(self, parent, main, app: FastFlixApp):
         grid.addWidget(self.audio_normalize, 2, 0, 1, 1)
         grid.addWidget(self.extract_label, 2, 2, 1, 1)
 
+        self.audio_format_combo = QtWidgets.QComboBox()
+        self.audio_format_combo.addItems(self.app.fastflix.config.sane_audio_selection)
+        grid.addWidget(self.audio_format_combo, 2, 1, 1, 1)
+
         add_audio_track = QtWidgets.QPushButton(t("Add Audio Track"))
         add_audio_track.clicked.connect(self.select_audio_file)
         self.add_audio_track_file_path = QtWidgets.QLineEdit()
         grid.addWidget(add_audio_track, 3, 0, 1, 1)
-        grid.addWidget(self.add_audio_track_file_path, 3, 2, 1, 1)
+        grid.addWidget(self.add_audio_track_file_path, 3, 1, 1, 2)
 
         add_sub_track = QtWidgets.QPushButton(t("Add Text Based Subtitle Track"))
         add_sub_track.clicked.connect(self.select_subtitle_file)
         self.add_sub_track_file_path = QtWidgets.QLineEdit()
         grid.addWidget(add_sub_track, 4, 0, 1, 1)
-        grid.addWidget(self.add_sub_track_file_path, 4, 2, 1, 1)
+        grid.addWidget(self.add_sub_track_file_path, 4, 1, 1, 2)
 
         grid.addWidget(QtWidgets.QWidget(), 6, 0, 6, 1)
         grid.addLayout(self._add_custom(disable_both_passes=True), 11, 0, 1, 6)
@@ -85,7 +89,26 @@ def select_subtitle_file(self):
         self.main.build_commands()
 
     def select_run_audio_normalize(self):
-        self.norm_thread = AudioNoramlize(self.app, self.main, self.signal)
+        try:
+            in_path = Path(self.app.fastflix.current_video.source)
+            out_path = Path(self.app.fastflix.current_video.video_settings.output_path)
+            assert in_path.exists()
+            assert out_path.parent.exists()
+        except Exception:
+            message(t("Please make sure the source and output files are specified"))
+            return
+
+        audio_type = self.audio_format_combo.currentText()
+        resp = yes_no_message(
+            t("This will run the audio normalization process on all streams of")
+            + f"\n{in_path}\n"
+            + t("and create an output file with audio format ")
+            + f"{audio_type}\n@ {out_path}\n",
+            title="Audio Normalization",
+        )
+        if not resp:
+            return
+        self.norm_thread = AudioNoramlize(self.app, self.main, audio_type, self.signal)
         self.norm_thread.start()
         self.movie.start()
         self.extract_label.show()

fastflix/models/encode.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from pathlib import Path
 from typing import Optional, Union
 
 from pydantic import BaseModel, Field, field_validator
@@ -49,7 +48,7 @@ class AttachmentTrack(BaseModel):
     outdex: int
     index: Optional[int] = None
     attachment_type: str = "cover"
-    file_path: Optional[Path] = None
+    file_path: Optional[str] = None
     filename: Optional[str] = None
 
 

fastflix/models/video.py

@@ -89,7 +89,7 @@ class VideoSettings(BaseModel):
     video_title: str = ""
     video_track_title: str = ""
     selected_track: int = 0
-    output_path: Path = None
+    output_path: Path | None = None
     # scale: Optional[str] = None
     resolution_method: str = "auto"
     resolution_custom: str | None = None
@@ -198,7 +198,7 @@ class Video(BaseModel):
     duration: Union[float, int] = 0
     streams: Box = None
 
-    work_path: Path = None
+    work_path: Path | None = None
     format: Box = None
     interlaced: Union[str, bool] = False
     concat: bool = False

fastflix/widgets/background_tasks.py

@@ -90,11 +90,12 @@ def run(self):
 
 
 class AudioNoramlize(QtCore.QThread):
-    def __init__(self, app: FastFlixApp, main, signal):
+    def __init__(self, app: FastFlixApp, main, audio_type, signal):
         super().__init__(main)
         self.main = main
         self.app = app
         self.signal = signal
+        self.audio_type = audio_type
 
     def run(self):
         try:
@@ -103,7 +104,7 @@ def run(self):
             if not out_file:
                 self.signal.emit("No source video provided")
             normalizer = FFmpegNormalize(
-                audio_codec="aac", extension=out_file.suffix.lstrip("."), video_codec="copy", progress=True
+                audio_codec=self.audio_type, extension=out_file.suffix.lstrip("."), video_codec="copy", progress=True
             )
             logger.info(f"Running audio normalization - will output video to {str(out_file)}")
             normalizer.add_media_file(str(self.app.fastflix.current_video.source), str(out_file))

fastflix/widgets/main.py

@@ -175,6 +175,7 @@ def __init__(self, parent, app: FastFlixApp):
         self.scale_updating = False
         self.last_thumb_hash = ""
         self.page_updating = False
+        self.previous_encoder_no_audio = False
 
         self.large_preview = LargePreview(self)
 
@@ -778,8 +779,9 @@ def init_encoder_drop_down(self):
     def change_encoder(self):
         if not self.initialized or not self.convert_to:
             return
-        self.video_options.change_conversion(self.convert_to)
+        self.video_options.change_conversion(self.convert_to, previous_encoder_no_audio=self.previous_encoder_no_audio)
         self.update_output_type()
+        self.previous_encoder_no_audio = self.convert_to.lower() in ("copy", "modify", "gif")
 
     def update_output_type(self):
         self.widgets.output_type_combo.clear()

fastflix/widgets/panels/cover_panel.py

@@ -224,7 +224,7 @@ def update_cover_settings(self):
                     AttachmentTrack(
                         index=index,
                         outdex=start_outdex,
-                        file_path=attachment,
+                        file_path=str(attachment),
                         filename=filename,
                         attachment_type="cover",
                     )

fastflix/widgets/video_options.py

@@ -118,7 +118,7 @@ def _get_audio_formats(self, encoder=None):
     def audio_formats(self):
         return self._get_audio_formats()
 
-    def change_conversion(self, conversion):
+    def change_conversion(self, conversion, previous_encoder_no_audio=False):
         conversion = conversion.strip()
         encoder = self.app.fastflix.encoders[conversion]
         self.current_settings.close()
@@ -158,6 +158,8 @@ def change_conversion(self, conversion):
         if not self.reloading:
             self.audio.allowed_formats(self._get_audio_formats(encoder))
             # self.update_profile()
+        if previous_encoder_no_audio:
+            self.audio.new_source(self.audio_formats)
 
     def get_settings(self):
         if not self.app.fastflix.current_video: