Merge c81de1f693 into 85d93464e2

Replaced dplay.se with discoveryplus.com
Removed comedycentral.se (it will redirect to paramount.com)
Removed kanal9play.se (site is dead)

README.md

@@ -115,15 +115,13 @@ This script works for:
 
 -  aftonbladet.se
 -  bambuser.com
--  comedycentral.se
 -  di.se
+-  discoveryplus.com
 -  dn.se
--  dplay.se
 -  dr.dk
 -  efn.se
 -  expressen.se
 -  hbo.com
--  kanal9play.se
 -  nickelodeon.nl
 -  nickelodeon.no
 -  nickelodeon.se
@@ -143,7 +141,6 @@ This script works for:
 -  ur.se
 -  urplay.se
 -  vg.no
--  viagame.com
 
 ## License
 

lib/svtplay_dl/postprocess/__init__.py

@@ -31,7 +31,7 @@ class postprocess:
             if os.path.isfile(path):
                 self.detect = path
 
-    def merge(self):
+    def merge(self, merge_subtitle):
         if self.detect is None:
             logging.error("Cant detect ffmpeg or avconv. Cant mux files without it.")
             return
@@ -60,7 +60,7 @@ class postprocess:
         streams = _streams(stderr)
         videotrack, audiotrack = _checktracks(streams)
 
-        if self.config.get("merge_subtitle"):
+        if merge_subtitle:
             logging.info("Merge audio, video and subtitle into %s", new_name.name)
         else:
             logging.info(f"Merge audio and video into {str(new_name.name).replace('.audio', '')}")
@@ -89,7 +89,7 @@ class postprocess:
             arguments += ["-map", f"{videotrack}"]
         if audiotrack:
             arguments += ["-map", f"{audiotrack}"]
-        if self.config.get("merge_subtitle"):
+        if merge_subtitle:
             langs = _sublanguage(self.stream, self.config, self.subfixes)
             tracks = [x for x in [videotrack, audiotrack] if x]
             subs_nr = 0
@@ -135,7 +135,7 @@ class postprocess:
             os.remove(audio_filename)
 
         # This if statement is for use cases where both -S and -M are specified to not only merge the subtitle but also store it separately.
-        if self.config.get("merge_subtitle") and not self.config.get("subtitle"):
+        if merge_subtitle and not self.config.get("subtitle"):
             if self.subfixes and len(self.subfixes) >= 2 and self.config.get("get_all_subtitles"):
                 for subfix in self.subfixes:
                     subfile = orig_filename.parent / (orig_filename.stem + "." + subfix + ".srt")

lib/svtplay_dl/service/tv4play.py

@@ -198,7 +198,7 @@ class Tv4play(Service, OpenGraphThumbMixin):
             res = self.http.request(
                 "post",
                 "https://client-gateway.tv4.a2d.tv/graphql",
-                headers={"Client-Name": "tv4-web", "Client-Version": "4.0.0", "Content-Type": "application/json", "Authorization": f"Bearer {token}"},
+                headers={"Client-Name": "tv4-web", "Client-Version": "5.2.0", "Content-Type": "application/json", "Authorization": f"Bearer {token}"},
                 json=data,
             )
             janson = res.json()
@@ -242,7 +242,7 @@ class Tv4play(Service, OpenGraphThumbMixin):
         res = self.http.request(
             "post",
             "https://client-gateway.tv4.a2d.tv/graphql",
-            headers={"Client-Name": "tv4-web", "Client-Version": "4.0.0", "Content-Type": "application/json", "Authorization": f"Bearer {token}"},
+            headers={"Client-Name": "tv4-web", "Client-Version": "5.2.0", "Content-Type": "application/json", "Authorization": f"Bearer {token}"},
             json=data,
         )
         return res.json()
@@ -261,7 +261,7 @@ class Tv4play(Service, OpenGraphThumbMixin):
             res = self.http.request(
                 "post",
                 "https://client-gateway.tv4.a2d.tv/graphql",
-                headers={"Client-Name": "tv4-web", "Client-Version": "4.0.0", "Content-Type": "application/json"},
+                headers={"Client-Name": "tv4-web", "Client-Version": "5.2.0", "Content-Type": "application/json"},
                 json=data,
             )
             janson = res.json()

lib/svtplay_dl/utils/getmedia.py

@@ -153,8 +153,9 @@ def get_one_media(stream):
         logging.info("No subtitles available")
         return
 
+    merge_subtitle = False
     if not stream.config.get("list_quality"):
-        subtitle_decider(stream, subtitles)
+        merge_subtitle = subtitle_decider(stream, subtitles)
         if stream.config.get("force_subtitle"):
             return
 
@@ -219,6 +220,6 @@ def get_one_media(stream):
         if fstream.audio and not post.detect and fstream.finished:
             logging.warning("Can't find ffmpeg/avconv. audio and video is in seperate files. if you dont want this use -P hls or hds")
         if post.detect and fstream.config.get("no_merge") is False:
-            post.merge()
+            post.merge(merge_subtitle)
         else:
             logging.info("All done. Not postprocessing files, leaving them completely untouched.")

lib/svtplay_dl/utils/stream.py

@@ -119,8 +119,8 @@ def subtitle_decider(stream, subtitles):
                 print(subtitles[0].url)
             else:
                 subtitles[0].download()
-    elif stream.config.get("merge_subtitle"):
+        return stream.config.get("merge_subtitle")
-        stream.config.set("merge_subtitle", False)
+    return False
 
 
 def resolution(streams, resolutions: List) -> List: