heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pdf/processing.py: don't use check_output, only in python>=2.7

Browse Source 
Signed-off-by: Alon Levy <alon@pobox.com>
This commit is contained in:
Alon Levy 2013-04-17 10:47:02 +03:00
parent b698c94d03
commit 519bcfb0e6
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
mediagoblin/media_types/pdf/processing.py
View File

@ -16,7 +16,7 @@
import os import os
import logging import logging
import dateutil.parser import dateutil.parser
from subprocess import STDOUT, check_output, call, CalledProcessError from subprocess import PIPE, Popen
from mediagoblin import mg_globals as mgg from mediagoblin import mg_globals as mgg
from mediagoblin.processing import (create_pub_filepath, from mediagoblin.processing import (create_pub_filepath,
@ -125,9 +125,14 @@ unoconv_supported = [
] ]
def is_unoconv_working(): def is_unoconv_working():
# TODO: must have libreoffice-headless installed too, need to check for it
unoconv = where('unoconv')
if not unoconv:
return False
try: try:
output = check_output([where('unoconv'), '--show'], stderr=STDOUT) proc = Popen([unoconv, '--show'], stderr=PIPE)
except CalledProcessError, e: output = proc.stderr.read()
except OSError, e:
_log.warn(_('unoconv failing to run, check log file')) _log.warn(_('unoconv failing to run, check log file'))
return False return False
if 'ERROR' in output: if 'ERROR' in output:
@ -137,8 +142,7 @@ def is_unoconv_working():
def supported_extensions(cache=[None]): def supported_extensions(cache=[None]):
if cache[0] == None: if cache[0] == None:
cache[0] = 'pdf' cache[0] = 'pdf'
# TODO: must have libreoffice-headless installed too, need to check for it if is_unoconv_working():
if where('unoconv') and is_unoconv_working():
cache.extend(unoconv_supported) cache.extend(unoconv_supported)
return cache return cache
@ -177,7 +181,7 @@ def create_pdf_thumb(original, thumb_filename, width, height):
args = [executable, '-scale-to', str(min(width, height)), args = [executable, '-scale-to', str(min(width, height)),
'-singlefile', '-png', original, thumb_filename] '-singlefile', '-png', original, thumb_filename]
_log.debug('calling {0}'.format(repr(' '.join(args)))) _log.debug('calling {0}'.format(repr(' '.join(args))))
call(executable=executable, args=args) Popen(executable=executable, args=args).wait()
def pdf_info(original): def pdf_info(original):
""" """
@ -191,9 +195,10 @@ def pdf_info(original):
ret_dict = {} ret_dict = {}
pdfinfo = where('pdfinfo') pdfinfo = where('pdfinfo')
try: try:
lines = check_output(executable=pdfinfo, proc = Popen(executable=pdfinfo,
args=[pdfinfo, original]).split(os.linesep) args=[pdfinfo, original], stdout=PIPE)
except CalledProcessError: lines = proc.stdout.readlines()
except OSError:
_log.debug('pdfinfo could not read the pdf file.') _log.debug('pdfinfo could not read the pdf file.')
raise BadMediaFail() raise BadMediaFail()