pandora/archive/extract.py

@@ -308,7 +308,6 @@ def stream(video, target, profile, info, audio_track=0, flags={}):
     cmds = []
 
     base = [settings.FFMPEG,
-            '-hide_banner',
             '-nostats', '-loglevel', 'error',
             '-y', '-i', video, '-threads', '4', '-map_metadata', '-1', '-sn']
 
@@ -414,9 +413,7 @@ def frame(video, frame, position, height=128, redo=False, info=None):
 
 def ffmpeg_frame_cmd(video, frame, position, height=128):
     cmd = [
-        settings.FFMPEG,
-        '-hide_banner',
-        '-y',
+        settings.FFMPEG, '-y',
         '-ss', str(position),
         '-i', video,
         '-an', '-frames:v', '1',
@@ -699,7 +696,6 @@ def chop(video, start, end, subtitles=None, dest=None, encode=False):
             ]
         cmd = [
             settings.FFMPEG,
-            '-hide_banner',
             '-y',
             '-i', video,
             '-ss', '%.3f' % start,
@@ -725,11 +721,7 @@ def chop(video, start, end, subtitles=None, dest=None, encode=False):
         return None
 
 def has_faststart(path):
-    cmd = [
-        settings.FFPROBE,
-        '-hide_banner',
-        '-v', 'trace', '-i', path
-    ]
+    cmd = [settings.FFPROBE, '-v', 'trace', '-i', path]
     p = subprocess.Popen(cmd, stdin=subprocess.PIPE,
                          stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT,
@@ -754,7 +746,6 @@ def remux_stream(src, dst):
         video = []
     cmd = [
         settings.FFMPEG,
-        '-hide_banner',
         '-nostats', '-loglevel', 'error',
         '-i', src,
         '-map_metadata', '-1', '-sn',
@@ -777,11 +768,7 @@ def remux_stream(src, dst):
 
 
 def ffprobe(path, *args):
-    cmd = [
-        settings.FFPROBE,
-        '-hide_banner',
-        '-loglevel', 'error', '-print_format', 'json', '-i', path
-    ] + list(args)
+    cmd = [settings.FFPROBE, '-loglevel', 'error', '-print_format', 'json', '-i', path] + list(args)
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     stdout, stderr = p.communicate()
     return json.loads(stdout.decode())
@@ -829,11 +816,7 @@ def extract_subtitles(path, language=None):
             extra = ['-map', '0:%s' % track[0]['index']]
         else:
             raise Exception("unknown language: %s" % language)
-    cmd = [
-        settings.FFMPEG,
-        '-hide_banner',
-        '-loglevel', 'error', '-i', path
-    ] + extra + ['-f', 'srt', '-']
+    cmd = ['ffmpeg', '-loglevel', 'error', '-i', path] + extra + ['-f', 'srt', '-']
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     stdout, stderr = p.communicate()
     return ox.srt.loads(stdout.decode())

pandora/item/tasks.py

@@ -150,15 +150,12 @@ def extract_clip(public_id, in_, out, resolution, format, track=None):
 def clear_cache(days=60):
     import subprocess
     path = os.path.join(settings.MEDIA_ROOT, 'media')
-    if os.path.exists(path):
     cmd = ['find', path, '-iregex', '.*/frames/.*', '-atime', '+%s' % days, '-type', 'f', '-exec', 'rm', '{}', ';']
     subprocess.check_output(cmd)
-    if os.path.exists(path):
     path = os.path.join(settings.MEDIA_ROOT, 'items')
     cmd = ['find', path, '-iregex', '.*/cache/.*', '-atime', '+%s' % days, '-type', 'f', '-exec', 'rm', '{}', ';']
     subprocess.check_output(cmd)
     path = settings.MEDIA_ROOT
-    if os.path.exists(path):
     cmd = ['find', path, '-type', 'd', '-size', '0', '-prune', '-exec', 'rmdir', '{}', ';']
     subprocess.check_output(cmd)