Permalink
Browse files

Log ffmpeg command even when successful

More pep8 stuff
  • Loading branch information...
nmfm committed Oct 26, 2011
1 parent 0796ca6 commit b1c7426b21c3419e10405ab93b1b7f75962b4ad1
Showing with 4 additions and 4 deletions.
  1. +2 −2 filer/models/videomodels.py
  2. +1 −1 filer/settings.py
  3. +1 −1 filer/utils/video.py
@@ -80,11 +80,11 @@ def formats(self):
def formats_html5(self):
""" Video formats supported by HTML5 browsers """
- HTML5_FORMATS = ('mp4','ogv','webm')
+ HTML5_FORMATS = ('mp4', 'ogv', 'webm')
_formats = []
for format, url in self.formats.items():
if format in HTML5_FORMATS:
- _formats.append({'format':format, 'url':url})
+ _formats.append({'format': format, 'url': url})
return _formats
def format_flash(self):
View
@@ -115,7 +115,7 @@
# formats recognized as video file formats (no leading dot)
FILER_SOURCE_VIDEO_FORMATS = ('mp4', 'avi', 'wmv', 'mov', 'mpg')
# formats to convert into (no leading dot)
-FILER_VIDEO_FORMATS = ('flv', 'mp4','ogv','webm')
+FILER_VIDEO_FORMATS = ('flv', 'mp4', 'ogv', 'webm')
# command line for video checking of dimensions
FFMPEG_CHECK_CMD = "ffmpeg -i %(input_file)s"
# command line for video conversion
View
@@ -53,7 +53,7 @@ def execute_ffmpeg_command(com, targetfile):
return True, "\n".join([com, ffmpegresult])
except:
return True, traceback.format_exc()
- return False, ffmpegresult
+ return False, "\n".join([com, ffmpegresult])
def convert_video(sourcefile, path, extension, dimensions):

0 comments on commit b1c7426

Please sign in to comment.