X-Git-Url: https://git.frykholm.com/svtplaydump.git/blobdiff_plain/d26e691949687bb63dd9177fc5e32a7b2816cff6..5ab69ab46e2573b945a17ca508858387d4be0100:/svtplaydump.py

diff --git a/svtplaydump.py b/svtplaydump.py
index 39bc9ff..e9a4a3b 100755
--- a/svtplaydump.py
+++ b/svtplaydump.py
@@ -30,6 +30,7 @@ import struct
 import argparse
 import requests
 import sys, os
+import socket
 
 class Video(dict):
     def __init__(self, *args, **kwargs):
@@ -106,13 +107,18 @@ def download_from_playlist(video):
         size = 0
         for url in segments:
             ufile = requests.get(url, stream=True).raw
-            print("\r{0:.2f} MB".format(size/1024/1024))
+            print("\r{0:.2f} MB".format(size/1024/1024),end="")
             sys.stdout.flush()
             if decrypt:
                 iv=struct.pack("IIII",segment,0,0,0)
                 decryptor = AES.new(key, AES.MODE_CBC, iv)
             while(True):
-                buf = ufile.read(4096)
+                try:
+                    buf = ufile.read(4096)
+                except socket.error as e:
+                    print("Error reading, skipping file")
+                    print(e)
+                    return
                 if not buf:
                     break
                 if decrypt:
@@ -192,7 +198,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: