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

Merge pull request #61 from 0x010C/patch-1

Browse Source 
Add a new gm setting to allow progressive JPEG
This commit is contained in:
Laurent Peuch 2016-08-22 04:10:19 +02:00 committed by GitHub
commit db3b1bb8bd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/configuration.rst
View File

@ -63,6 +63,7 @@ Currently a `gm` settings key allows to customize the default GraphicsMagick's b
auto-orient: True auto-orient: True
strip: True strip: True
resize: 50% resize: 50%
progressive: True
The meaning of the currently supported GraphicsMagick's settings is as follows: The meaning of the currently supported GraphicsMagick's settings is as follows:
@ -70,6 +71,7 @@ The meaning of the currently supported GraphicsMagick's settings is as follows:
* `auto-orient` change the orientation of pictures so they are upright (based on corresponding EXIF tags if present) * `auto-orient` change the orientation of pictures so they are upright (based on corresponding EXIF tags if present)
* `strip` removes all profiles and text attributes from the image (good for privacy, slightly reduce file size) * `strip` removes all profiles and text attributes from the image (good for privacy, slightly reduce file size)
* `resize` can be used to resize the fullsize version of pictures. by default, input image size is preserved * `resize` can be used to resize the fullsize version of pictures. by default, input image size is preserved
* `progressive` converts classic baseline JPEG files to progressive JPEG, and interlace PNG/GIF files (improve the page loading impression, slightly reduce file size)
Any GraphicsMagick setting can be customized on a per-image basis (either `cover` or `image`, see below). Any GraphicsMagick setting can be customized on a per-image basis (either `cover` or `image`, see below).

8
prosopopee/prosopopee.py
View File

@ -22,7 +22,8 @@ SETTINGS = {
"quality": 75, "quality": 75,
"auto-orient": True, "auto-orient": True,
"strip": True, "strip": True,
"resize": None "resize": None,
"progressive": True
}, },
"ffmpeg": { "ffmpeg": {
"binary": "ffmpeg", "binary": "ffmpeg",
@ -138,10 +139,11 @@ class Image(object):
"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 "",
"progressive": "-interlace Line" if options.get("progressive", None) is True else ""
} }
command = "gm convert {source} {auto-orient} {strip} {quality} {resize} {target}".format(**gm_switches) command = "gm convert {source} {auto-orient} {strip} {progressive} {quality} {resize} {target}".format(**gm_switches)
warning("Generation", source) warning("Generation", source)
print(command) print(command)