getmedia: make the subtitle section a bit easier to read.

lib/svtplay_dl/utils/getmedia.py

@@ -20,6 +20,7 @@ from svtplay_dl.utils.output import find_dupes
 from svtplay_dl.utils.output import formatname
 from svtplay_dl.utils.stream import list_quality
 from svtplay_dl.utils.stream import select_quality
+from svtplay_dl.utils.stream import subtitle_decider
 from svtplay_dl.utils.text import exclude
 
 
@@ -104,7 +105,7 @@ def get_one_media(stream):
             sys.exit(2)
 
     videos = []
-    subs = []
+    subtitles = []
     subfixes = []
     error = []
     streams = stream.get()
@@ -120,7 +121,7 @@ def get_one_media(stream):
                     else:
                         videos.append(i)
                 if isinstance(i, subtitle):
-                    subs.append(i)
+                    subtitles.append(i)
     except Exception:
         if stream.config.get("verbose"):
             raise
@@ -151,44 +152,15 @@ def get_one_media(stream):
         )
         return
 
-    if stream.config.get("require_subtitle") and not subs:
+    if stream.config.get("require_subtitle") and not subtitles:
         logging.info("No subtitles available")
         return
 
-    if stream.config.get("subtitle") and stream.config.get("get_url"):
+    if not stream.config.get("list_quality"):
-        if subs:
+        subtitle_decider(stream, subtitles)
-            if stream.config.get("get_all_subtitles"):
-                for sub in subs:
-                    print(sub.url)
-            else:
-                print(subs[0].url)
         if stream.config.get("force_subtitle"):
             return
 
-    def options_subs_dl(subfixes):
-        if subs:
-            if stream.config.get("get_all_subtitles"):
-                for sub in subs:
-                    sub.download()
-                    if stream.config.get("merge_subtitle"):
-                        if sub.subfix:
-                            subfixes += [sub.subfix]
-                        else:
-                            stream.config.set("get_all_subtitles", False)
-            else:
-                subs[0].download()
-        elif stream.config.get("merge_subtitle"):
-            stream.config.set("merge_subtitle", False)
-
-    if stream.config.get("subtitle") and not stream.config.get("get_url"):
-        options_subs_dl(subfixes)
-        if stream.config.get("force_subtitle"):
-            if not subs:
-                logging.info("No subtitles available")
-            return
-
-    if stream.config.get("merge_subtitle") and not stream.config.get("subtitle"):
-        options_subs_dl(subfixes)
     if not videos:
         errormsg = None
         for exc in error:

lib/svtplay_dl/utils/stream.py

@@ -73,6 +73,44 @@ def audio_role(config, streams) -> List:
     return prioritized
 
 
+def subtitle_filter(subtitles) -> List:
+    languages = []
+    subs = []
+    preferred = subtitles[0].config.get("subtitle_preferred")
+    all_subs = subtitles[0].config.get("get_all_subtitles")
+
+    for sub in subtitles:
+        if sub.subfix not in languages:
+            if not all_subs and sub.subfix == preferred:
+                subs.append(sub)
+                languages.append(sub.subfix)
+            else:
+                subs.append(sub)
+                languages.append(sub.subfix)
+    return subs
+
+
+def subtitle_decider(stream, subtitles):
+    if subtitles and (stream.config.get("merge_subtitle") or stream.config.get("subtitle")):
+        subtitles = subtitle_filter(subtitles)
+        if stream.config.get("get_all_subtitles"):
+            for sub in subtitles:
+                if stream.config.get("get_url"):
+                    print(sub.url)
+                else:
+                    sub.download()
+                if stream.config.get("merge_subtitle"):
+                    if not sub.subfix:
+                        stream.config.set("get_all_subtitles", False)
+        else:
+            if stream.config.get("get_url"):
+                print(subtitles[0].url)
+            else:
+                subtitles[0].download()
+    elif stream.config.get("merge_subtitle"):
+        stream.config.set("merge_subtitle", False)
+
+
 def select_quality(config, streams):
     high = 0
     if isinstance(config.get("quality"), str):