sigal 2.4__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
@@ -25,6 +25,7 @@ import pathlib
 import socketserver
 import sys
 import time
+import webbrowser
 from http import server
 
 import click
@@ -227,7 +228,8 @@ def build(
     show_default=True,
     help="Configuration file",
 )
-def serve(destination, port, config):
+@option("-b", "--browser", is_flag=True, help="Open in your default browser")
+def serve(destination, port, config, browser):
     """Run a simple web server."""
     if os.path.exists(destination):
         pass
@@ -235,15 +237,17 @@ def serve(destination, port, config):
         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)
 
@@ -253,6 +257,9 @@ def serve(destination, port, config):
     httpd = socketserver.TCPServer(("", port), Handler, False)
     print(f" * Running on http://127.0.0.1:{port}/")
 
+    if browser:
+        webbrowser.open(f"http://127.0.0.1:{port}/")
+
     try:
         httpd.allow_reuse_address = True
         httpd.server_bind()
@@ -279,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):
@@ -290,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.
@@ -45,8 +45,14 @@ from natsort import natsort_keygen, ns
 from PIL import Image as PILImage
 
 from . import image, signals, video
-from .image import get_exif_tags, get_image_metadata, get_size, process_image
-from .settings import Status, get_thumb
+from .image import (
+    EXIF_EXTENSIONS,
+    get_exif_tags,
+    get_image_metadata,
+    get_size,
+    process_image,
+)
+from .settings import IMG_EXTENSIONS, Status, get_thumb
 from .utils import (
     Devnull,
     check_or_create_dir,
@@ -240,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):
@@ -264,7 +265,7 @@ class Image(Media):
         datetime_format = self.settings["datetime_format"]
         return (
             get_exif_tags(self.raw_exif, datetime_format=datetime_format)
-            if self.raw_exif and self.src_ext in (".jpg", ".jpeg")
+            if self.raw_exif and self.src_ext in EXIF_EXTENSIONS
             else None
         )
 
@@ -289,7 +290,7 @@ class Image(Media):
     @cached_property
     def raw_exif(self):
         """If not `None`, contains the raw EXIF tags."""
-        if self.src_ext in (".jpg", ".jpeg"):
+        if self.src_ext in EXIF_EXTENSIONS:
             return self.file_metadata["exif"]
 
     @cached_property
@@ -486,6 +487,7 @@ class Album:
             reverse = self.settings["albums_sort_reverse"]
 
             if "sort" in self.meta:
+                # override default sort order from settings
                 albums_sort_attr = self.meta["sort"][0]
                 if albums_sort_attr[0] == "-":
                     albums_sort_attr = albums_sort_attr[1:]
@@ -515,7 +517,7 @@ class Album:
                         continue
                 return ""
 
-            key = natsort_keygen(key=sort_key, alg=ns.LOCALE)
+            key = natsort_keygen(key=sort_key, alg=ns.SIGNED | ns.LOCALE)
             self.subdirs.sort(key=key, reverse=reverse)
 
         signals.albums_sorted.send(self)
@@ -530,11 +532,13 @@ class Album:
             elif medias_sort_attr.startswith("meta."):
                 meta_key = medias_sort_attr.split(".", 1)[1]
                 key = natsort_keygen(
-                    key=lambda s: s.meta.get(meta_key, [""])[0], alg=ns.LOCALE
+                    key=lambda s: s.meta.get(meta_key, [""])[0],
+                    alg=ns.SIGNED | ns.LOCALE,
                 )
             else:
                 key = natsort_keygen(
-                    key=lambda s: getattr(s, medias_sort_attr), alg=ns.LOCALE
+                    key=lambda s: getattr(s, medias_sort_attr),
+                    alg=ns.SIGNED | ns.LOCALE,
                 )
 
             self.medias.sort(key=key, reverse=self.settings["medias_sort_reverse"])
@@ -584,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)
 
