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

libav works

Browse Source
This commit is contained in:
Adrien Beudin 2016-05-03 10:05:49 +02:00
parent 9c5b8ae8cd
commit 61227073c3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
prosopopee/prosopopee.py
View File

@ -163,7 +163,14 @@ class Image(object):
def main(): def main():
for i in ['gm', options["binary"]]: settings = yaml.safe_load(open("settings.yaml", "r"))
if settings["settings"].get("ffmpeg"):
SETTINGS["ffmpeg"].update(settings["settings"]["ffmpeg"])
conv_video = settings["settings"]["ffmpeg"]["binary"]
else:
conv_video = "ffmpeg"
for i in ['gm', conv_video]:
if os.system("which " + i +" > /dev/null") != 0: if os.system("which " + i +" > /dev/null") != 0:
sys.stderr.write("ERROR: I can't locate the "+ i +" binary, " sys.stderr.write("ERROR: I can't locate the "+ i +" binary, "
"please install the '" + i + "' package.\n") "please install the '" + i + "' package.\n")
@ -172,7 +179,6 @@ def main():
error(os.path.exists(os.path.join(os.getcwd(), "settings.yaml")), "I can't find a " error(os.path.exists(os.path.join(os.getcwd(), "settings.yaml")), "I can't find a "
"settings.yaml in the current working directory") "settings.yaml in the current working directory")
settings = yaml.safe_load(open("settings.yaml", "r"))
for key, value in DEFAULTS.items(): for key, value in DEFAULTS.items():
if key not in settings: if key not in settings: