From 2c2895c3a32bdcfe7a893e3ff1c8a3e1a7c08949 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Sat, 9 Jan 2021 14:03:33 +0100 Subject: [PATCH 01/11] move remove_superficial_options into utils This move makes sense if one wants to reuse remove_superficial_options since it can be not specific to cache.py only. This prepares prosopopee for Pillow support. Signed-off-by: Quentin Schulz --- prosopopee/cache.py | 16 ++-------------- prosopopee/utils.py | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/prosopopee/cache.py b/prosopopee/cache.py index d7f6c731..614cbc82 100644 --- a/prosopopee/cache.py +++ b/prosopopee/cache.py @@ -1,21 +1,9 @@ import os import json -CACHE_VERSION = 2 - +from .utils import remove_superficial_options -def remove_superficial_options(options): - cleaned_options = options.copy() - del cleaned_options["name"] - if "text" in cleaned_options: - del cleaned_options["text"] - if "type" in cleaned_options: - del cleaned_options["type"] - if "size" in cleaned_options: - del cleaned_options["size"] - if "float" in cleaned_options: - del cleaned_options["float"] - return cleaned_options +CACHE_VERSION = 2 class Cache: diff --git a/prosopopee/utils.py b/prosopopee/utils.py index 848c2af9..6e9e1ec1 100644 --- a/prosopopee/utils.py +++ b/prosopopee/utils.py @@ -10,6 +10,20 @@ import ruamel.yaml as yaml +def remove_superficial_options(options): + cleaned_options = options.copy() + del cleaned_options["name"] + if "text" in cleaned_options: + del cleaned_options["text"] + if "type" in cleaned_options: + del cleaned_options["type"] + if "size" in cleaned_options: + del cleaned_options["size"] + if "float" in cleaned_options: + del cleaned_options["float"] + return cleaned_options + + class CustomFormatter(logging.Formatter): """Logging Formatter to add colors""" From 330fcd414df4b2bf418ad76945892b1a8ca640ba Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Sat, 13 Feb 2021 14:32:27 +0100 Subject: [PATCH 02/11] prosopopee: do not dump cache when doing a dry run Dry runs (`prosopopee test`) shouldn't dump the cache since nothing's done except creating the HTML files which means the cache is more or less meaningless in that case. Let's dump the cache only when doing a normal build run. Signed-off-by: Quentin Schulz --- prosopopee/prosopopee.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py index dc56ba18..e315c7d5 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -880,10 +880,12 @@ def main(): open(Path("build").joinpath("feed.xml"), "wb").write(xml) build_index(settings, front_page_galleries_cover, templates) - CACHE.cache_dump() if DEFAULTS["test"] is True: logging.info("Success: HTML file building without error") + sys.exit(0) + + CACHE.cache_dump() if __name__ == "__main__": From ef3a5eea89d1283d53412fd6ea58d6f6e82dbc7a Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Sat, 13 Feb 2021 14:41:59 +0100 Subject: [PATCH 03/11] themes: remove unnecessary calls to copy() For images, calls to copy() is only needed when later in the template {{ image }} is used. Removing those copy() as they trigger creation of thumbnails that will never be used. Signed-off-by: Quentin Schulz --- prosopopee/themes/exposure/templates/index.html | 1 - prosopopee/themes/exposure/templates/opengraph.html | 1 - prosopopee/themes/exposure/templates/sections/author.html | 1 - prosopopee/themes/exposure/templates/sections/panorama.html | 1 - prosopopee/themes/light/templates/index.html | 1 - prosopopee/themes/light/templates/opengraph.html | 1 - prosopopee/themes/light/templates/sections/author.html | 1 - prosopopee/themes/light/templates/sections/bordered-picture.html | 1 - prosopopee/themes/light/templates/sections/full-picture.html | 1 - prosopopee/themes/light/templates/sections/panorama.html | 1 - prosopopee/themes/light/templates/sections/paragraph.html | 1 - prosopopee/themes/light/templates/sections/pictures-group.html | 1 - prosopopee/themes/material/templates/index.html | 1 - prosopopee/themes/material/templates/opengraph.html | 1 - prosopopee/themes/material/templates/sections/author.html | 1 - 15 files changed, 15 deletions(-) diff --git a/prosopopee/themes/exposure/templates/index.html b/prosopopee/themes/exposure/templates/index.html index 5f41099d..08df9547 100644 --- a/prosopopee/themes/exposure/templates/index.html +++ b/prosopopee/themes/exposure/templates/index.html @@ -52,7 +52,6 @@

