prenex/magcms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix ident prosopopee.py

Browse Source
This commit is contained in:
Adrien Beudin 2016-04-29 15:57:17 +02:00
parent bec58371d6
commit 0e84865560
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
prosopopee/prosopopee.py
View File

@ -53,15 +53,15 @@ class Video(object):
def ffmpeg(self, source, target, options): def ffmpeg(self, source, target, options):
if CACHE.needs_to_be_generated(source, target, options): if CACHE.needs_to_be_generated(source, target, options):
ffmpeg_switches = { ffmpeg_switches = {
"source": source, "source": source,
"target": target, "target": target,
"loglevel": "-loglevel %s" % options["loglevel"], "loglevel": "-loglevel %s" % options["loglevel"],
"resolution": "-s %s" % options["resolution"], "resolution": "-s %s" % options["resolution"],
"preselect": "-vpre %s" % options["preselect"], "preselect": "-vpre %s" % options["preselect"],
"resize": "-vf scale=-1:%s" % options.get("resize"), "resize": "-vf scale=-1:%s" % options.get("resize"),
"bitrate": "-b %s" % options["bitrate"], "bitrate": "-b %s" % options["bitrate"],
"format": "-f %s" % options["format"] "format": "-f %s" % options["format"]
} }
warning("Generation", source) warning("Generation", source)
if options.get("resize"): if options.get("resize"):
command = "ffmpeg {loglevel} -i {source} {resize} -vframes 1 -y {target}".format(**ffmpeg_switches) command = "ffmpeg {loglevel} -i {source} {resize} -vframes 1 -y {target}".format(**ffmpeg_switches)
@ -113,13 +113,13 @@ class Image(object):
def gm(self, source, target, options): def gm(self, source, target, options):
if CACHE.needs_to_be_generated(source, target, options): if CACHE.needs_to_be_generated(source, target, options):
gm_switches = { gm_switches = {
"source": source, "source": source,
"target": target, "target": target,
"auto-orient": "-auto-orient" if options["auto-orient"] else "", "auto-orient": "-auto-orient" if options["auto-orient"] else "",
"strip": "-strip" if options["strip"] else "", "strip": "-strip" if options["strip"] else "",
"quality": "-quality %s" % options["quality"] if "quality" in options else "-define jpeg:preserve-settings", "quality": "-quality %s" % options["quality"] if "quality" in options else "-define jpeg:preserve-settings",
"resize": "-resize %s" % options["resize"] if options.get("resize", None) is not None else "" "resize": "-resize %s" % options["resize"] if options.get("resize", None) is not None else ""
} }
command = "gm convert {source} {auto-orient} {strip} {quality} {resize} {target}".format(**gm_switches) command = "gm convert {source} {auto-orient} {strip} {quality} {resize} {target}".format(**gm_switches)
warning("Generation", source) warning("Generation", source)
os.system(command) os.system(command)