sigal 2.3__py3-none-any.whl → 2.5__py3-none-any.whl

sigal/video.py

@@ -1,5 +1,5 @@
 # Copyright (c)      2013 - Christophe-Marie Duquesne
-# Copyright (c) 2013-2020 - Simon Conseil
+# Copyright (c) 2013-2023 - Simon Conseil
 # Copyright (c)      2021 - Keith Feldman
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -27,8 +27,9 @@ import shutil
 import subprocess
 from os.path import splitext
 
+from PIL import Image as PILImage
+
 from . import image, utils
-from .settings import Status
 from .utils import is_valid_html5_video
 
 
@@ -97,10 +98,10 @@ def get_resize_options(source, converter, output_size):
     # + I made a drawing on paper to figure this out
     if h_dst * w_src < h_src * w_dst:
         # biggest fitting dimension is height
-        resize_opt = ["-vf", "scale=trunc(oh*a/2)*2:%i" % h_dst]
+        resize_opt = ["-vf", f"scale=trunc(oh*a/2)*2:{h_dst:d}"]
     else:
         # biggest fitting dimension is width
-        resize_opt = ["-vf", "scale=%i:trunc(ow/a/2)*2" % w_dst]
+        resize_opt = ["-vf", f"scale={w_dst:d}:trunc(ow/a/2)*2"]
 
     return resize_opt
 
@@ -173,17 +174,43 @@ def generate_video(source, outname, settings):
 
 
 def generate_thumbnail(
-    source, outname, box, delay, fit=True, options=None, converter="ffmpeg"
+    source,
+    outname,
+    box,
+    delay,
+    fit=True,
+    options=None,
+    converter="ffmpeg",
+    black_retries=0,
+    black_offset=1,
+    black_max_colors=4,
 ):
     """Create a thumbnail image for the video source, based on ffmpeg."""
     logger = logging.getLogger(__name__)
     tmpfile = outname + ".tmp.jpg"
 
-    # dump an image of the video
-    cmd = [converter, "-i", source, "-an", "-r", "1"]
-    cmd += ["-ss", str(delay), "-vframes", "1", "-y", tmpfile]
-    logger.debug("Create thumbnail for video: %s", " ".join(cmd))
-    check_subprocess(cmd, source, outname)
+    currentTry = 0
+    iDelay = int(delay)
+    while currentTry <= abs(black_retries):
+        # dump an image of the video
+        cmd = [converter, "-i", source, "-an", "-r", "1"]
+        cmd += ["-ss", str(iDelay), "-vframes", "1", "-y", tmpfile]
+        logger.debug("Create thumbnail for video: %s", " ".join(cmd))
+        check_subprocess(cmd, source, outname)
+        if os.path.isfile(tmpfile) and black_retries > 0:
+            with PILImage.open(tmpfile) as img:
+                colors = img.getcolors(maxcolors=black_max_colors)
+            if colors is None:
+                # There were more colors than maxcolors in the image, it
+                # looks suitable for a valid thumbnail
+                break
+            else:
+                # Only found 'maxcolors' unique colors, looks like a solid
+                # color, try again with another seek delay
+                currentTry += 1
+                iDelay += abs(black_offset)
+        else:
+            break
 
     # Sometimes ffmpeg fails with returncode zero but without producing an
     # output file Thus, we need to check if an output file was created. If
@@ -206,7 +233,7 @@ def process_video(media):
     logger = logging.getLogger(__name__)
     settings = media.settings
 
-    try:
+    with utils.raise_if_debug() as status:
         if settings["use_orig"] and is_valid_html5_video(media.src_ext):
             utils.copy(media.src_path, media.dst_path, symlink=settings["orig_link"])
         else:
@@ -219,14 +246,8 @@ def process_video(media):
                 )
                 raise ValueError
             generate_video(media.src_path, media.dst_path, settings)
-    except Exception:
-        if logger.getEffectiveLevel() == logging.DEBUG:
-            raise
-        else:
-            return Status.FAILURE
 
-    if settings["make_thumbs"]:
-        try:
+        if settings["make_thumbs"]:
             generate_thumbnail(
                 media.dst_path,
                 media.thumb_path,
@@ -235,11 +256,9 @@ def process_video(media):
                 fit=settings["thumb_fit"],
                 options=settings["jpg_options"],
                 converter=settings["video_converter"],
+                black_retries=settings["thumb_video_black_retries"],
+                black_offset=settings["thumb_video_black_retry_offset"],
+                black_max_colors=settings["thumb_video_black_max_colors"],
             )
-        except Exception:
-            if logger.getEffectiveLevel() == logging.DEBUG:
-                raise
-            else:
-                return Status.FAILURE
 
