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

[mod] start refactoring to a simplification of capslock patch

Browse Source
This commit is contained in:
Laurent Peuch 2016-02-09 06:30:43 +01:00
parent c202cbbca6
commit a1c5e75aa3
1 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
prosopopee/prosopopee.py
View File

@ -17,14 +17,19 @@ DEFAULT_GM_QUALITY = 75
CACHE_VERSION = 1 CACHE_VERSION = 1
class CacheKeys(object): class Image(object):
SIZE = "size" def __init__(self, options):
GM_QUALITY = "gm_quality" # assuming string
if not isinstance(options, dict):
name = options
options = {"name": options}
self.name = name
self.quality = options.get("quality", DEFAULT_GM_QUALITY)
self.options = options # used for caching, if it's modified -> regenerate
class ImageAttributes(object): def __repr__(self):
NAME = "name" return self.name
QUALITY = "quality"
class Cache(object): class Cache(object):
@ -40,25 +45,22 @@ class Cache(object):
print "info: cache format as changed, prune cache" print "info: cache format as changed, prune cache"
self.cache = {} self.cache = {}
def thumbnail_needs_to_be_generated(self, source, target, gm_quality): def thumbnail_needs_to_be_generated(self, source, target, image):
if not os.path.exists(target): if not os.path.exists(target):
return True return True
if target not in self.cache: if target not in self.cache:
return True return True
cache_data = self.cache[target] cached_thumbnail = self.cache[target]
if cache_data[CacheKeys.SIZE] != os.path.getsize(source) or cache_data[CacheKeys.GM_QUALITY] != gm_quality: if cached_thumbnail["size"] != os.path.getsize(source) or cached_thumbnail["options"] != image.options:
return True return True
return False return False
def cache_thumbnail(self, source, target, gm_quality): def cache_thumbnail(self, source, target, image):
cache_data = {} self.cache[target] = {"size": os.path.getsize(source), "options": image.options}
cache_data[CacheKeys.SIZE] = os.path.getsize(source)
cache_data[CacheKeys.GM_QUALITY] = gm_quality
self.cache[target] = cache_data
def __del__(self): def __del__(self):
json.dump(self.cache, open(self.cache_file_path, "w")) json.dump(self.cache, open(self.cache_file_path, "w"))
@ -72,15 +74,9 @@ class TemplateFunctions():
self.base_dir = base_dir self.base_dir = base_dir
self.target_dir = target_dir self.target_dir = target_dir
def get_image_name(self, image):
if ImageAttributes.NAME not in image:
return image
return image[ImageAttributes.NAME]
def copy_image(self, image): def copy_image(self, image):
image_name = self.get_image_name(image) image = Image(image)
source, target = os.path.join(self.base_dir, image_name), os.path.join(self.target_dir, image_name) source, target = os.path.join(self.base_dir, image.name), os.path.join(self.target_dir, image.name)
# XXX doing this DOESN'T improve perf at all (or something like 0.1%) # XXX doing this DOESN'T improve perf at all (or something like 0.1%)
# 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):
@ -92,26 +88,20 @@ class TemplateFunctions():
return "" return ""
def generate_thumbnail(self, image, gm_geometry): def generate_thumbnail(self, image, gm_geometry):
image_name = self.get_image_name(image) image = Image(image)
thumbnail_name = image_name.split(".") thumbnail_name = image.name.split(".")
thumbnail_name[-2] += "-small" thumbnail_name[-2] += "-small"
thumbnail_name = ".".join(thumbnail_name) thumbnail_name = ".".join(thumbnail_name)
if ImageAttributes.QUALITY not in image: source, target = os.path.join(self.base_dir, image.name), os.path.join(self.target_dir, thumbnail_name)
gm_quality = DEFAULT_GM_QUALITY
else:
gm_quality = image[ImageAttributes.QUALITY]
source, target = os.path.join(self.base_dir, image_name), os.path.join(self.target_dir, thumbnail_name) if CACHE.thumbnail_needs_to_be_generated(source, target, image):
command = "gm convert %s -resize %s -quality %s %s" % (source, gm_geometry, image.quality, target)
if CACHE.thumbnail_needs_to_be_generated(source, target, gm_quality):
command = "gm convert %s -resize %s -quality %s %s" % (source, gm_geometry, gm_quality, target)
print command print command
os.system(command) os.system(command)
CACHE.cache_thumbnail(source, target, image)
CACHE.cache_thumbnail(source, target, gm_quality)
else: else:
print "skiped %s since it's already generated (based on source unchanged size and thumbnail quality set in your gallery's settings.yaml)" % target print "skiped %s since it's already generated (based on source unchanged size and images options set in your gallery's settings.yaml)" % target
return thumbnail_name return thumbnail_name
@ -184,7 +174,7 @@ def main():
front_page_galleries_cover = reversed(sorted(front_page_galleries_cover, key=lambda x: x["date"])) front_page_galleries_cover = reversed(sorted(front_page_galleries_cover, key=lambda x: x["date"]))
open(os.path.join("build", "index.html"), "w").write(index_template.render(settings=settings, galleries=front_page_galleries_cover, helpers=TemplateFunctions(os.getcwd(), os.path.join(os.getcwd(), "build"), has_gm=has_gm)).encode("Utf-8")) open(os.path.join("build", "index.html"), "w").write(index_template.render(settings=settings, galleries=front_page_galleries_cover, Image=Image, helpers=TemplateFunctions(os.getcwd(), os.path.join(os.getcwd(), "build"), has_gm=has_gm)).encode("Utf-8"))
if __name__ == '__main__': if __name__ == '__main__':