diff --git a/pandora_client/__init__.py b/pandora_client/__init__.py index 89d3de8..21b5dfc 100755 --- a/pandora_client/__init__.py +++ b/pandora_client/__init__.py @@ -1118,17 +1118,8 @@ class API(ox.API): if resume: data = resume else: - 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) + data = self._json_request(url, data) + print(filename) hide_cursor() diff --git a/pandora_client/extract.py b/pandora_client/extract.py index 9313e04..38cd7c5 100644 --- a/pandora_client/extract.py +++ b/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', '-pass', '1', '-passlogfile', '%s.log' % target] + cmds.append(base + ['-an', '-v:pass', '1', '-passlogfile', '%s.log' % target] + video_settings + pass1_post) - cmds.append(base + ['-pass', '2', '-passlogfile', '%s.log' % target] - + video_settings + audio_settings + post) + cmds.append(base + ['-v:pass', '2', '-passlogfile', '%s.log' % target] + + audio_settings + video_settings + post) else: - cmds.append(base + video_settings + audio_settings + post) + cmds.append(base + audio_settings + video_settings + post) if not support.get(format): if format == 'webm':