X-Git-Url: https://git.frykholm.com/svtplaydump.git/blobdiff_plain/c1d3d70220ef5ade6b82d295ce4ba4b18d5227bc..2301fe1403fe109e85b66e4c6f5cbe6da8521b5f:/svtplaydump.py

diff --git a/svtplaydump.py b/svtplaydump.py
index 05ea3f8..54d7ac0 100755
--- a/svtplaydump.py
+++ b/svtplaydump.py
@@ -31,7 +31,8 @@ import argparse
 import requests
 import sys, os
 import socket
-
+import feedparser
+from datetime import datetime, timezone
 class Video(dict):
     def __init__(self, *args, **kwargs):
         self.update(dict(*args, **kwargs))  # use the free update to set keys
@@ -76,6 +77,11 @@ def scrape_player_page(video):
         rtmp = flashvars['pathflv'][0]
         filename = video['title']+".flv"
         print(Popen(["mplayer","-dumpstream","-dumpfile",filename, rtmp], stdout=PIPE).communicate()[0])
+    if not 'timestamp' in video:
+        if soup.find_all(datetime=True):
+            xmldate_str = soup.find_all(datetime=True)[0].attrs['datetime']
+            video['timestamp'] = datetime(*feedparser._parse_date_w3dtf(xmldate_str)[:6]) #naive in utc
+            video['timestamp'] = video['timestamp'].replace(tzinfo=timezone.utc).astimezone(tz=None) #convert to local time
     if 'video' in flashvars:
         for reference in flashvars['video']['videoReferences']:
             if 'm3u8' in reference['url']:
@@ -115,7 +121,7 @@ def download_from_playlist(video):
             while(True):
                 try:
                     buf = ufile.read(4096)
-                except socket.error as e:
+                except (socket.error, TypeError) as e:
                     print("Error reading, skipping file")
                     print(e)
                     return
@@ -198,7 +204,9 @@ def remux(video, xml=None):
     if 'genre' in video:
         if not os.path.exists(video['genre']):
             os.mkdir(video['genre'])
-    video['path'] = os.path.join(video['genre'],basename+'.mkv')
+        video['path'] = os.path.join(video['genre'],basename+'.mkv')
+    else:
+        video['path'] = basename+'.mkv' 
     command = ["mkvmerge","-o",video['path'], '--title',video['title']]
 
     if xml:
@@ -218,6 +226,12 @@ def remux(video, xml=None):
             os.unlink(fname)
         except:
             pass
+    if 'timestamp' in video:
+        try:
+            os.utime(video['path'], times=(video['timestamp'].timestamp(),video['timestamp'].timestamp()))
+        except FileNotFoundError as e:
+            print(e)
+            
     
 def mkv_metadata(video):
     root = BeautifulSoup(features='xml')
@@ -256,7 +270,6 @@ if __name__ == "__main__":
     
     args = parser.parse_args()
     if args.rss: 
-        import feedparser
         d = feedparser.parse(args.rss)
         for e in d.entries:
             print(("Downloading: %s"%e.title))