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

Merge remote-tracking branch 'julienmalik/cache_improvements'

Browse Source 
Conflicts:
	prosopopee/prosopopee.py
This commit is contained in:
Laurent Peuch 2016-02-19 09:52:45 +01:00
commit ad8c1a5aad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prosopopee/prosopopee.py
View File

@ -47,8 +47,9 @@ class Image(object):
"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 options.has_key("quality") 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.has_key("resize") and options["resize"] 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)
print command print command
@ -57,7 +58,6 @@ class Image(object):
else: else:
print "skipped %s since it's already generated (based on source unchanged size and images options set in your gallery's settings.yaml)" % target print "skipped %s since it's already generated (based on source unchanged size and images options set in your gallery's settings.yaml)" % target
def copy(self): def copy(self):
source, target = os.path.join(self.base_dir, self.name), os.path.join(self.target_dir, self.name) source, target = os.path.join(self.base_dir, self.name), os.path.join(self.target_dir, self.name)