@@ -734,6 +738,11 @@ class Gallery:
                 fnmatch.fnmatch(relpath, ignore) for ignore in ignore_dirs
             ):
                 self.logger.info("Ignoring %s", relpath)
+                # Remove sub-directories
+                for d in dirs[:]:
+                    path = join(relpath, d) if relpath != "." else d
+                    if path in albums.keys():
+                        del albums[path]
                 continue
 
             # Remove files that match the ignore_files settings
@@ -767,7 +776,7 @@ class Gallery:
 
         with progressbar(
             albums.values(),
-            label="%16s" % "Sorting albums",
+            label="{:>16s}".format("Sorting albums"),
             file=self.progressbar_target,
         ) as progress_albums:
             for album in progress_albums:
@@ -775,7 +784,7 @@ class Gallery:
 
         with progressbar(
             albums.values(),
-            label="%16s" % "Sorting media",
+            label="{:>16s}".format("Sorting medias"),
             file=self.progressbar_target,
         ) as progress_albums:
             for album in progress_albums:
@@ -891,26 +900,19 @@ class Gallery:
 
         if self.settings["write_html"]:
             album_writer = AlbumPageWriter(self.settings, index_title=self.title)
+            album_writer.copy_theme_files()
             album_list_writer = AlbumListPageWriter(
                 self.settings, index_title=self.title
             )
             with progressbar(
                 self.albums.values(),
-                label="%16s" % "Writing files",
+                label="{:>16s}".format("Writing files"),
                 item_show_func=log_func,
                 show_eta=False,
                 file=self.progressbar_target,
             ) 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
 
@@ -44,11 +44,21 @@ from PIL.TiffImagePlugin import IFDRational
 from pilkit.processors import Transpose
 from pilkit.utils import save_image
 
+try:
+    from pillow_heif import HeifImagePlugin  # noqa: F401
+
+    HAS_HEIF = True
+except ImportError:
+    HAS_HEIF = False
+
 from . import signals, utils
+from .settings import Status
 
 # Force loading of truncated files
 ImageFile.LOAD_TRUNCATED_IMAGES = True
 
+EXIF_EXTENSIONS = (".jpg", ".jpeg", ".heic")
+
 
 def _has_exif_tags(img):
     return hasattr(img, "info") and "exif" in img.info
@@ -66,8 +76,7 @@ def _read_image(file_path):
 
     for w in caught_warnings:
         logger.warning(
-            f"PILImage reported a warning for file {file_path}\n"
-            f"{w.category}: {w.message}"
+            f"Pillow reported a warning for file {file_path}\n{w.category}: {w.message}"
         )
     return im
 
@@ -90,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(
@@ -140,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)
 
 
@@ -153,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
@@ -166,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)
 
 
@@ -180,6 +191,11 @@ def process_image(media):
         options = media.settings["jpg_options"]
     elif media.src_ext == ".png":
         options = {"optimize": True}
+    elif media.src_ext == ".heic" and not HAS_HEIF:
+        logger.warning(
+            f"cannot open {media.src_path}, pillow-heif is needed to open .heic files"
+        )
+        return Status.FAILURE
     else:
         options = {}
 
@@ -220,7 +236,10 @@ def get_exif_data(filename):
 
     try:
         with warnings.catch_warnings(record=True) as caught_warnings:
-            exif = img._getexif() or {}
+            exif = {}
+            exifdata = img.getexif()
+            if exifdata:
+                exif = exifdata._get_merged_dict()
     except ZeroDivisionError:
         logger.warning("Failed to read EXIF data.")
         return None
@@ -290,7 +309,7 @@ def get_image_metadata(filename):
         logger.error("Could not open image %s metadata: %s", filename, e)
     else:
         try:
-            if os.path.splitext(filename)[1].lower() in (".jpg", ".jpeg"):
+            if os.path.splitext(filename)[1].lower() in EXIF_EXTENSIONS:
                 exif = get_exif_data(img)
         except Exception as e:
             logger.warning("Could not read EXIF data from %s: %s", filename, e)

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/compress_assets.py