{{ gallery.title }}

{% else %} {% set cover = Image(gallery.cover) %} - {{ cover.copy() }} {% if no_big_gallery_cover %}
{% else %} diff --git a/prosopopee/themes/exposure/templates/opengraph.html b/prosopopee/themes/exposure/templates/opengraph.html index 6632a209..0f9df5a7 100644 --- a/prosopopee/themes/exposure/templates/opengraph.html +++ b/prosopopee/themes/exposure/templates/opengraph.html @@ -1,6 +1,5 @@ {% set absolute_url = settings.url + "/" + link + "/" %} {% set cover = Image(gallery.cover) %} -{{ cover.copy() }} diff --git a/prosopopee/themes/exposure/templates/sections/author.html b/prosopopee/themes/exposure/templates/sections/author.html index fb51ed04..449812f2 100644 --- a/prosopopee/themes/exposure/templates/sections/author.html +++ b/prosopopee/themes/exposure/templates/sections/author.html @@ -1,5 +1,4 @@ {% set image = Image(section.image) %} -{{ image.copy() }}
diff --git a/prosopopee/themes/exposure/templates/sections/panorama.html b/prosopopee/themes/exposure/templates/sections/panorama.html index e019744d..c20a3dcd 100644 --- a/prosopopee/themes/exposure/templates/sections/panorama.html +++ b/prosopopee/themes/exposure/templates/sections/panorama.html @@ -1,5 +1,4 @@ {% set image = Image(section.image) %} -{{ image.copy() }}
diff --git a/prosopopee/themes/light/templates/index.html b/prosopopee/themes/light/templates/index.html index 75d4f332..f18d4205 100644 --- a/prosopopee/themes/light/templates/index.html +++ b/prosopopee/themes/light/templates/index.html @@ -39,7 +39,6 @@

{{ gallery.title }}

{{ video.copy() }} {% else %} {% set cover = Image(gallery.cover) %} - {{ cover.copy() }} {% endif %} {% if video %}
diff --git a/prosopopee/themes/light/templates/opengraph.html b/prosopopee/themes/light/templates/opengraph.html index 26f3a568..aac832ec 100644 --- a/prosopopee/themes/light/templates/opengraph.html +++ b/prosopopee/themes/light/templates/opengraph.html @@ -8,7 +8,6 @@ {% if gallery.cover %} {% set cover = Image(gallery.cover) %} -{{ cover.copy() }} {% endif %} diff --git a/prosopopee/themes/light/templates/sections/author.html b/prosopopee/themes/light/templates/sections/author.html index cdf20b60..ddb8c4ec 100644 --- a/prosopopee/themes/light/templates/sections/author.html +++ b/prosopopee/themes/light/templates/sections/author.html @@ -4,7 +4,6 @@ {% set pathstatic = "." %} {% endif %} {% set image = Image(section.image) %} -{{ image.copy() }}
diff --git a/prosopopee/themes/light/templates/sections/bordered-picture.html b/prosopopee/themes/light/templates/sections/bordered-picture.html index 53474ed8..09175fe9 100644 --- a/prosopopee/themes/light/templates/sections/bordered-picture.html +++ b/prosopopee/themes/light/templates/sections/bordered-picture.html @@ -9,7 +9,6 @@ {{ video.copy() }} {% else %} {% set image = Image(section.image) %} -{{ image.copy() }} {% endif %} {% set caption = section.text %} {% if video %} diff --git a/prosopopee/themes/light/templates/sections/full-picture.html b/prosopopee/themes/light/templates/sections/full-picture.html index a503fb98..48ef71ea 100644 --- a/prosopopee/themes/light/templates/sections/full-picture.html +++ b/prosopopee/themes/light/templates/sections/full-picture.html @@ -9,7 +9,6 @@ {{ video.copy() }} {% else %} {% set image = Image(section.image) %} -{{ image.copy() }} {% endif %}
diff --git a/prosopopee/themes/light/templates/sections/panorama.html b/prosopopee/themes/light/templates/sections/panorama.html index 224ecd3e..68dbded3 100644 --- a/prosopopee/themes/light/templates/sections/panorama.html +++ b/prosopopee/themes/light/templates/sections/panorama.html @@ -4,7 +4,6 @@ {% set pathstatic = "." %} {% endif %} {% set image = Image(section.image) %} -{{ image.copy() }}
diff --git a/prosopopee/themes/light/templates/sections/paragraph.html b/prosopopee/themes/light/templates/sections/paragraph.html index e17e68a7..8e7b7359 100644 --- a/prosopopee/themes/light/templates/sections/paragraph.html +++ b/prosopopee/themes/light/templates/sections/paragraph.html @@ -15,7 +15,6 @@