-    return Status.SUCCESS
+    return status.value

sigal/writer.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2020 - Simon Conseil
+# Copyright (c) 2009-2023 - Simon Conseil
 # Copyright (c)      2013 - Christophe-Marie Duquesne
 # Copyright (c)      2018 - Edwin Steele
 
@@ -24,8 +24,10 @@ import importlib
 import logging
 import os
 import shutil
+import stat
 import sys
 import types
+from datetime import datetime
 
 from jinja2 import ChoiceLoader, Environment, FileSystemLoader, PrefixLoader
 from jinja2.exceptions import TemplateNotFound
@@ -54,7 +56,7 @@ class AbstractWriter:
         ):
             self.theme = os.path.join(THEMES_PATH, self.theme)
             if not os.path.exists(self.theme):
-                raise Exception("Impossible to find the theme %s" % self.theme)
+                raise Exception(f"Impossible to find the theme {self.theme}")
 
         self.logger.info("Theme  : %s", self.theme)
         theme_relpath = os.path.join(self.theme, "templates")
@@ -75,10 +77,10 @@ class AbstractWriter:
         # handle optional filters.py
         filters_py = os.path.join(self.theme, "filters.py")
         if os.path.exists(filters_py):
-            self.logger.info('Loading filters file: %s', filters_py)
-            module_spec = importlib.util.spec_from_file_location('filters', filters_py)
+            self.logger.info("Loading filters file: %s", filters_py)
+            module_spec = importlib.util.spec_from_file_location("filters", filters_py)
             mod = importlib.util.module_from_spec(module_spec)
-            sys.modules['filters'] = mod
+            sys.modules["filters"] = mod
             module_spec.loader.exec_module(mod)
             for name in dir(mod):
                 if isinstance(getattr(mod, name), types.FunctionType):
@@ -94,17 +96,30 @@ class AbstractWriter:
             )
             sys.exit(1)
 
-        # Copy the theme files in the output dir
         self.theme_path = os.path.join(self.output_dir, "static")
+
+    def copy_theme_files(self):
+        """Copy the theme files to the destination"""
+        self.logger.info("Copying the theme files to the output dir")
+
         if os.path.isdir(self.theme_path):
             shutil.rmtree(self.theme_path)
 
         for static_path in (
-            os.path.join(THEMES_PATH, 'default', 'static'),
-            os.path.join(self.theme, 'static'),
+            os.path.join(THEMES_PATH, "default", "static"),
+            os.path.join(self.theme, "static"),
         ):
             shutil.copytree(static_path, self.theme_path, dirs_exist_ok=True)
 