@@ -106,9 +106,10 @@ class GZipCompressor(BaseCompressor):
     suffix = "gz"
 
     def do_compress(self, filename, compressed_filename):
-        with open(filename, "rb") as f_in, gzip.open(
-            compressed_filename, "wb"
-        ) as f_out:
+        with (
+            open(filename, "rb") as f_in,
+            gzip.open(compressed_filename, "wb") as f_out,
+        ):
             shutil.copyfileobj(f_in, f_out)
 
 

sigal/plugins/encrypt/encrypt.py

@@ -200,7 +200,7 @@ def encrypt_files(settings, config, cache, albums, progressbar_target):
     medias = list(chain.from_iterable(albums.values()))
     with progressbar(
         medias,
-        label="%16s" % "Encrypting files",
+        label="{:>16s}".format("Encrypting files"),
         file=progressbar_target,
         show_eta=True,
     ) as medias:

sigal/plugins/encrypt/endec.py

@@ -66,7 +66,7 @@ def dispatchargs(decorated):
 
 def encrypt(key: bytes, infile: BinaryIO, outfile: BinaryIO, tag: bytes):
     if len(key) != 128 / 8:
-        raise ValueError("Unsupported key length: %d" % len(key))
+        raise ValueError(f"Unsupported key length: {len(key)}")
     aesgcm = AESGCM(key)
     iv = os.urandom(12)
     plaintext = infile
@@ -80,7 +80,7 @@ def encrypt(key: bytes, infile: BinaryIO, outfile: BinaryIO, tag: bytes):
 
 def decrypt(key: bytes, infile: BinaryIO, outfile: BinaryIO, tag: bytes):
     if len(key) != 128 / 8:
-        raise ValueError("Unsupported key length: %d" % len(key))
+        raise ValueError(f"Unsupported key length: {len(key)}")
     aesgcm = AESGCM(key)
     ciphertext = infile
     plaintext = outfile

sigal/plugins/extended_caching.py

@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-""" Decreases the time needed to build large galleries (e.g.: 25k images in
+"""Decreases the time needed to build large galleries (e.g.: 25k images in
 2.5s instead of 30s)
 
 This plugin allows extended caching, which is useful for large galleries. Once
@@ -78,6 +78,8 @@ def load_metadata(album):
                 media.file_metadata = data["file_metadata"]
             if "exif" in data:
                 media.exif = data["exif"]
+            if "input_size" in data:
+                media.input_size = data["input_size"]
 
             try:
                 mod_date = int(get_mod_date(media.markdown_metadata_filepath))
@@ -134,6 +136,8 @@ def save_cache(gallery):
                 data["file_metadata"] = media.file_metadata
                 if hasattr(media, "exif"):
                     data["exif"] = media.exif
+                if hasattr(media, "input_size"):
+                    data["input_size"] = media.input_size
 
             try:
                 meta_mod_date = int(get_mod_date(media.markdown_metadata_filepath))

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/nomedia.py

@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-""" This plugin offers more fine-grained control over exluded images and
+"""This plugin offers more fine-grained control over exluded images and
 folders, similarly to how it's handled on Android.
 
 To ignore a folder or image put a ``.nomedia`` file next to it in its parent

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/plugins/titleregexp.py

@@ -18,7 +18,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-""" This plugin modifies titles of galleries by using regular-expressions and
+"""This plugin modifies titles of galleries by using regular-expressions and
 simple string or character replacements. It is acting in two phases: First, all
 regular-expression-based modifications are carried out, second, string/character
 replacements are done.
@@ -74,7 +74,7 @@ def titleregexp(album):
 
     for r in cfg.get("regexp"):
         album.title, n = re.subn(
-            r.get("search"), r.get("replace"), album.title, r.get("count", 0)
+            r.get("search"), r.get("replace"), album.title, count=r.get("count", 0)
         )
         total += n