{{ section.title }}

{% else %} {% set float = 'left' %} {% endif %} - {{ image.copy() }} diff --git a/prosopopee/themes/light/templates/sections/pictures-group.html b/prosopopee/themes/light/templates/sections/pictures-group.html index 8e61cee6..a837420d 100644 --- a/prosopopee/themes/light/templates/sections/pictures-group.html +++ b/prosopopee/themes/light/templates/sections/pictures-group.html @@ -12,7 +12,6 @@ {{ video.copy() }} {% else %} {% set image = Image(image) %} - {{ image.copy() }} {% endif %} {% set caption = image.text %}
diff --git a/prosopopee/themes/material/templates/index.html b/prosopopee/themes/material/templates/index.html index 2f82803a..a74deb36 100644 --- a/prosopopee/themes/material/templates/index.html +++ b/prosopopee/themes/material/templates/index.html @@ -35,7 +35,6 @@

{{ gallery.title }}

{% else %} {% set cover = Image(gallery.cover) %} - {{ cover.copy() }}
{% endif %}
- +

{{ gallery.title }}

{% if gallery.sub_title %}

{{ gallery.sub_title }}

{% endif %} @@ -51,11 +51,11 @@

{{ gallery.title }}

{% else %} - {% set cover = Image(gallery.cover) %} + {% set cover = Image.get(gallery.link, gallery.cover) %} {% if no_big_gallery_cover %} -
+
{% else %} -
+
{% endif %} {% endif %}
{% endfor %} diff --git a/prosopopee/themes/light/templates/opengraph.html b/prosopopee/themes/light/templates/opengraph.html index aac832ec..8811ab69 100644 --- a/prosopopee/themes/light/templates/opengraph.html +++ b/prosopopee/themes/light/templates/opengraph.html @@ -7,8 +7,8 @@ {% endif %} {% if gallery.cover %} -{% set cover = Image(gallery.cover) %} - +{% set cover = Image.get(link + "/" + pathstatic, gallery.cover) %} + {% endif %} {% if gallery.description %} diff --git a/prosopopee/themes/light/templates/sections/author.html b/prosopopee/themes/light/templates/sections/author.html index ddb8c4ec..6ffa4d04 100644 --- a/prosopopee/themes/light/templates/sections/author.html +++ b/prosopopee/themes/light/templates/sections/author.html @@ -3,9 +3,9 @@ {% else %} {% set pathstatic = "." %} {% endif %} -{% set image = Image(section.image) %} +{% set image = Image.get(link + "/" + pathstatic, section.image) %}
- +
Story by

{{ section.name }}

diff --git a/prosopopee/themes/light/templates/sections/bordered-picture.html b/prosopopee/themes/light/templates/sections/bordered-picture.html index 09175fe9..bb5a0bb8 100644 --- a/prosopopee/themes/light/templates/sections/bordered-picture.html +++ b/prosopopee/themes/light/templates/sections/bordered-picture.html @@ -8,7 +8,7 @@ {% set format = settings.ffmpeg.extension %} {{ video.copy() }} {% else %} -{% set image = Image(section.image) %} +{% set image = Image.get(link + "/" + pathstatic, section.image) %} {% endif %} {% set caption = section.text %} {% if video %} @@ -19,7 +19,7 @@ {% else %}
- {% if caption %}{{ caption }}{% endif %} + {% if caption %}{{ caption }}{% endif %}
{% endif %} diff --git a/prosopopee/themes/light/templates/sections/full-picture.html b/prosopopee/themes/light/templates/sections/full-picture.html index 48ef71ea..1ad4e60d 100644 --- a/prosopopee/themes/light/templates/sections/full-picture.html +++ b/prosopopee/themes/light/templates/sections/full-picture.html @@ -8,7 +8,7 @@ {% set format = settings.ffmpeg.extension %} {{ video.copy() }} {% else %} -{% set image = Image(section.image) %} +{% set image = Image.get(link + "/" + pathstatic, section.image) %} {% endif %}
@@ -17,7 +17,7 @@ {% else %} - + {% endif %}
{% if section.text %} diff --git a/prosopopee/themes/light/templates/sections/panorama.html b/prosopopee/themes/light/templates/sections/panorama.html index 68dbded3..10a2a338 100644 --- a/prosopopee/themes/light/templates/sections/panorama.html +++ b/prosopopee/themes/light/templates/sections/panorama.html @@ -3,7 +3,7 @@ {% else %} {% set pathstatic = "." %} {% endif %} -{% set image = Image(section.image) %} +{% set image = Image.get(link + "/" + pathstatic, section.image) %}
- +
diff --git a/prosopopee/themes/light/templates/sections/paragraph.html b/prosopopee/themes/light/templates/sections/paragraph.html index 8e7b7359..0131945e 100644 --- a/prosopopee/themes/light/templates/sections/paragraph.html +++ b/prosopopee/themes/light/templates/sections/paragraph.html @@ -9,14 +9,14 @@

