initial request can also fail, retry

pandora_client/__init__.py

@@ -1118,8 +1118,17 @@ class API(ox.API):
         if resume:
             data = resume
         else:
-            data = self._json_request(url, data)
-
+            data = None
+            while not data:
+                try:
+                    data = self._json_request(url, data)
+                except KeyboardInterrupt:
+                    print("\ninterrupted by user.")
+                    sys.exit(1)
+                except:
+                    print("failed to start upload, will try again in 5 seconds\r", end='')
+                    sys.stdout.flush()
+                    time.sleep(5)
         print(filename)
         hide_cursor()
 

pandora_client/extract.py

@@ -282,12 +282,12 @@ def video_cmd(video, target, profile, info):
         if format == 'webm':
             pass1_post = ['-speed', '4'] + pass1_post
             post = ['-speed', '1'] + post
-        cmds.append(base + ['-an', '-v:pass', '1', '-passlogfile', '%s.log' % target]
+        cmds.append(base + ['-an', '-pass', '1', '-passlogfile', '%s.log' % target]
                          + video_settings + pass1_post)
-        cmds.append(base + ['-v:pass', '2', '-passlogfile', '%s.log' % target]
-                         + audio_settings + video_settings + post)
+        cmds.append(base + ['-pass', '2', '-passlogfile', '%s.log' % target]
+                         + video_settings + audio_settings + post)
     else:
-        cmds.append(base + audio_settings + video_settings + post)
+        cmds.append(base + video_settings + audio_settings + post)
 
     if not support.get(format):
         if format == 'webm':