Add possibility to use --all-audio

.env.sample

@@ -8,7 +8,8 @@ TRANSFER_DESTINATION_FOLDER="../transcoder/raw"
 HANDBRAKE_PROCESS_NICE_LEVEL=10
 HANDBRAKE_PRESET_MOVIE="General/HQ 1080p30 Surround"
 HANDBRAKE_PRESET_SERIES="General/HQ 1080p30 Surround"
-HANDBRAKE_AUDIO_LANG_LIST="de,en"
+HANDBRAKE_AUDIO_LANG_LIST="de,en" # Leave empty to get all audio tracks
 OUT_VIDEO_FORMAT=".mkv"
 MIN_EPISODES_DURATION_MINUTES=30
 MAX_EPISODES_DURATION_MINUTES=90
+TRANSCODE_TIMEOUT_MINUTES=120

ripper/transfer_ripped.py

@@ -107,8 +107,7 @@ def transfer_ripped_dvd(ripped_dvd, destination_folder):
     subprocess.run(
         [
             "rsync",
-            "-az",
+            "-rzP",
-            "-e ssh",
             "--remove-source-files",
             ripped_dvd,
             destination_folder,

transcoder/transcode_dvd.py

@@ -37,6 +37,7 @@ HANDBRAKE_AUDIO_LANG_LIST = os.environ["HANDBRAKE_AUDIO_LANG_LIST"]
 OUT_VIDEO_FORMAT = os.environ["OUT_VIDEO_FORMAT"]
 MIN_EPISODES_DURATION_SECONDS = int(os.environ["MIN_EPISODES_DURATION_MINUTES"]) * 60
 MAX_EPISODES_DURATION_SECONDS = int(os.environ["MAX_EPISODES_DURATION_MINUTES"]) * 60
+TRANSCODE_TIMEOUT_SECONDS = int(os.environ["TRANSCODE_TIMEOUT_MINUTES"]) * 60
 
 SERIES_TITLE_REGEX = r"S(\d+)[ _]?E(\d+)(-(\d+))?$"
 
@@ -131,15 +132,21 @@ class Dvd:
             "HandBrakeCLI",
             "--preset",
             handbrake_preset,
-            "--audio-lang-list",
-            HANDBRAKE_AUDIO_LANG_LIST,
-            "--first-audio",
             "--input",
             self.dvd_path,
             "--output",
             output_file,
         ]
 
+        if HANDBRAKE_AUDIO_LANG_LIST.strip() == "":
+            args += ["--all-audio"]
+        else:
+            args += [
+                    "--audio-lang-list",
+                    HANDBRAKE_AUDIO_LANG_LIST,
+                    "--first-audio"]
+
+
         if os.path.exists(self.nodvdnav_file):
             args += ["--no-dvdnav"]
             self.append_line_to_logfile(
@@ -278,12 +285,19 @@ def transcode_episode(dvd: Dvd, season, episode, title_number):
 # Returns success
 def run_and_log_handbrake(dvd: Dvd, command) -> bool:
     with open(dvd.log_file, "a") as log_file:
-        proc = subprocess.run(
+        try:
-            command,
+            proc = subprocess.run(
-            stderr=subprocess.STDOUT,
+                command,
-            stdout=log_file,
+                stderr=subprocess.STDOUT,
-        )
+                stdout=log_file,
-        if proc.returncode != 0:
+                timeout=TRANSCODE_TIMEOUT_SECONDS,
+            )
+            if proc.returncode != 0:
+                return False
+        except subprocess.TimeoutExpired:
+            log_file.write(
+                f"Transcoding timeout of {TRANSCODE_TIMEOUT_SECONDS}s reached!"
+            )
             return False
 
     if check_handbrake_log_for_error(dvd):
@@ -307,23 +321,30 @@ def find_series_titles(dvd: Dvd):
         return read_titles_from_titles_file(dvd)
 
     with open(dvd.log_file, "w") as log_file:
-        proc = subprocess.run(
+        try:
-            [
+            proc = subprocess.run(
-                "nice",
+                [
-                "-n",
+                    "nice",
-                str(HANDBRAKE_PROCESS_NICE_LEVEL),
+                    "-n",
-                "HandBrakeCLI",
+                    str(HANDBRAKE_PROCESS_NICE_LEVEL),
-                "--input",
+                    "HandBrakeCLI",
-                dvd.dvd_path,
+                    "--input",
-                "-t",
+                    dvd.dvd_path,
-                "0",
+                    "-t",
-                "--min-duration",
+                    "0",
-                str(MIN_EPISODES_DURATION_SECONDS),
+                    "--min-duration",
-                "--json",
+                    str(MIN_EPISODES_DURATION_SECONDS),
-            ],
+                    "--json",
-            stdout=subprocess.PIPE,
+                ],
-            stderr=log_file,
+                stdout=subprocess.PIPE,
-        )
+                stderr=log_file,
+                timeout=TRANSCODE_TIMEOUT_SECONDS,
+            )
+        except subprocess.TimeoutExpired:
+            log_file.write(
+                f"Transcoding timeout of {TRANSCODE_TIMEOUT_SECONDS}s reached!"
+            )
+            return None
 
     if proc.returncode != 0:
         return None