{{ section.title }}

{% endif %}

{% if section.image %} - {% set image = Image(section.image) %} + {% set image = Image.get(link + "/" + pathstatic, section.image) %} {% if section.image.float %} {% set float = section.image.float %} {% else %} {% set float = 'left' %} {% endif %} - + {% endif %} {{ section.text }} diff --git a/prosopopee/themes/light/templates/sections/pictures-group.html b/prosopopee/themes/light/templates/sections/pictures-group.html index a837420d..e37b8623 100644 --- a/prosopopee/themes/light/templates/sections/pictures-group.html +++ b/prosopopee/themes/light/templates/sections/pictures-group.html @@ -11,7 +11,7 @@ {% set format = settings.ffmpeg.extension %} {{ video.copy() }} {% else %} - {% set image = Image(image) %} + {% set image = Image.get(link + "/" + pathstatic, image) %} {% endif %} {% set caption = image.text %}

@@ -21,7 +21,7 @@ {% set video = "" %} {% else %} - {% if caption %}{{ caption }}{% endif %} + {% if caption %}{{ caption }}{% endif %} {% endif %}
{% endfor %} diff --git a/prosopopee/themes/material/templates/index.html b/prosopopee/themes/material/templates/index.html index a74deb36..65ff1bed 100644 --- a/prosopopee/themes/material/templates/index.html +++ b/prosopopee/themes/material/templates/index.html @@ -34,8 +34,8 @@

{{ gallery.title }}

{% else %} - {% set cover = Image(gallery.cover) %} -
+ {% set cover = Image.get(gallery.link, gallery.cover) %} +
{% endif %}
{% endfor %} diff --git a/prosopopee/themes/material/templates/opengraph.html b/prosopopee/themes/material/templates/opengraph.html index 0f9df5a7..4e4db177 100644 --- a/prosopopee/themes/material/templates/opengraph.html +++ b/prosopopee/themes/material/templates/opengraph.html @@ -1,7 +1,7 @@ {% set absolute_url = settings.url + "/" + link + "/" %} -{% set cover = Image(gallery.cover) %} +{% set cover = Image.get(gallery.link, gallery.cover) %} - + {% if gallery.description %} diff --git a/prosopopee/themes/material/templates/sections/author.html b/prosopopee/themes/material/templates/sections/author.html index d7238d3d..719fb3ec 100644 --- a/prosopopee/themes/material/templates/sections/author.html +++ b/prosopopee/themes/material/templates/sections/author.html @@ -1,4 +1,4 @@ -{% set image = Image(section.image) %} +{% set image = Image.get(link, section.image) %}
@@ -7,7 +7,7 @@
- +
diff --git a/prosopopee/themes/material/templates/sections/bordered-picture.html b/prosopopee/themes/material/templates/sections/bordered-picture.html index 9ae25476..eb010425 100644 --- a/prosopopee/themes/material/templates/sections/bordered-picture.html +++ b/prosopopee/themes/material/templates/sections/bordered-picture.html @@ -2,9 +2,8 @@ {% set video = Video(section.image) %} {% set format = settings.ffmpeg.extension %} {% else %} -{% set image = Image(section.image) %} +{% set image = Image.get(link, section.image) %} {% set caption = section.text %} -{{ image.copy() }} {% endif %} {% if section.background %}
@@ -16,13 +15,13 @@ {% else %} - - + {% if caption %}
{{ caption }}
diff --git a/prosopopee/themes/material/templates/sections/full-picture.html b/prosopopee/themes/material/templates/sections/full-picture.html index e90a2b95..0307b5f8 100644 --- a/prosopopee/themes/material/templates/sections/full-picture.html +++ b/prosopopee/themes/material/templates/sections/full-picture.html @@ -8,9 +8,8 @@ {% else %} - {% set image = Image(section.image) %} - {{ image.copy() }} - + {% set image = Image.get(link, section.image) %} + {% endif %}
diff --git a/prosopopee/themes/material/templates/sections/panorama.html b/prosopopee/themes/material/templates/sections/panorama.html index 641e207e..731d6e17 100644 --- a/prosopopee/themes/material/templates/sections/panorama.html +++ b/prosopopee/themes/material/templates/sections/panorama.html @@ -1,5 +1,4 @@ -{% set image = Image(section.image) %} -{{ image.copy() }} +{% set image = Image.get(link, section.image) %}
- +
diff --git a/prosopopee/themes/material/templates/sections/paragraph.html b/prosopopee/themes/material/templates/sections/paragraph.html index 7ce952b1..cffcf9f0 100644 --- a/prosopopee/themes/material/templates/sections/paragraph.html +++ b/prosopopee/themes/material/templates/sections/paragraph.html @@ -12,7 +12,7 @@

