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

sigal/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2023 - Simon Conseil
+# Copyright (c) 2009-2026 - 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/__main__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2023 - Simon Conseil
+# Copyright (c) 2009-2026 - 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
@@ -237,15 +237,17 @@ def serve(destination, port, config, browser):
         settings = read_settings(config)
         destination = settings.get("destination")
         if not os.path.exists(destination):
-            sys.stderr.write(
+            click.echo(
                 f"The '{destination}' directory doesn't exist, maybe try building"
-                " first?\n"
+                " first?",
+                err=True,
             )
             sys.exit(1)
     else:
-        sys.stderr.write(
+        click.echo(
             f"The {destination} directory doesn't exist "
-            f"and the config file ({config}) could not be read.\n"
+            f"and the config file ({config}) could not be read.",
+            err=True,
         )
         sys.exit(2)
 
@@ -284,10 +286,10 @@ def set_meta(target, keys, overwrite=False):
     """
 
     if not os.path.exists(target):
-        sys.stderr.write(f"The target {target} does not exist.\n")
+        click.echo(f"The target {target} does not exist.", err=True)
         sys.exit(1)
     if len(keys) < 2 or len(keys) % 2 > 0:
-        sys.stderr.write("Need an even number of arguments.\n")
+        click.echo("Need an even number of arguments.", err=True)
         sys.exit(1)
 
     if os.path.isdir(target):
@@ -295,9 +297,10 @@ def set_meta(target, keys, overwrite=False):
     else:
         descfile = os.path.splitext(target)[0] + ".md"
     if os.path.exists(descfile) and not overwrite:
-        sys.stderr.write(
+        click.echo(
             f"Description file '{descfile}' already exists. "
-            "Use --overwrite to overwrite it.\n"
+            "Use --overwrite to overwrite it.",
+            err=True,
         )
         sys.exit(2)
 

sigal/gallery.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2023 - Simon Conseil
+# Copyright (c) 2009-2026 - Simon Conseil
 # Copyright (c) 2013      - Christophe-Marie Duquesne
 # Copyright (c) 2014      - Jonas Kaufmann
 # Copyright (c) 2015      - François D.
@@ -52,7 +52,7 @@ from .image import (
     get_size,
     process_image,
 )
-from .settings import Status, get_thumb
+from .settings import IMG_EXTENSIONS, Status, get_thumb
 from .utils import (
     Devnull,
     check_or_create_dir,
@@ -246,15 +246,10 @@ class Image(Media):
         super().__init__(filename, path, settings)
         imgformat = settings.get("img_format")
 
-        # Register all formats
-        PILImage.init()
-
-        if imgformat and PILImage.EXTENSION[self.src_ext] != imgformat.upper():
+        if imgformat and IMG_EXTENSIONS.ext2format[self.src_ext] != imgformat.upper():
             # Find the extension that should match img_format
-            extensions = {v: k for k, v in PILImage.EXTENSION.items()}
-            ext = extensions[imgformat.upper()]
+            ext = IMG_EXTENSIONS.format2ext[imgformat.upper()]
             self.dst_filename = self.basename + ext
-            self.thumb_name = get_thumb(self.settings, self.dst_filename)
 
     @cached_property
     def date(self):
@@ -593,76 +588,76 @@ class Album:
         # Test the thumbnail from the Markdown file.
         thumbnail = self.meta.get("thumbnail", [""])[0]
 
-        if thumbnail and isfile(join(self.src_path, thumbnail)):
-            self._thumbnail = url_from_path(
-                join(self.name, get_thumb(self.settings, thumbnail))
-            )
+        if thumbnail:
+            # if thumbnail is set in the markdown, it can be either the
+            # original filename or the generated name after format conversion
+            if isfile(join(self.src_path, thumbnail)):
+                thumbnail = get_thumb(self.settings, thumbnail)
+            self._thumbnail = url_from_path(join(self.name, thumbnail))
             self.logger.debug("Thumbnail for %r : %s", self, self._thumbnail)
             return self._thumbnail
-        else:
-            # find and return the first landscape image
-            for f in self.medias:
-                ext = splitext(f.dst_filename)[1]
-                if ext.lower() not in self.settings["img_extensions"]:
-                    continue
-
-                # Use f.size if available as it is quicker (in cache), but
-                # fallback to the size of src_path if dst_path is missing
-                size = f.input_size
-                if size is None:
-                    size = f.file_metadata["size"]
-
-                if size["width"] > size["height"]:
+
+        # find and return the first landscape image
+        for f in self.medias:
+            ext = splitext(f.dst_filename)[1]
+            if ext.lower() not in self.settings["img_extensions"]:
+                continue
+
+            # Use f.size if available as it is quicker (in cache), but
+            # fallback to the size of src_path if dst_path is missing
+            size = f.input_size
+            if size is None:
+                size = f.file_metadata["size"]
+
+            if size["width"] > size["height"]:
+                try:
+                    self._thumbnail = url_quote(self.name) + "/" + f.thumbnail
+                except Exception as e:
+                    self.logger.info(
+                        "Failed to get thumbnail for %s: %s", f.dst_filename, e
+                    )
+                else:
+                    self.logger.debug(
+                        "Use 1st landscape image as thumbnail for %r : %s",
+                        self,
+                        self._thumbnail,
+                    )
+                    return self._thumbnail
+
+        # else simply return the 1st media file
+        if not self._thumbnail and self.medias:
+            for media in self.medias:
+                if media.thumbnail is not None:
                     try:
-                        self._thumbnail = url_quote(self.name) + "/" + f.thumbnail
+                        self._thumbnail = url_quote(self.name) + "/" + media.thumbnail
                     except Exception as e:
                         self.logger.info(
-                            "Failed to get thumbnail for %s: %s", f.dst_filename, e
+                            "Failed to get thumbnail for %s: %s",
+                            media.dst_filename,
+                            e,
                         )
                     else:
-                        self.logger.debug(
-                            "Use 1st landscape image as thumbnail for %r : %s",
-                            self,
-                            self._thumbnail,
-                        )
-                        return self._thumbnail
-
-            # else simply return the 1st media file
-            if not self._thumbnail and self.medias:
-                for media in self.medias:
-                    if media.thumbnail is not None:
-                        try:
-                            self._thumbnail = (
-                                url_quote(self.name) + "/" + media.thumbnail
-                            )
-                        except Exception as e:
-                            self.logger.info(
-                                "Failed to get thumbnail for %s: %s",
-                                media.dst_filename,
-                                e,
-                            )
-                        else:
-                            break
-                else:
-                    self.logger.warning("No thumbnail found for %r", self)
-                    return
+                        break
+            else:
+                self.logger.warning("No thumbnail found for %r", self)
+                return
 
-                self.logger.debug(
-                    "Use the 1st image as thumbnail for %r : %s", self, self._thumbnail
-                )
-                return self._thumbnail
-
-            # use the thumbnail of their sub-directories
-            if not self._thumbnail:
-                for path, album in self.gallery.get_albums(self.path):
-                    if album.thumbnail:
-                        self._thumbnail = url_quote(self.name) + "/" + album.thumbnail
-                        self.logger.debug(
-                            "Using thumbnail from sub-directory for %r : %s",
-                            self,
-                            self._thumbnail,
-                        )
-                        return self._thumbnail
+            self.logger.debug(
+                "Use the 1st image as thumbnail for %r : %s", self, self._thumbnail
+            )
+            return self._thumbnail
+
+        # use the thumbnail of their sub-directories
+        if not self._thumbnail:
+            for path, album in self.gallery.get_albums(self.path):
+                if album.thumbnail:
+                    self._thumbnail = url_quote(self.name) + "/" + album.thumbnail
+                    self.logger.debug(
+                        "Using thumbnail from sub-directory for %r : %s",
+                        self,
+                        self._thumbnail,
+                    )
+                    return self._thumbnail
 
         self.logger.error("Thumbnail not found for %r", self)
 
@@ -918,14 +913,6 @@ class Gallery:
             ) as albums:
                 for album in albums:
                     if album.albums:
-                        if album.medias:
-                            self.logger.warning(
-                                "Album '%s' contains sub-albums and images. "
-                                "Please move images to their own sub-album. "
-                                "Images in album %s will not be visible.",
-                                album.title,
-                                album.title,
-                            )
                         album_list_writer.write(album)
                     else:
                         album_writer.write(album)

sigal/image.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2023 - Simon Conseil
+# Copyright (c) 2009-2026 - Simon Conseil
 # Copyright (c) 2015 - François D.
 # Copyright (c) 2018 - Edwin Steele
 
@@ -99,6 +99,7 @@ def generate_image(source, outname, settings, options=None):
 
     img = _read_image(source)
     original_format = img.format
+    logger.debug("Read %s: %dx%d (%s)", source, *img.size, original_format)
 
     if settings["copy_exif_data"] and settings["autorotate_images"]:
         logger.warning(
@@ -149,7 +150,7 @@ def generate_image(source, outname, settings, options=None):
     # format, or fall back to JPEG
     outformat = settings.get("img_format") or img.format or original_format or "JPEG"
 
-    logger.debug("Save resized image to %s (%s)", outname, outformat)
+    logger.debug("Save resized image: %s, %dx%d (%s)", outname, *img.size, outformat)
     save_image(img, outname, outformat, options=options, autoconvert=True)
 
 
@@ -162,6 +163,7 @@ def generate_thumbnail(
     img = _read_image(source)
     img = Transpose().process(img)
     original_format = img.format
+    logger.debug("Read %s: %dx%d (%s)", source, *img.size, original_format)
 
     try:
         method = PILImage.Resampling.LANCZOS
@@ -175,7 +177,7 @@ def generate_thumbnail(
         img.thumbnail(box, method)
 
     outformat = img.format or original_format or "JPEG"
-    logger.debug("Save thumnail image: %s (%s)", outname, outformat)
+    logger.debug("Save thumbnail image: %s, %dx%d (%s)", outname, *img.size, outformat)
     save_image(img, outname, outformat, options=options, autoconvert=True)
 
 

sigal/log.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2023 - Simon Conseil
+# Copyright (c) 2013-2026 - 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/plugins/feeds.py

@@ -70,6 +70,7 @@ def generate_feed(gallery, medias, feed_type=None, feed_url="", nb_items=0):
         feed.add_item(
             title=Markup.escape(item.title or item.url),
             link=link,
+            content=None,
             # unique_id='tag:%s,%s:%s' % (urlparse(link).netloc,
             #                             item.date.date(),
             #                             urlparse(link).path.lstrip('/')),

sigal/plugins/media_page.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2023 - Simon Conseil
+# Copyright (c) 2009-2026 - Simon Conseil
 # Copyright (c)      2014 - Jamie Starke
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

sigal/plugins/nonmedia_files.py

@@ -4,6 +4,9 @@ This plugin will copy the files into the build tree and generate generic
 thumbnails for the files.  In-browser previews will likely fail, and
 it is up to the theme to provide correct support for downloads.
 
+If the `pdf2image <https://pypi.org/project/pdf2image/>`_ optional dependency is installed,
+it will be used to generate thumbnails for PDF files.
+
 Settings available as dictionary in ``nonmedia_files_options``:
 
 - ``ext_as_thumb``: Enable simple thumbnail showing ext. Default to ``True``
@@ -26,6 +29,10 @@ Settings available as dictionary in ``nonmedia_files_options``:
 import logging
 import os
 
+try:  # Optional dependency:
+    from pdf2image import convert_from_path as pdf2img
+except ImportError:
+    pdf2img = None
 from PIL import Image as PILImage
 from PIL import ImageDraw, ImageFont
 from pilkit.utils import save_image
@@ -102,9 +109,7 @@ def generate_thumbnail(
     logger.info(f"kwargs: {kwargs}")
     d.text(anchor, text, anchor="mm", **kwargs)
 
-    outformat = "JPEG"
-    logger.info("Save thumnail image: %s (%s)", outname, outformat)
-    save_image(img, outname, outformat, options=options, autoconvert=True)
+    save_image(img, outname, "JPEG", options=options, autoconvert=True)
 
 
 def process_thumb(media):
@@ -113,18 +118,24 @@ def process_thumb(media):
     utils.copy(media.src_path, media.dst_path, symlink=settings["orig_link"])
 
     if plugin_settings.get("ext_as_thumb", DEFAULT_CONFIG["ext_as_thumb"]):
-        logger.info("plugin_settings: %r", plugin_settings)
-        kwargs = {}
-        for key in ("bg_color", "font", "font_color", "font_size"):
-            if f"thumb_{key}" in plugin_settings:
-                kwargs[key] = plugin_settings[f"thumb_{key}"]
-        generate_thumbnail(
-            media.src_ext[1:].upper(),
-            media.thumb_path,
-            settings["thumb_size"],
-            options=settings["jpg_options"],
-            **kwargs,
-        )
+        if pdf2img and media.src_ext.lower() == ".pdf":
+            images = pdf2img(
+                media.src_path, single_file=True, size=settings["thumb_size"]
+            )
+            images[0].save(media.thumb_path)
+        else:
+            kwargs = {}
+            for key in ("bg_color", "font", "font_color", "font_size"):
+                if f"thumb_{key}" in plugin_settings:
+                    kwargs[key] = plugin_settings[f"thumb_{key}"]
+            generate_thumbnail(
+                media.src_ext[1:].upper(),
+                media.thumb_path,
+                settings["thumb_size"],
+                options=settings["jpg_options"],
+                **kwargs,
+            )
+        logger.info("Saved thumbnail image: %s", media.thumb_path)
 
 
 def process_nonmedia(media):

sigal/settings.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2023 - Simon Conseil
+# Copyright (c) 2009-2026 - Simon Conseil
 # Copyright (c) 2013      - Christophe-Marie Duquesne
 # Copyright (c) 2017      - Mate Lakat
 # Copyright (c) 2021      - Keith Feldman
@@ -26,6 +26,8 @@ import os
 from os.path import abspath, isabs, join, normpath
 from pprint import pformat
 
+from PIL import Image as PILImage
+
 _DEFAULT_CONFIG = {
     "albums_sort_attr": "name",
     "albums_sort_reverse": False,
@@ -112,6 +114,20 @@ class Status:
     FAILURE = 1
 
 
+class _ImgExtensions:
+    def __init__(self):
+        # Register all formats
+        PILImage.init()
+
+        self.ext2format = PILImage.EXTENSION
+        self.format2ext = {v: k for k, v in PILImage.EXTENSION.items()}
+        self.format2ext["JPEG"] = ".jpg"  # prefered ext for jpg
+        self.format2ext["PNG"] = ".png"  # prefered ext for png
+
+
+IMG_EXTENSIONS = _ImgExtensions()
+
+
 def get_thumb(settings, filename):
     """Return the path to the thumb.
 
@@ -132,6 +148,11 @@ def get_thumb(settings, filename):
 
     if ext.lower() in settings["video_extensions"]:
         ext = ".jpg"
+
+    imgformat = settings.get("img_format")
+    if imgformat:
+        ext = IMG_EXTENSIONS.format2ext[imgformat]
+
     return join(
         path,
         settings["thumb_dir"],
@@ -173,7 +194,7 @@ def read_settings(filename=None):
                 settings[p] = abspath(normpath(join(settings_path, path)))
                 logger.debug("Rewrite %s : %s -> %s", p, path, settings[p])
 
-    for key in ("img_size", "thumb_size", "video_size"):
+    for key in ("img_size", "video_size"):
         if settings[key]:
             w, h = settings[key]
             if h > w:

sigal/themes/colorbox/templates/album.html

@@ -16,47 +16,49 @@
 
   {% include 'map.html' %}
   <div id="gallery">
-    {% for media in album.medias | selectattr("type", "in", ("image", "video")) %}
+    {% for media in album.medias %}
       {% if loop.index % nb_columns == 1 %}
-      <div id="albums" class="row">
+    <div id="albums" class="row">
       {% endif%}
-      {% if media.type == "image" %}
+      {% if media.thumbnail %}
       <div class="{{ column_size_t }} columns thumbnail">
+      {% if media.type == "image" %}
+        <a class="gallery" title="{{ media.title }}" {{ img_description(media) }}
+        {% if 'sigal.plugins.media_page' in settings.plugins %}
+           href="{{ media.url }}.html" data-href="{{ media.url }}"
+        {% else %}
+           href="{{ media.url }}"
+        {% endif %}
+      {% elif media.type == "video" %}
+        {% set mhash = media.url|replace('.', '')|replace(' ', '') %}
         {% if 'sigal.plugins.media_page' in settings.plugins %}
-        <a href="{{ media.url}}.html" class="gallery"
-          title="{{ media.title }}"
-          data-href="{{ media.url }}" {{ img_description(media) }}>
+        <a href="{{ media.url }}.html" data-href="#{{ mhash }}"
         {% else %}
-        <a href="{{ media.url }}" class="gallery" title="{{ media.title }}"
-          {{ img_description(media) }}>
+        <a href="#{{ mhash }}" class="gallery" inline='yes' title="{{ media.url }}"
         {% endif %}
+        {% if media.big %} data-big="{{ media.big_url }}"{% endif %}
+      {% else %}
+        <a href="{{ media.url }}" title="{{ media.title }}"
+      {% endif %}
+        >
           <img src="{{ media.thumbnail }}" alt="{{ media.url }}"
-              title="{{ media.title }}" /></a>
+               title="{{ media.title }}">
+        </a>
       </div>
       {% endif %}
+
       {% if media.type == "video" %}
-        {% set mhash = media.url|replace('.', '')|replace(' ', '') %}
-        <div class="{{ column_size_t }} columns thumbnail">
-          {% if 'sigal.plugins.media_page' in settings.plugins %}
-          <a href="{{ media.url }}.html" data-href="#{{ mhash }}"
-          {% else %}
-          <a href="#{{ mhash }}" class="gallery" inline='yes' title="{{ media.url }}"
-          {% endif %}
-            {% if media.big %} data-big="{{ media.big_url }}"{% endif %}>
-            <img src="{{ media.thumbnail }}" alt="{{ media.url }}"
-                title="{{ media.title }}" /></a>
-        </div>
-        <!-- This contains the hidden content for the video -->
-        <div style='display:none'>
-          <div id="{{ mhash }}">
-            <video controls>
-            <source src='{{ media.url }}' type='{{ media.mime }}' />
-            </video>
-          </div>
+      <!-- This contains the hidden content for the video -->
+      <div style='display:none'>
+        <div id="{{ mhash }}">
+          <video controls>
+          <source src='{{ media.url }}' type='{{ media.mime }}' />
+          </video>
         </div>
+      </div>
       {% endif %}
       {% if loop.last or loop.index % nb_columns == 0 %}
-      </div>
+    </div>
       {% endif%}
     {% endfor %}
   </div>

sigal/themes/galleria/templates/album_items.html

@@ -27,7 +27,7 @@
       {% for media in album.medias -%}
       {
         title: "{{ media.title }}",
-        description: "{{ img_description(media) | e }}",
+        description: {{ img_description(media) | tojson }},
         thumb: "{{ media.thumbnail }}",
         {% if media.big %}
         big: "{{ media.big_url }}",

sigal/themes/photoswipe/static/styles.css

@@ -175,12 +175,8 @@ figcaption {
   line-height: 0;
 }
 
-.gallery__img--main a{
-  width: auto;
-  height: auto;
-}
-
 .menu-img,
+.gallery__img--main,
 .gallery__img--secondary {
   width: 25%;
   float:left;
@@ -213,6 +209,7 @@ footer span:not(:last-child):after {
     font-size: 40px;
   }
   .menu-img,
+  .gallery__img--main,
   .gallery__img--secondary {
     width: 33%;
   }
@@ -221,6 +218,7 @@ footer span:not(:last-child):after {
 
 @media screen and (max-width: 500px) {
   .menu-img,
+  .gallery__img--main,
   .gallery__img--secondary {
     width: 50%;
   }
@@ -229,6 +227,7 @@ footer span:not(:last-child):after {
 
 @media screen and (max-width: 300px) {
   .menu-img,
+  .gallery__img--main,
   .gallery__img--secondary {
     width: 100%;
   }

sigal/themes/photoswipe/templates/album.html

@@ -1,92 +1,8 @@
 {% from 'description.html' import img_description %}
 {% extends "base.html" %}
 
-{% block extra_head %}
-  <link rel="stylesheet" href="{{ theme.url }}/photoswipe.css">
-  <script type="module">
-  import PhotoSwipeLightbox from '/static/photoswipe-lightbox.esm.min.js';
-  import PhotoSwipe from '/static/photoswipe.esm.min.js';
-  import PhotoSwipeDynamicCaption from '/static/photoswipe-dynamic-caption-plugin.esm.min.js';
-  import PhotoSwipeFullscreen from '/static/photoswipe-fullscreen.esm.min.js';
-  import PhotoSwipeVideoPlugin from '/static/photoswipe-video-plugin.esm.min.js';
-
-  const lightbox = new PhotoSwipeLightbox({
-    gallery: '.gallery',
-    children: '.thumbnail',
-    pswpModule: PhotoSwipe
-  });
-  const captionPlugin = new PhotoSwipeDynamicCaption(lightbox, {type: 'auto'});
-  const fullscreenPlugin = new PhotoSwipeFullscreen(lightbox);
-  const videoPlugin = new PhotoSwipeVideoPlugin(lightbox, {autoplay: true});
-
-  lightbox.on('uiRegister', function() {
-    lightbox.pswp.ui.registerElement({
-      name: 'download-button',
-      order: 8,
-      isButton: true,
-      tagName: 'a',
-      html: {
-        isCustomSVG: true,
-        inner: '<path d="M20.5 14.3 17.1 18V10h-2.2v7.9l-3.4-3.6L10 16l6 6.1 6-6.1ZM23 23H9v2h14Z" id="pswp__icn-download"/>',
-        outlineID: 'pswp__icn-download'
-      },
-      onInit: (el, pswp) => {
-        el.setAttribute('download', '');
-        el.setAttribute('target', '_blank');
-        el.setAttribute('rel', 'noopener');
-        pswp.on('change', () => {
-          if (pswp.currSlide.data.element.children[0].dataset.big) {
-            el.href = pswp.currSlide.data.element.children[0].dataset.big;
-          } else {
-            el.href = pswp.currSlide.data.src;
-          }
-        });
-      }
-    });
-  });
-
-  lightbox.init();
-  </script>
-{% endblock extra_head %}
-
 {% block content %}
-  {% include 'download_zip.html' %}
-  {% include 'map.html' %}
-  <div class="gallery">
-    {% for media in album.medias %}
-      {% if media.type == "image" %}
-        <figure class="gallery__img--{{ "main" if loop.first else "secondary" }} thumbnail">
-          <a href="{{ media.url }}"
-             data-pswp-width="{{media.size.width}}"
-             data-pswp-height="{{media.size.height}}"
-             {%- if media.big -%}
-             data-big="{{ media.big_url }}"
-             {%- endif -%}
-             >
-             <img src="{{ media.thumbnail }}" alt="{{ media.url }}" />
-          </a>
-          <div class="pswp-caption-content">
-            {{ img_description(media, with_big=False) }}
-          </div>
-          <figcaption>{{ media.title }} - {{ media.exif.datetime }}</figcaption>
-        </figure>
-      {% endif %}
-      {% if media.type == "video" %}
-        <figure class="gallery__img--secondary thumbnail" >
-          <a href="{{ media.url }}"
-             data-pswp-type="video"
-             data-pswp-width="800"
-             data-pswp-height="600">
-            <img src="{{ media.thumbnail }}" alt="{{ media.url }}" />
-          </a>
-          <div class="pswp-caption-content">
-            {{ img_description(media, with_big=False) }}
-          </div>
-          <figcaption>{{ media_title }}</figcaption>
-        </figure>
-      {% endif %}
-    {% endfor %}
-  </div>
+  {% include "album_items.html" %}
 {% endblock %}
 
 {% block extra_footer %}

sigal/themes/photoswipe/templates/album_items.html

@@ -0,0 +1,31 @@
+{% from 'description.html' import img_description %}
+
+  {% include 'download_zip.html' %}
+  {% include 'map.html' %}
+  <div class="gallery">
+    {% for media in album.medias %}
+      {% if media.thumbnail %}
+        <figure class="gallery__img--{{ "main" if loop.first else "secondary" }} thumbnail">
+          <a href="{{ media.url }}"
+          {% if media.type == "image" %}
+             data-pswp-width="{{media.size.width}}"
+             data-pswp-height="{{media.size.height}}"
+             {% if media.big %}
+             data-big="{{ media.big_url }}"
+             {%- endif -%}
+          {% elif media.type == "video" %}
+             data-pswp-type="video"
+             data-pswp-width="800"
+             data-pswp-height="600"
+          {% endif %}
+          >
+            <img src="{{ media.thumbnail }}" alt="{{ media.url }}" />
+          </a>
+          <div class="pswp-caption-content">
+            {{ img_description(media, with_big=False) }}
+          </div>
+          <figcaption>{{ media.title }}{{ (" - " + media.exif.datetime) if media.exif else "" }}</figcaption>
+        </figure>
+      {% endif %}
+    {% endfor %}
+  </div>

sigal/themes/photoswipe/templates/album_list.html

@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+
 {% block content %}
   <div class="album-list">
   {% for alb in album.albums %}
@@ -10,4 +11,8 @@
     </div>
   {% endfor %}
   </div>
+
+  {% if album.medias %}
+    {% include "album_items.html" %}
+  {% endif %}
 {% endblock %}

sigal/themes/photoswipe/templates/base.html

@@ -9,6 +9,55 @@
     <meta name="author" content="{{ album.author }}">
     <meta name="viewport" content="width=device-width">
     {% include 'default_head.html' %}
+
+{% if album.medias %}
+    <link rel="stylesheet" href="{{ theme.url }}/photoswipe.css">
+    <script type="module">
+    import PhotoSwipeLightbox from '{{ theme.url }}/photoswipe-lightbox.esm.min.js';
+    import PhotoSwipe from '{{ theme.url }}/photoswipe.esm.min.js';
+    import PhotoSwipeDynamicCaption from '{{ theme.url }}/photoswipe-dynamic-caption-plugin.esm.min.js';
+    import PhotoSwipeFullscreen from '{{ theme.url }}/photoswipe-fullscreen.esm.min.js';
+    import PhotoSwipeVideoPlugin from '{{ theme.url }}/photoswipe-video-plugin.esm.min.js';
+
+    const lightbox = new PhotoSwipeLightbox({
+      gallery: '.gallery',
+      children: '.thumbnail',
+      pswpModule: PhotoSwipe
+    });
+    const captionPlugin = new PhotoSwipeDynamicCaption(lightbox, {type: 'auto'});
+    const fullscreenPlugin = new PhotoSwipeFullscreen(lightbox);
+    const videoPlugin = new PhotoSwipeVideoPlugin(lightbox, {autoplay: true});
+
+    lightbox.on('uiRegister', function() {
+      lightbox.pswp.ui.registerElement({
+        name: 'download-button',
+        order: 8,
+        isButton: true,
+        tagName: 'a',
+        html: {
+          isCustomSVG: true,
+          inner: '<path d="M20.5 14.3 17.1 18V10h-2.2v7.9l-3.4-3.6L10 16l6 6.1 6-6.1ZM23 23H9v2h14Z" id="pswp__icn-download"/>',
+          outlineID: 'pswp__icn-download'
+        },
+        onInit: (el, pswp) => {
+          el.setAttribute('download', '');
+          el.setAttribute('target', '_blank');
+          el.setAttribute('rel', 'noopener');
+          pswp.on('change', () => {
+            if (pswp.currSlide.data.element.children[0].dataset.big) {
+              el.href = pswp.currSlide.data.element.children[0].dataset.big;
+            } else {
+              el.href = pswp.currSlide.data.src;
+            }
+          });
+        }
+      });
+    });
+
+    lightbox.init();
+    </script>
+{% endif %}
+
     {% block extra_head %}{% endblock extra_head %}
     <link rel="stylesheet" href="{{ theme.url }}/styles.css">
     {% if user_css %}

sigal/utils.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2011-2023 - Simon Conseil
+# Copyright (c) 2011-2026 - 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/version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '2.5'
-__version_tuple__ = version_tuple = (2, 5)
+__version__ = version = '2.6'
+__version_tuple__ = version_tuple = (2, 6)
+
+__commit_id__ = commit_id = 'gdd348d1f4'

sigal/video.py

@@ -1,5 +1,5 @@
 # Copyright (c)      2013 - Christophe-Marie Duquesne
-# Copyright (c) 2013-2023 - Simon Conseil
+# Copyright (c) 2013-2026 - Simon Conseil
 # Copyright (c)      2021 - Keith Feldman
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy

sigal/writer.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2023 - Simon Conseil
+# Copyright (c) 2009-2026 - Simon Conseil
 # Copyright (c)      2013 - Christophe-Marie Duquesne
 # Copyright (c)      2018 - Edwin Steele
 

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

@@ -1,28 +1,27 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: sigal
-Version: 2.5
+Version: 2.6
 Summary: Simple static gallery generator
 Author-email: Simon Conseil <contact@saimon.org>
-License: MIT License
+License-Expression: MIT
 Project-URL: repository, https://github.com/saimn/sigal
-Project-URL: documentation, http://sigal.saimon.org/en/latest/
+Project-URL: documentation, https://sigal.readthedocs.io/en/latest/
 Keywords: gallery,static,generator,image,video,galleria
 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: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Multimedia :: Graphics :: Viewers
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: blinker
 Requires-Dist: click
 Requires-Dist: Jinja2>=2.7
 Requires-Dist: Markdown
-Requires-Dist: Pillow>=8.0.0
+Requires-Dist: Pillow>=10.0.0
 Requires-Dist: pilkit
 Requires-Dist: natsort
 Provides-Extra: all
@@ -31,6 +30,7 @@ Requires-Dist: feedgenerator; extra == "all"
 Requires-Dist: zopfli; extra == "all"
 Requires-Dist: cryptography; extra == "all"
 Requires-Dist: pillow-heif; extra == "all"
+Requires-Dist: pdf2image; extra == "all"
 Provides-Extra: tests
 Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
@@ -38,6 +38,7 @@ Provides-Extra: docs
 Requires-Dist: Sphinx>=4.1.0; extra == "docs"
 Requires-Dist: furo; extra == "docs"
 Requires-Dist: cryptography; extra == "docs"
+Dynamic: license-file
 
 Sigal - Simple Static Gallery Generator
 =======================================
@@ -64,7 +65,7 @@ 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 requires Python 3.9+.
+Sigal requires Python 3.11+.
 
 Links
 -----
@@ -83,7 +84,7 @@ Javascript libraries:
 - `galleria demo`_
 - `photoswipe demo`_
 
-.. _website: http://sigal.saimon.org/
+.. _website: https://sigal.readthedocs.io/en/latest/
 .. _GitHub: https://github.com/saimn/sigal/
 .. _PyPI: https://pypi.org/project/sigal/
 .. _galleria: https://github.com/GalleriaJS/galleria

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

@@ -1,23 +1,23 @@
-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/__init__.py,sha256=kfl9IcTdz5YgXNo8WtzE7jl9ET_KoCFTRsKLkOb3OSo,1258
+sigal/__main__.py,sha256=A8M5r85oxDMhvv5hRH4f1A0F7VxfGYqnYYaap3gVgQ4,9640
+sigal/gallery.py,sha256=1b4xef21hp9_Q3faXVYaal-84ADfx_paESu2sDTwbts,33981
+sigal/image.py,sha256=2iEAhZcmbPG_AM7UXrO3hxTJPXbQo1Fme_eHV34nULE,13612
+sigal/log.py,sha256=WJGnjLaB2pLdBI3QFwtkYKCHYxxzvWZc6K6O3lpfwWI,2588
+sigal/settings.py,sha256=uSoPnl3dcLSV9LM7KonOmBcJ4WflrKUHYj4tu5u4-js,6793
 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/utils.py,sha256=zL_RRdi-JIK0C3jE1uY8oI6GKJjYYYO3qtnx1mP0ylU,5811
+sigal/version.py,sha256=3kKbOWd2qVzKIail3EFjexJBsFuOfXbfVu5-VQxIRrM,707
+sigal/video.py,sha256=6jfPziFotWEOpqgiulD81QCP3OssDtXojgvFnjSLCfI,9721
+sigal/writer.py,sha256=rATxxlB_89TROARgv3E684ZPm0NiJb5RJdEN_roRGfk,6562
 sigal/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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/feeds.py,sha256=XqyXZlVKZeQY4XpmUjjcauZ-4pskZ032BQUbZy8kinE,2847
+sigal/plugins/media_page.py,sha256=fR69jqGH-gR9ZXBH0JXKunrE-TxOvQ-TTD3w9j-EPJI,3201
 sigal/plugins/nomedia.py,sha256=ggZdkvRfFHwgv5u2-okWXdSHVq2oqQCRdtVIhj88wFM,4961
-sigal/plugins/nonmedia_files.py,sha256=S7VCEvgSrKBnCJpJOf6Vzakv04UCZjkrJUyeo3EoRiI,5024
+sigal/plugins/nonmedia_files.py,sha256=im4B_-GA23AQDmTh0kqQcMcac8-3grOOx1VsdFF_AQk,5488
 sigal/plugins/titleregexp.py,sha256=JbiPnlOQ6xB8M5cABuoCCMmWtxe6AvKh9nmcvZmEoH0,3737
 sigal/plugins/watermark.py,sha256=EstbcrAwCtV9Iy1V9odUFK6qmUKL4wNVo_1QM5ONwdA,3739
 sigal/plugins/zip_gallery.py,sha256=2BOAqXiMoWNrgW4LvGRwyIpH-GeGCUFXvGiruPDMR9Y,4651
@@ -41,7 +41,7 @@ sigal/themes/colorbox/static/js/jquery.colorbox-min.js,sha256=QbxNT-iBOdbuiav8sq
 sigal/themes/colorbox/static/js/jquery.colorbox.js,sha256=WYuzmp4s4GsP0fs-5V6iHJVa-ZbXywhZgnHyaJ95vSU,29168
 sigal/themes/colorbox/static/js/jquery.touchSwipe.js,sha256=LV72kccF1eiTVmLaVJ4__wZkLluKeBUrdyOiy4PvBMs,78338
 sigal/themes/colorbox/static/js/jquery.touchSwipe.min.js,sha256=kWfLN-0hQF75VWZGuDeJogmcFTmPXOqGdHDfHoF1Lhc,20430
-sigal/themes/colorbox/templates/album.html,sha256=nwUVMxhSN2Iq0K63TBjgvxqKqj-XNz9iMpCY-xsI7QE,2943
+sigal/themes/colorbox/templates/album.html,sha256=VA_WZom21gY2cvMrhI5zyczOmF1X1I6nnY7MOsxNFow,2763
 sigal/themes/colorbox/templates/album_list.html,sha256=giJFHT8vqMbNjT8wN2H9v9T2urMgjJq1RMJjB7tZcrw,817
 sigal/themes/colorbox/templates/base.html,sha256=x2W0zxu3-8F40PcYmZQICaoUAFmsBTvENQ_B7WH-7Vw,1874
 sigal/themes/colorbox/templates/media.html,sha256=PMb4TgjwQnHgrfiR37kYvN-S4gvlMVEs9lekafZYXI4,888
@@ -113,7 +113,7 @@ 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=Mx-HqEg9e_mfE06HbNpBEh5FFjFhwmfyoVzxKuEH70w,2580
+sigal/themes/galleria/templates/album_items.html,sha256=vb1RIEjnhXkvX03_f0mvT1A2WqhA4l0ieF0Z7R9GpQ8,2583
 sigal/themes/galleria/templates/album_list.html,sha256=I3GkHil8wNa0K70kbS0Qnns5iGlvaZqwwtYLNKPZIwo,749
 sigal/themes/galleria/templates/base.html,sha256=FE7kBmWSR0wCQJBnHUYJ3ONGLA1Auo00jMYXMUVTxvE,1462
 sigal/themes/photoswipe/static/photoswipe-dynamic-caption-plugin.esm.js,sha256=F6istdJw3AAK8N1lZ8IkfMO3m7DhjDGomHzdof2Vlrk,12651
@@ -129,13 +129,14 @@ sigal/themes/photoswipe/static/photoswipe.css,sha256=u16VaBKoE-G9W-XXZBzHjQXX59P
 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.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/themes/photoswipe/static/styles.css,sha256=wI0teLiciN0PEY3F1B1CrRPh5kxjx9QI0k5Bfxz8uu8,4244
+sigal/themes/photoswipe/templates/album.html,sha256=RSEDvpC_a70a6kGdSBzm3RzekhVd4W_cZdQFQ8ssia8,191
+sigal/themes/photoswipe/templates/album_items.html,sha256=9N3pq6-7j0lS7QZ80XMY3Vq4QIuXZhA44yiKuSYf5cs,1147
+sigal/themes/photoswipe/templates/album_list.html,sha256=DKpY331AETSIGhmTpzLla__l1OGEnkrVitg0Y4RaQOw,480
+sigal/themes/photoswipe/templates/base.html,sha256=Q7IPBXAANmClRpcDUFSQ-dSnLVNVMVG9uRr-JCwLsmk,3142
+sigal-2.6.dist-info/licenses/LICENSE,sha256=eFdFqW_W6LfS1bMybEIUNqQ5pUybPVE9WT-Zdk_Acow,1086
+sigal-2.6.dist-info/METADATA,sha256=aR_XRshXssSDkd9juMi04P9j93joUR-kVitbBCJ9Nmo,3311
+sigal-2.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+sigal-2.6.dist-info/entry_points.txt,sha256=9MBYGKDTQgjtKk7ebYjjdtXGI50AAaJ8q1TG9HsE2QM,46
+sigal-2.6.dist-info/top_level.txt,sha256=z6e1_OpCyg5rzqDmiAat3ytylvaz0K5F7VDdrbF8fQc,6
+sigal-2.6.dist-info/RECORD,,

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

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

{sigal-2.5.dist-info → sigal-2.6.dist-info/licenses}/LICENSE

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2009-2023 - Simon Conseil
+Copyright (c) 2009-2026 - 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