+            # Ensure that the theme dir is writeable
+            for root, _, files in os.walk(self.theme_path):
+                st = os.stat(root)
+                os.chmod(root, st.st_mode | stat.S_IWUSR)
+                for name in files:
+                    path = os.path.join(root, name)
+                    st = os.stat(path)
+                    os.chmod(path, st.st_mode | stat.S_IWUSR)
+
         if self.settings["user_css"]:
             if not os.path.exists(self.settings["user_css"]):
                 self.logger.error(
@@ -124,6 +139,9 @@ class AbstractWriter:
             "index_title": self.index_title,
             "settings": self.settings,
             "sigal_link": sigal_link,
+            "generated_timestamp": datetime.now().strftime(
+                self.settings["datetime_format"]
+            ),
             "theme": {
                 "name": os.path.basename(self.theme),
                 "url": url_from_path(os.path.relpath(self.theme_path, album.dst_path)),

{sigal-2.3.dist-info → sigal-2.5.dist-info}/LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2009-2022 - Simon Conseil
+Copyright (c) 2009-2023 - Simon Conseil
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

{sigal-2.3.dist-info → sigal-2.5.dist-info}/METADATA

@@ -1,47 +1,43 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sigal
-Version: 2.3
+Version: 2.5
 Summary: Simple static gallery generator
-Home-page: https://github.com/saimn/sigal
-Author: Simon Conseil
-Author-email: contact@saimon.org
+Author-email: Simon Conseil <contact@saimon.org>
 License: MIT License
+Project-URL: repository, https://github.com/saimn/sigal
+Project-URL: documentation, http://sigal.saimon.org/en/latest/
 Keywords: gallery,static,generator,image,video,galleria
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Multimedia :: Graphics :: Viewers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: blinker
 Requires-Dist: click
-Requires-Dist: Jinja2 (>=2.7)
+Requires-Dist: Jinja2>=2.7
 Requires-Dist: Markdown
-Requires-Dist: Pillow (>=4.0.0)
+Requires-Dist: Pillow>=8.0.0
 Requires-Dist: pilkit
 Requires-Dist: natsort
 Provides-Extra: all
-Requires-Dist: boto ; extra == 'all'
-Requires-Dist: brotli ; extra == 'all'
-Requires-Dist: feedgenerator ; extra == 'all'
-Requires-Dist: zopfli ; extra == 'all'
-Requires-Dist: cryptography ; extra == 'all'
-Provides-Extra: docs
-Requires-Dist: Sphinx ; extra == 'docs'
-Requires-Dist: alabaster ; extra == 'docs'
-Requires-Dist: cryptography ; extra == 'docs'
+Requires-Dist: brotli; extra == "all"
+Requires-Dist: feedgenerator; extra == "all"
+Requires-Dist: zopfli; extra == "all"
+Requires-Dist: cryptography; extra == "all"
+Requires-Dist: pillow-heif; extra == "all"
 Provides-Extra: tests
-Requires-Dist: pytest ; extra == 'tests'
-Requires-Dist: pytest-cov ; extra == 'tests'
+Requires-Dist: pytest; extra == "tests"
+Requires-Dist: pytest-cov; extra == "tests"
+Provides-Extra: docs
+Requires-Dist: Sphinx>=4.1.0; extra == "docs"
+Requires-Dist: furo; extra == "docs"
+Requires-Dist: cryptography; extra == "docs"
 
 Sigal - Simple Static Gallery Generator
 =======================================
@@ -68,14 +64,14 @@ The idea behind Sigal is to ease the use of the javascript libraries like
 galleria_. These libraries do a great job to display the images, Sigal does
 what is missing: resize images, create thumbnails, generate HTML pages.
 
-Sigal is compatible with Python 3.5+.
+Sigal requires Python 3.9+.
 
-Links :
+Links
+-----
 
 * Latest documentation on the website_
 * Source, issues and pull requests on GitHub_
 * Releases on PyPI_
-* ``#sigal`` on Freenode, or with the webchat_ interface.
 
 Themes & Demo
 -------------
@@ -90,13 +86,10 @@ Javascript libraries:
 .. _website: http://sigal.saimon.org/
 .. _GitHub: https://github.com/saimn/sigal/
 .. _PyPI: https://pypi.org/project/sigal/
-.. _galleria: http://galleria.io/
+.. _galleria: https://github.com/GalleriaJS/galleria
 .. _colorbox: http://www.jacklmoore.com/colorbox
 .. _photoswipe: http://photoswipe.com
 .. _galleria demo: http://saimon.org/sigal-demo/galleria/
 .. _colorbox demo: http://saimon.org/sigal-demo/colorbox/
 .. _photoswipe demo: http://saimon.org/sigal-demo/photoswipe/
-.. _webchat: http://webchat.freenode.net/?channels=sigal
 .. _Jinja2: https://palletsprojects.com/p/jinja/
-
-

{sigal-2.3.dist-info → sigal-2.5.dist-info}/RECORD

@@ -1,32 +1,33 @@
-sigal/__init__.py,sha256=NNrFBHWThMBqXUtp-nJuLK49iH_V7mC-ZjH-raBTXv8,9754
-sigal/gallery.py,sha256=aQ4V0IJ6U1yIhtS54Zxp9-0K-109Dz5rxjciDzko0Ko,33631
-sigal/image.py,sha256=PKMgKiTHO5uU0BgoYPcvMRVEV9R_AtExqbANMQB9z8M,13788
-sigal/log.py,sha256=oyOktSQP833IqdpZ-qeOSkrRG4eKnX4i8fxjj-eCj5c,2588
-sigal/settings.py,sha256=HjOn2VEjnDJ9GByTOc0XLDjprAG2GFgaO97uUEd7L3E,6015
-sigal/signals.py,sha256=SBTN2YMtwQd66Y4nbNtxG68wuqaByvqRac__VhGNa28,445
-sigal/utils.py,sha256=SPDqdcWT-N_gQAN85OIIx0AYpOxcd6hWQf_pcRoDJgY,3964
-sigal/version.py,sha256=Vva_zTJp1mW_gWdtYOWM7aMDPNiynuUm9wff0HFwCyo,137
-sigal/video.py,sha256=aAHChSOZfGb47Zcb6rI2tSw-YHq_1UdDIUObcLLdhuw,8971
-sigal/writer.py,sha256=NgASMH5Y91F8KNavd54Arf9pxrf78ojodplxM-xemM8,5894
+sigal/__init__.py,sha256=XmFtGi1i9IHJwfO6PSo2zcHVME2fCUHi8z7goxyF66Q,1258
+sigal/__main__.py,sha256=YUJZmHYjp3r4yJFWA2AaAbEemskQpibqhs_6jtRHQ84,9587
+sigal/gallery.py,sha256=JjQE_4GkNMy9IGNDRxKI6j28_7pPkuQvse_qRJIDDF0,34716
+sigal/image.py,sha256=EnS8-ADcub3lKIex7ymWEjkjXPtZidqcCDDqWOfNq94,13425
+sigal/log.py,sha256=aDCoUdXZmnyNntkGJng2rmTpWlOZgbCVhkDc0ZqpqPA,2588
+sigal/settings.py,sha256=zojDBZnPF6ArYuzrl1u9cXYcKgBiat-ZZLKl_m2vgkQ,6272
+sigal/signals.py,sha256=Q2qcr3DKnGxs_n-6SDKSA7aEVcX2ss-gZLgU6CO7uzY,445
+sigal/utils.py,sha256=Tk0g0phzaW3KlbeOL0u-T6y46oBxMp7kPt5pbTLtGAo,5811
+sigal/version.py,sha256=El14jpQdZIYub_dNYjZnU9XK_ijjLHH4ar3Gmj4wMAA,506
+sigal/video.py,sha256=CwD7CyoD4Fv1eUDHVOW55TaDt_7gLqU7TLg0klup9tE,9721
+sigal/writer.py,sha256=RFN1GxZpSsUrQvZyy7eSVGID7UD8NGsdhSEWoTiZIRE,6562
 sigal/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sigal/plugins/adjust.py,sha256=KQOsiGqYjz8O4n8LVBZWrwxY7BrN4aWnj_vVAq_OOxs,761
-sigal/plugins/compress_assets.py,sha256=WL9ffLWRukWNmJbfN1WUuZpt562ei9SnzUv9E-fdRyI,5428
-sigal/plugins/copyright.py,sha256=_pciifSbgGpzQ-q2qAhG742mTm6QpgLZ3yiaug027hc,2018
-sigal/plugins/extended_caching.py,sha256=App3xncutlJByzRrX3zLrdF_xuDm9_cnA-SNvy-QhQ8,6035
-sigal/plugins/feeds.py,sha256=llWGt2iZxIsYfT8t5FMGZso-zk1dGg98k6brl0-zU1w,2863
-sigal/plugins/media_page.py,sha256=nmHu_Vh5Hinw1kHLUXC5zje75OpAew6WplWrqm2DbsE,3201
-sigal/plugins/nomedia.py,sha256=Jz1ewBcG40cE5lCpG-XeaGkrnHH_ognA3E8Qs9lRS90,4962
-sigal/plugins/nonmedia_files.py,sha256=Oc9rMTciEy9diHy5aLvvTPePoAspvOWLjy5LhlAQYCs,6462
-sigal/plugins/upload_s3.py,sha256=UyJYlNgDFce6ZEv8sq0_OlN8-_mp931NToe8o9oxaSo,3747
-sigal/plugins/watermark.py,sha256=1MOaADQIx7MQnu8WuYAGp4x-72_KHcx67uWfqkEku6g,3728
-sigal/plugins/zip_gallery.py,sha256=u1aMOTkY06emja0cf5jGh0-ynAiqslgiOJvP6MfvLeE,4340
+sigal/plugins/adjust.py,sha256=CeWNWL4X2JkONSAVxKAYHuhfWwGICvhtVYqWIGNX2M0,761
+sigal/plugins/compress_assets.py,sha256=PYMUa3w0euoBIfNlVaryzSlmRfpmNCBn58DO4LX163o,5443
+sigal/plugins/copyright.py,sha256=TKzdFYBbBoAqGsPuVjjprXF6qIChUu6Tdi5P6v9dP28,2018
+sigal/plugins/extended_caching.py,sha256=h3Z9h24wUMRcEoJ3-xTiiCwyodmjdHv-t8bLf9DialQ,6232
+sigal/plugins/feeds.py,sha256=dl-c-OLS8DPGLVP-agaQ3WxFdmw4iLchfs8DsAd0rPI,2821
+sigal/plugins/media_page.py,sha256=oe1lAlnze-VxVxlXHc3urcLNyIq5jvveElsh5JC5-Ls,3201
+sigal/plugins/nomedia.py,sha256=ggZdkvRfFHwgv5u2-okWXdSHVq2oqQCRdtVIhj88wFM,4961
+sigal/plugins/nonmedia_files.py,sha256=S7VCEvgSrKBnCJpJOf6Vzakv04UCZjkrJUyeo3EoRiI,5024
+sigal/plugins/titleregexp.py,sha256=JbiPnlOQ6xB8M5cABuoCCMmWtxe6AvKh9nmcvZmEoH0,3737
+sigal/plugins/watermark.py,sha256=EstbcrAwCtV9Iy1V9odUFK6qmUKL4wNVo_1QM5ONwdA,3739
+sigal/plugins/zip_gallery.py,sha256=2BOAqXiMoWNrgW4LvGRwyIpH-GeGCUFXvGiruPDMR9Y,4651
 sigal/plugins/encrypt/__init__.py,sha256=gdL3hlNvFXbgkTK20KLdtDLrLVgAztOQT-iBJao18C0,1686
-sigal/plugins/encrypt/encrypt.py,sha256=wIZXd8xrIsoFdyv1Vte5hZaXj9kPRyahBtLF-bfbYmg,9390
-sigal/plugins/encrypt/endec.py,sha256=rO9H1wya-p2MM83kgsyjg8A69h_W46zMP07qKTHCJo4,4642
+sigal/plugins/encrypt/encrypt.py,sha256=u0Px1m4avvY1xw0wpWeKm7tgO6ssMo3uIUQ5LOjhl5k,9399
+sigal/plugins/encrypt/endec.py,sha256=2hRtSW1qCir233dM1RVqx2HD9LovI6N1-fEZVz0pxJQ,4638
 sigal/plugins/encrypt/static/decrypt.js,sha256=uJguVOcI17Rdw4OG64z616FsiG4aQ83HC7dhG7hTR6Y,23093
 sigal/plugins/encrypt/static/keycheck.txt,sha256=vD5A3zcFwQDQC8hpkuDS19vLDUd-QjdQXz_HDFJ1GXE,85
 sigal/plugins/encrypt/static/sw.js,sha256=oqjx7dvUOE0RPTobNW2SJt8MZMDHypi-u2EGIVSW374,252
-sigal/templates/sigal.conf.py,sha256=Lrvp6DSs0O7H1d55LvOZ7TMnhumFx0O1sAKU0Q44AHA,10855
+sigal/templates/sigal.conf.py,sha256=E4GXY_4WedpSFAMWvSfWmBQGLVh54Yzy7AYs_sIn10Q,11148
 sigal/themes/colorbox/static/css/colorbox.css,sha256=sYXRMxCzzFJ_vYGFAWjUHwYb9tVbcErh5-P-NRvY3dU,3020
 sigal/themes/colorbox/static/css/skeleton.css,sha256=ECB9bbROLGm8wOoEbHcHRxlHgzGqYpDtNTgDTyDz0wg,11452
 sigal/themes/colorbox/static/css/style.css,sha256=XEV-fI68HLXzECvlNdaP9_RMzKPfnXFm6TyUOV3gcfo,1424
@@ -66,10 +67,11 @@ sigal/themes/default/static/leaflet/images/marker-icon.png,sha256=V0w6XMqF9BFAhb
 sigal/themes/default/static/leaflet/images/marker-shadow.png,sha256=Jk9cZAM58ELdcpBiz8BMF_jqDymIK1OOOEjtjxDttNo,618
 sigal/themes/default/templates/analytics.html,sha256=SR8pUjLmGpyv5ecFX0mpjNsk6FtRGMBFsuZ05eLBCJw,503
 sigal/themes/default/templates/breadcrumb.html,sha256=VM77dqfk4HZxIrxKf00Bf_3FNCk5XSHAKaIFoBitHpM,241
-sigal/themes/default/templates/decrypt.html,sha256=qri7-fgJcuLGgkmdsUFiAOir4LrrAjVesC2vYJko_tw,3508
+sigal/themes/default/templates/decrypt.html,sha256=OBdmGTSaM7OKiL2geMeAUBVMJq6cAkz6Wfr6pw4QcTM,3531
 sigal/themes/default/templates/default_head.html,sha256=EExAZabgtIOVqOep2uy4dwPS1Dgn79vb7cZPc8DnHPU,711
+sigal/themes/default/templates/description.html,sha256=U3NC_7AmgYk1Tq9xTscTnXNiXTDAUoYYrJOW23dy9s0,1497
 sigal/themes/default/templates/download_zip.html,sha256=fxGj6cRrqwQqfvLZ_gU4__Vvl9QgxncdAs6Ab32R3Jw,490
-sigal/themes/default/templates/footer.html,sha256=DLa20QsTaiOzwlbVuG11t6X6e8LyYur7Us7a-f0Z91U,512
+sigal/themes/default/templates/footer.html,sha256=ggx_2EhqUpFkiCFV2Bwn742VxavcBolx0pCX92ifLg8,604
 sigal/themes/default/templates/gtm.html,sha256=392ZH-5jPZXMHDTQcDL10YGaKj2sM9cxkFH0IayY7gk,657
 sigal/themes/default/templates/links.html,sha256=MFSCeCtJTESoJAPI4hiEm-pwG3bJJ09XGV8v0HAQOmw,185
 sigal/themes/default/templates/map.html,sha256=7cQBkBsteLVIrAWuYZNFdQfdzniZY03oijA5lPBnoNM,1087
@@ -111,31 +113,29 @@ sigal/themes/galleria/static/themes/twelve/galleria.twelve.js,sha256=cEH3RivOPny
 sigal/themes/galleria/static/themes/twelve/galleria.twelve.min.css,sha256=BJ0sIDeTVuHynQmREmKcZoRDNLaxgh1zElt6_14E0VI,48127
 sigal/themes/galleria/static/themes/twelve/galleria.twelve.min.js,sha256=h5FDcg3UFnAMAMrel0li0XcPPYnPfoWZwX5P_Wzhpz0,4256
 sigal/themes/galleria/templates/album.html,sha256=qqEcZL-aaRjBznixrGSZcIC3Ene41LsaSf8i7QXdrD0,478
-sigal/themes/galleria/templates/album_items.html,sha256=D3cN7y3uf8gJbG7WTR7x1GRji4y3RoOBtgvJM9sCMLA,4019
+sigal/themes/galleria/templates/album_items.html,sha256=Mx-HqEg9e_mfE06HbNpBEh5FFjFhwmfyoVzxKuEH70w,2580
 sigal/themes/galleria/templates/album_list.html,sha256=I3GkHil8wNa0K70kbS0Qnns5iGlvaZqwwtYLNKPZIwo,749
 sigal/themes/galleria/templates/base.html,sha256=FE7kBmWSR0wCQJBnHUYJ3ONGLA1Auo00jMYXMUVTxvE,1462
-sigal/themes/photoswipe/static/app.js,sha256=86G6TBHDpeKno-6ZirGJsZLtC3qf_YvdJnjnbadises,5655
-sigal/themes/photoswipe/static/photoswipe-ui-default.js,sha256=4Jz1EuME9M9pYTgvkaFE-TJ8BMyEk_jwBQknPjkyR_I,23731
-sigal/themes/photoswipe/static/photoswipe-ui-default.min.js,sha256=31SqlpZuZG1WK_TE-Vbmo_zpveXl5RbYYSeUl3gOfxg,10409
-sigal/themes/photoswipe/static/photoswipe.css,sha256=6ThO9JgMKOpGiuzw4i8y2foGXoMwkrNJF1yH3vTANh8,4080
-sigal/themes/photoswipe/static/photoswipe.css.map,sha256=mZ17iZ71fHKmcui2wgL5rdlkIIkiotZa6JMlfyBsnqM,3208
-sigal/themes/photoswipe/static/photoswipe.js,sha256=AqsNq0cfbAUIKL9TUoXWYoXJs57J38Q8z19_SawFUGw,96448
-sigal/themes/photoswipe/static/photoswipe.min.js,sha256=mkNLawnmMCuFWFDyQORtznUM7ep4sfy2v1M5s5hAa-g,32459
-sigal/themes/photoswipe/static/styles.css,sha256=F_SotLfkjbVcHJhBtyu1qM_I8Mt4vrdsdRjbR3Shyv4,3325
-sigal/themes/photoswipe/static/default-skin/default-skin.css,sha256=kfutkGpWaB5a5R4UCyZX07tl1CfyOegD9bxt2GNCcFE,11733
-sigal/themes/photoswipe/static/default-skin/default-skin.css.map,sha256=njh4Z0oTx3DkEMuLvr7Zoeg2B9O-MleRLisOXdRJTGA,8572
-sigal/themes/photoswipe/static/default-skin/default-skin.png,sha256=mIh_w5EQ1yETyYDl2PSEWnxmrCic-enxYNIEtc4tkys,794
-sigal/themes/photoswipe/static/default-skin/default-skin.svg,sha256=Qy51lMGsSJOXqTtAwi1mJo3lsbDdqW4x8LL4Z6KTNqM,2186
-sigal/themes/photoswipe/static/default-skin/preloader.gif,sha256=gNftPz9LUGKPIZd424FJVefSAHwFvohVZ3j5DuKQcVw,866
-sigal/themes/photoswipe/static/echo/blank.gif,sha256=7xlVrnV8i5ZsgySDUDMb06MPZYztEfOH-OvwWrM2hik,42
-sigal/themes/photoswipe/static/echo/echo.js,sha256=Za2KFH4V2CgbRyLNYPbT6R-NBPmRZn71OlZ2w2H-cOo,3776
-sigal/themes/photoswipe/static/echo/echo.min.js,sha256=5H1WCijld7K1hIz_V63eUiviDe7W5QmzWPW7EFXKujI,1915
-sigal/themes/photoswipe/templates/album.html,sha256=0z1468KOJp5z28mSGRcqB7vTtCo7y330EXf7Kkxmpa8,4672
+sigal/themes/photoswipe/static/photoswipe-dynamic-caption-plugin.esm.js,sha256=F6istdJw3AAK8N1lZ8IkfMO3m7DhjDGomHzdof2Vlrk,12651
+sigal/themes/photoswipe/static/photoswipe-dynamic-caption-plugin.esm.min.js,sha256=ykzAYtehY7GEK8E965Yo215DCvfJ0J8JIUKRM2Hlykw,6772
+sigal/themes/photoswipe/static/photoswipe-fullscreen.esm.js,sha256=M3CpyZgsM24IkwM_4sfXExjmj8nrZwDBZKSlVrn7cUc,4684
+sigal/themes/photoswipe/static/photoswipe-fullscreen.esm.min.js,sha256=xL1L_qHwICaCsqKyBLz1raOwi5me7CIcpn5ibijn07A,2701
+sigal/themes/photoswipe/static/photoswipe-lightbox.esm.js,sha256=DcCTKV8r_xFyIQglH9s-A5tgx4K_PKptzdY2sESe1t8,54556
+sigal/themes/photoswipe/static/photoswipe-lightbox.esm.js.map,sha256=DMwIo61CgRYoBAcHL9nyI0InrTDNKaNQsQcc1Exbt6w,109478
+sigal/themes/photoswipe/static/photoswipe-lightbox.esm.min.js,sha256=uCw4VgT5DMdwgtjhvU9e98nT2mLZXcw_8WkaTrDd3RI,14338
+sigal/themes/photoswipe/static/photoswipe-video-plugin.esm.js,sha256=UATlOn-Jz2bscl8d-JxrrHfi9HsQzwxcgR07jhX6xWw,7203
+sigal/themes/photoswipe/static/photoswipe-video-plugin.esm.min.js,sha256=Ii-ZW2cjRwRtEIlEiWKgKmXt_8QmL9pPUIanNbHieRk,3446
+sigal/themes/photoswipe/static/photoswipe.css,sha256=u16VaBKoE-G9W-XXZBzHjQXX59P3qxAYe8JyXXC1LJQ,7003
+sigal/themes/photoswipe/static/photoswipe.esm.js,sha256=23YN69O4wN_-5QPeKjYeRfCp9-s8dqlz47vaVBErhBc,187718
+sigal/themes/photoswipe/static/photoswipe.esm.js.map,sha256=kEmuw6JFgJmMY0ACMSSu1NuN0hO4_ZqKeTxjqDWVo2Q,379188
+sigal/themes/photoswipe/static/photoswipe.esm.min.js,sha256=VCBpdxvrNNxGHNuTdNqK9kPFkev2XY7DYzHdmgaB69Q,54270
+sigal/themes/photoswipe/static/styles.css,sha256=pr8tKKTPzUfquQNXXn4FvBlZFVemiY4gRU86Y1FeIpM,4211
+sigal/themes/photoswipe/templates/album.html,sha256=3Q5aDVjHgDBZr7uIAg2iDvsUukAe-AbFxlegJcBG3ZU,3301
 sigal/themes/photoswipe/templates/album_list.html,sha256=lZh2TLFqKOSfWaqAaZyutCxPzxTcogRbibyc6-2YsgU,403
 sigal/themes/photoswipe/templates/base.html,sha256=S-lhAJfUkXJ9E6Q0FAzrbnv1kM1rW0PpAxKARDR1s8c,1284
-sigal-2.3.dist-info/LICENSE,sha256=dhXw6nG46OtW6x5ScKm9DRMIVJNFklvCT-_mRiJAEOc,1086
-sigal-2.3.dist-info/METADATA,sha256=tMq5EI-kXjGhCLh70ndPLMDdlkqDsYNIB9ZKTpeONBU,3482
-sigal-2.3.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-sigal-2.3.dist-info/entry_points.txt,sha256=0d6G4mfwngP5--aFVxGpdUujO53smlmD-jygNSDCQ8o,37
-sigal-2.3.dist-info/top_level.txt,sha256=z6e1_OpCyg5rzqDmiAat3ytylvaz0K5F7VDdrbF8fQc,6
-sigal-2.3.dist-info/RECORD,,
+sigal-2.5.dist-info/LICENSE,sha256=VFPg0QyH2MjVAWTOJrYce-Q6DJydrasigpGut33O7cY,1086
+sigal-2.5.dist-info/METADATA,sha256=NpHfYREuF1l3eU1ANeuGMQ0sDn0OGaAVG_c8QWxWuos,3273
+sigal-2.5.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+sigal-2.5.dist-info/entry_points.txt,sha256=9MBYGKDTQgjtKk7ebYjjdtXGI50AAaJ8q1TG9HsE2QM,46
+sigal-2.5.dist-info/top_level.txt,sha256=z6e1_OpCyg5rzqDmiAat3ytylvaz0K5F7VDdrbF8fQc,6
+sigal-2.5.dist-info/RECORD,,

{sigal-2.3.dist-info → sigal-2.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: setuptools (75.8.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

sigal-2.5.dist-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+sigal = sigal.__main__:main

sigal/plugins/upload_s3.py

@@ -1,106 +0,0 @@
-"""Plugin to upload generated files to Amazon S3.
-
-This plugin requires boto_. All generated files are uploaded to a specified S3
-bucket.  When using this plugin you have to make sure that the bucket already
-exists and the you have access to the S3 bucket. The access credentials are
-managed by boto_ and can be given as environment variables, configuration files
-etc. More information can be found on the boto_ documentation.
-
-.. _boto: https://pypi.org/project/boto/
-
-Settings (all settings are wrapped in ``upload_s3_options`` dict):
-
-- ``bucket``: The to-be-used bucket for uploading.
-- ``policy``: Specifying access control to the uploaded files. Possible values:
-  private, public-read, public-read-write, authenticated-read
-- ``overwrite``: Boolean indicating if all files should be uploaded and
-  overwritten or if already uploaded files should be skipped.
-- ``max_age``: Optional, Integer indicating the number of seconds that the
-  cache control should be set by default
-- ``media_max_age``: Optional, Integer indicates the number of seconds that
-  cache control hould be set for media files
-
-"""
-
-import logging
-import os
-
-from click import progressbar
-
-from sigal import signals
-
-logger = logging.getLogger(__name__)
-
-
-def upload_s3(gallery, settings=None):
-    import boto
-
-    upload_files = []
-
-    # Get local files
-    for root, dirs, files in os.walk(gallery.settings["destination"]):
-        for f in files:
-            path = os.path.join(root[len(gallery.settings["destination"]) + 1 :], f)
-            size = os.path.getsize(os.path.join(root, f))
-            upload_files += [(path, size)]
-
-    # Connect to specified bucket
-    conn = boto.connect_s3()
-    bucket = conn.get_bucket(gallery.settings["upload_s3_options"]["bucket"])
-
-    # Upload the files
-    with progressbar(upload_files, label="Uploading files to S3") as bar:
-        for (f, size) in bar:
-            if gallery.settings["upload_s3_options"]["overwrite"] is False:
-                # Check if file was uploaded before
-                key = bucket.get_key(f)
-                if key is not None and key.size == size:
-                    cache_metadata = generate_cache_metadata(gallery, f)
-
-                    if key.get_metadata("Cache-Control") != cache_metadata:
-                        key.set_remote_metadata(
-                            {"Cache-Control": cache_metadata}, {}, True
-                        )
-                    logger.debug("Skipping file %s", f)
-                else:
-                    upload_file(gallery, bucket, f)
-            else:
-                # File is not available on S3 yet
-                upload_file(gallery, bucket, f)
-
-
-def generate_cache_metadata(gallery, f):
-    filename, ext = os.path.splitext(f)
-    options = gallery.settings["upload_s3_options"]
-
-    proposed_cache_control = None
-    if "media_max_age" in options and ext in [".jpg", ".png", ".webm", ".mp4"]:
-        proposed_cache_control = "max-age=%s" % options["media_max_age"]
-    elif "max_age" in options:
-        proposed_cache_control = "max-age=%s" % options["max_age"]
-    return proposed_cache_control
-
-
-def upload_file(gallery, bucket, f):
-    logger.debug("Uploading file %s", f)
-
-    from boto.s3.key import Key
-
-    key = Key(bucket)
-    key.key = f
-
-    cache_metadata = generate_cache_metadata(gallery, f)
-    if cache_metadata:
-        key.set_metadata("Cache-Control", cache_metadata)
-
-    key.set_contents_from_filename(
-        os.path.join(gallery.settings["destination"], f),
-        policy=gallery.settings["upload_s3_options"]["policy"],
-    )
-
-
-def register(settings):
-    if settings.get("upload_s3_options"):
-        signals.gallery_build.connect(upload_s3)
-    else:
-        logger.warning("Upload to S3 is not configured.")