{{ section.title }}

{% if section.image %} - {% set image = Image(section.image) %} + {% set image = Image.get(link, section.image) %} {% if section.image.float %} {% set float = section.image.float %} {% else %} @@ -23,15 +23,14 @@

{{ section.title }}

{% else %} {% set image_resize = '250px' %} {% endif %} - {{ image.copy() }} - - + + {% endif %} diff --git a/prosopopee/themes/material/templates/sections/pictures-group.html b/prosopopee/themes/material/templates/sections/pictures-group.html index 85ae8e46..c5c142e7 100644 --- a/prosopopee/themes/material/templates/sections/pictures-group.html +++ b/prosopopee/themes/material/templates/sections/pictures-group.html @@ -12,8 +12,7 @@ {{ video.copy() }} {% set ratio = video.ratio %} {% else %} - {% set image = Image(image) %} - {{ image.copy() }} + {% set image = Image.get(link, image) %} {% set ratio = image.ratio %} {% endif %}
@@ -28,13 +27,13 @@
{{ caption }}
{% endif %} {% else %} - - + {% if caption %}
{{ caption }}
diff --git a/prosopopee/utils.py b/prosopopee/utils.py index 62867de7..3b823d7a 100644 --- a/prosopopee/utils.py +++ b/prosopopee/utils.py @@ -15,7 +15,10 @@ def remove_superficial_options(options): cleaned_options = options.copy() - del cleaned_options["name"] + if "name" in cleaned_options: + del cleaned_options["name"] + if "exif" in cleaned_options: + del cleaned_options["exif"] if "text" in cleaned_options: del cleaned_options["text"] if "type" in cleaned_options: @@ -24,6 +27,12 @@ def remove_superficial_options(options): del cleaned_options["size"] if "float" in cleaned_options: del cleaned_options["float"] + # "resize" only applies to image.copy() in templates, no need to propagate it to the cache since + # the actual size of the "copy" thumbnail is part of the filename and will trigger a + # regeneration if changed (thus "resize" setting is appropriately watched without regenerating + # non-copy thumbnails). + if "resize" in cleaned_options: + del cleaned_options["resize"] return cleaned_options diff --git a/requirements.txt b/requirements.txt index cdc42afe..d73c8126 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ path.py ruamel.yaml future pillow>=6 +imagesize From 9566424a19aa14fe3541f2f39a59616fb7c11e0d Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Thu, 7 Jan 2021 13:42:39 +0100 Subject: [PATCH 09/11] travis: remove now useless graphicsmagick Signed-off-by: Quentin Schulz --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41f79fb8..38052d7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: required dist: xenial language: python install: - - sudo apt-get install graphicsmagick libav-tools -y + - sudo apt-get install libav-tools -y - pip3 install -r requirements.txt - pip3 install tox - python setup.py develop @@ -12,7 +12,6 @@ python: - "3.6" script: - tox - - gm -version - cd example && prosopopee notifications: irc: "chat.freenode.net#prosopopee" From 0de1e4083f5e55bb8466795d61dddbae16cbb5cc Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Thu, 7 Jan 2021 13:49:46 +0100 Subject: [PATCH 10/11] docs: update based on migration from GraphicsMagick to Pillow Signed-off-by: Quentin Schulz --- docs/configuration.rst | 6 +++--- docs/install.rst | 13 ++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/docs/configuration.rst b/docs/configuration.rst index 24e15b2a..5fc27cc9 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -68,7 +68,7 @@ Global settings can be put in your root `settings.yaml`, under the `settings` ke GM ~~ -Currently a `gm` setting key allows to customize the default GraphicsMagick's behaviour. It looks like:: +Currently a `gm` setting key allows to customize the default behaviour for thumbnail creation. It looks like:: title: Gallery settings: @@ -79,7 +79,7 @@ Currently a `gm` setting key allows to customize the default GraphicsMagick's be resize: 50% progressive: True -The meaning of the currently supported GraphicsMagick's settings is as follows: +The meaning of the currently supported settings is as follows: * `quality` allows to customize the compression level of thumbnails (between 0 and 100) * `auto-orient` changes the orientation of pictures so they are upright (based on corresponding EXIF tags if present) @@ -87,7 +87,7 @@ The meaning of the currently supported GraphicsMagick's settings is as follows: * `resize` can be used to resize the full-size version of pictures. By default, input image size is preserved * `progressive` converts classic baseline JPEG files to progressive JPEG, and interlaces PNG/GIF files (improves the page loading impression, slightly reduces file size) -Any GraphicsMagick setting can be customized on a per-image basis (either `cover` or `image`, see below). +Any of thumbnail creation settings can be customized on a per-image basis (either `cover` or `image`, see below). Video converter ~~~~~~~~~~~~~~~ diff --git a/docs/install.rst b/docs/install.rst index 13159e76..49102b34 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -11,12 +11,7 @@ We need Python, pip and virtualenv:: apt-get install python3-pip python3-virtualenv -and graphicsmagick library for building the gallery:: - - # graphicsmagick requires to have the 5.3.1 version of gcc-5-base - apt-get install graphicsmagick - -A video converter like ffmpeg:: +And a video converter like ffmpeg:: apt-get install ffmpeg @@ -35,11 +30,7 @@ We need Brew:: /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" -and graphicsmagick library for building the gallery:: - - brew install graphicsmagick - -A video converter like ffmpeg:: +And a video converter like ffmpeg:: brew install ffmpeg From ba91bcb1eb22d174d53a86e42ca87927cd5d0e96 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Sat, 9 Jan 2021 13:43:48 +0100 Subject: [PATCH 11/11] prosopopee: allow selecting number of threads used for thumbnail generation Generating thumbnails is done in parallel threads via multiprocessing.Pool. By default, Pool schedules tasks on as many threads as there are cpu threads on the host machine. Let's allow users to select the number of threads Pool can use. Signed-off-by: Quentin Schulz --- prosopopee/prosopopee.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py index 4be55d5f..2522e439 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -47,7 +47,15 @@ def loglevel(string): help="Configure the logging level", ) subparser = parser.add_subparsers(dest="cmd") -subparser.add_parser("build", help="Generate static site") +parser_build = subparser.add_parser("build", help="Generate static site") +parser_build.add_argument( + "-j", + "--jobs", + default=None, + type=int, + help="Specifies number of jobs (thumbnail generations) to run simultaneously. Default: number " + "of threads available on the system", +) subparser.add_parser("test", help="Verify all your yaml data") subparser.add_parser("preview", help="Start preview webserver on port 9000") subparser.add_parser("deploy", help="Deploy your website") @@ -923,7 +931,12 @@ def main(): logger.info("Success: HTML file building without error") sys.exit(0) - with Pool() as pool: + # If prosopopee is started without any argument, 'build' is assumed but the jobs parameter + # is not part of the namespace, so set its default to None (or 'number of available CPU + # treads') + jobs = args.jobs if args.cmd else None + + with Pool(jobs) as pool: # Pool splits the iterable into pre-defined chunks which are then assigned to processes. # There is no other scheduling in play after that. This is an issue when chunks are # outrageously unbalanced in terms of CPU time which happens when most galleries are