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

[enh] allow the use of auto-orient gm settings to autofix orientation of pictures during build (default False)

Browse Source
This commit is contained in:
Julien Malik 2016-02-15 16:51:32 +01:00
parent e21a6bf5c3
commit cecc95ea6a
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
prosopopee/prosopopee.py
View File

@ -14,6 +14,7 @@ gallery_index_template = templates.get_template("gallery-index.html")
page_template = templates.get_template("page.html") page_template = templates.get_template("page.html")
DEFAULT_GM_QUALITY = 75 DEFAULT_GM_QUALITY = 75
DEFAULT_GM_AUTOORIENT = False
CACHE_VERSION = 1 CACHE_VERSION = 1
@ -72,6 +73,7 @@ class Image(object):
self.name = name self.name = name
self.quality = options.get("quality", DEFAULT_GM_QUALITY) self.quality = options.get("quality", DEFAULT_GM_QUALITY)
self.autoorient = options.get("auto-orient", DEFAULT_GM_AUTOORIENT)
self.options = options.copy() # used for caching, if it's modified -> regenerate self.options = options.copy() # used for caching, if it's modified -> regenerate
del self.options["name"] del self.options["name"]
@ -82,9 +84,14 @@ class Image(object):
# if os.path.exists(target) and os.path.getsize(source) == os.path.getsize(target): # if os.path.exists(target) and os.path.getsize(source) == os.path.getsize(target):
# print "Skipped %s since the file hasn't been modified based on file size" % source # print "Skipped %s since the file hasn't been modified based on file size" % source
# return "" # return ""
shutil.copyfile(source, target) if not self.autoorient:
shutil.copyfile(source, target)
print source, "->", target
else:
command = "gm convert -auto-orient %s %s" % (source, target)
print command
os.system(command)
print source, "->", target
return "" return ""
def generate_thumbnail(self, gm_geometry): def generate_thumbnail(self, gm_geometry):
@ -95,7 +102,10 @@ class Image(object):
source, target = os.path.join(self.base_dir, self.name), os.path.join(self.target_dir, thumbnail_name) source, target = os.path.join(self.base_dir, self.name), os.path.join(self.target_dir, thumbnail_name)
if CACHE.thumbnail_needs_to_be_generated(source, target, self): if CACHE.thumbnail_needs_to_be_generated(source, target, self):
command = "gm convert %s -resize %s -quality %s %s" % (source, gm_geometry, self.quality, target) gm_options = ""
if self.autoorient:
gm_options = "-auto-orient "
command = "gm convert %s %s -resize %s -quality %s %s" % (gm_options, source, gm_geometry, self.quality, target)
print command print command
os.system(command) os.system(command)
CACHE.cache_thumbnail(source, target, self) CACHE.cache_thumbnail(source, target, self)
@ -130,6 +140,10 @@ def main():
error(isinstance(settings, dict), "Your settings.yaml should be a dict") error(isinstance(settings, dict), "Your settings.yaml should be a dict")
error(settings.get("title"), "You should specify a title in your main settings.yaml") error(settings.get("title"), "You should specify a title in your main settings.yaml")
if settings.get("auto-orient"):
global DEFAULT_GM_AUTOORIENT
DEFAULT_GM_AUTOORIENT = settings.get("auto-orient")
front_page_galleries_cover = [] front_page_galleries_cover = []
dirs = filter(lambda x: x not in (".", "..") and os.path.isdir(x) and os.path.exists(os.path.join(os.getcwd(), x, "settings.yaml")), os.listdir(os.getcwd())) dirs = filter(lambda x: x not in (".", "..") and os.path.isdir(x) and os.path.exists(os.path.join(os.getcwd(), x, "settings.yaml")), os.listdir(os.getcwd()))