Remux to mkv instead

diff --git a/mirror-svtplay.py b/mirror-svtplay.py
index 94cb95670ff8014076e7f7297c6f5b1214c72a3b..a08e14cc6581cbdf43a5d9ff2812777929d7b99c 100755 (executable)
--- a/mirror-svtplay.py
+++ b/mirror-svtplay.py
@@ -3,6 +3,7 @@ from pathlib import Path
 import requests
 import youtube_dl
 import os
 import requests
 import youtube_dl
 import os

+import datetime 

 
 def videos():
     totpages = requests.get("https://www.svtplay.se/api/latest").json()['totalPages']
 
 def videos():
     totpages = requests.get("https://www.svtplay.se/api/latest").json()['totalPages']


@@ -17,6 +18,31 @@ def find_genre(video):
             return cluster['name']
     return "Ingen genre"
 
             return cluster['name']
     return "Ingen genre"
 

+def svtplay_meta2xml(meta):
+
+    return f"""
+    <Tags>
+      <Tag>
+        <Simple>
+          <Name>TITLE</Name>
+          <String>{meta['programTitle']} - {meta['title']}</String>
+        </Simple>
+        <Simple>
+          <Name>DESCRIPTION</Name>
+          <String>{meta['shortDescription']}</String>
+        </Simple>
+        <Simple>
+          <Name>DATE_RELEASED</Name>
+          <String>{meta['year']}</String>
+        </Simple>
+        <Simple>
+          <Name>SYNOPSIS</Name>
+          <String>{meta['description']}</String>
+        </Simple>
+      </Tag>
+    </Tags>
+    """
+

 def download(video):
 #    print(video)
     if video['live']:
 def download(video):
 #    print(video)
     if video['live']:


@@ -29,20 +55,34 @@ def download(video):
         path = Path(genre) / Path(video['programTitle'].replace('/','_'))
         if not path.exists():
             path.mkdir()
         path = Path(genre) / Path(video['programTitle'].replace('/','_'))
         if not path.exists():
             path.mkdir()

-    postprocessors = []
-    postprocessors.append( { 'key': 'EmbedThumbnail', })
-    postprocessors.append( { 'key': 'FFmpegMetadata', })
+    apa = video['id']
+#    import pdb;pdb.set_trace()
+    if video['season'] == 0 and not video['movie']: #not a series, something like Rapport
+        validf = datetime.datetime.strptime(video['validFrom'],'%Y-%m-%dT%H:%M:%S%z')
+        valids = validf.strftime("%Y-%m-%dT%H")
+        title = f"{video['programTitle']} {valids}"
+    if not video['movie'] and video['season'] != 0:
+        title = f"{video['programTitle']} S{video['season']}E{video['episodeNumber']} {video['title']}"
+    with open(f"{path}/{video['id']}.xml","w") as xmlfile:
+        xmlfile.write(svtplay_meta2xml(video))
+    add_subs = ''
+    if video['closedCaptioned']:
+        add_subs = f"'{path}/'*{apa}*.vtt"

     ydl_opts = { 'download_archive': 'svtplay.archive',
                  'writesubtitles': True, 
                  'allsubtitles': True,
                  'writethumbnail': True, 
                  'outtmpl' : f'{path}/%(title)s-%(id)s.%(ext)s',
     ydl_opts = { 'download_archive': 'svtplay.archive',
                  'writesubtitles': True, 
                  'allsubtitles': True,
                  'writethumbnail': True, 
                  'outtmpl' : f'{path}/%(title)s-%(id)s.%(ext)s',

-                 'postprocessors': postprocessors, }
-    extra_info = { 'id': video['id'],
-                   'title': video['programTitle'] + ' - ' + video['title'],
-                   'description': video.get('description',''),
+                 'postprocessors': [
+                  {
+                  'key': 'ExecAfterDownload',
+                  'exec_cmd': f"echo {{}} && mkvmerge --global-tags '{path}'/{apa}.xml --attach-file '{path}/'*{apa}*jpg '{path}'/*{apa}*.mp4 {add_subs} -o '{path}/{title}.mkv' && rm '{path}'/*{apa}*",
+                  }]
+                }
+    extra_info = { 'id': apa,
+                   'title': title,

                    'thumbnail':video.get('thumbnail','').replace('{format}','large')} 
                    'thumbnail':video.get('thumbnail','').replace('{format}','large')} 

-
+    xml = svtplay_meta2xml(video)

     with youtube_dl.YoutubeDL(ydl_opts) as ydl:
         ydl.extract_info("http://svtplay.se/"+video['contentUrl'], extra_info=extra_info)
        
     with youtube_dl.YoutubeDL(ydl_opts) as ydl:
         ydl.extract_info("http://svtplay.se/"+video['contentUrl'], extra_info=extra_info)