sigal 2.4__tar.gz → 2.5__tar.gz

sigal-2.5/.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: ".github/workflows" # Location of package manifests
+    schedule:
+      interval: "monthly"
+    groups:
+      actions:
+        patterns:
+          - "*"

{sigal-2.4 → sigal-2.5}/.github/workflows/publish.yml

@@ -10,15 +10,18 @@ jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
     runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
     if: ((github.event_name == 'push' && startsWith(github.ref, 'refs/tags')) || contains(github.event.pull_request.labels.*.name, 'Build wheels'))
 
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v5
       with:
-        python-version: 3.8
+        python-version: "3.13"
 
     - name: Install python-build and twine
       run: python -m pip install build twine
@@ -34,7 +37,4 @@ jobs:
 
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_password }}
+      uses: pypa/gh-action-pypi-publish@release/v1

{sigal-2.4 → sigal-2.5}/.github/workflows/python-tests.yml

@@ -16,14 +16,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.9, "3.10", "3.11", "3.12", "3.13"]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install FFmpeg
@@ -38,6 +38,7 @@ jobs:
     - name: Convert coverage
       run: python -m coverage xml
     - name: Upload coverage to Codecov
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v5
       with:
         fail_ci_if_error: true
+        token: ${{ secrets.CODECOV_TOKEN }}

{sigal-2.4 → sigal-2.5}/.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v5.0.0
   hooks:
     - id: check-added-large-files
     - id: check-merge-conflict
@@ -11,13 +11,9 @@ repos:
     - id: trailing-whitespace
       exclude: ".*(galleria|photoswipe|jquery|leaflet).*$"
 
-- repo: https://github.com/psf/black
-  rev: 23.9.1
-  hooks:
-    - id: black
-
-- repo: https://github.com/charliermarsh/ruff-pre-commit
-  rev: v0.0.291
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.9.7
   hooks:
     - id: ruff
       args: [ --fix, --show-fixes, --exit-non-zero-on-fix ]
+    - id: ruff-format

sigal-2.5/.readthedocs.yml

@@ -0,0 +1,20 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+
+sphinx:
+  configuration: docs/conf.py
+  fail_on_warning: true
+
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
+
+# Don't build any extra formats
+formats: []

{sigal-2.4 → sigal-2.5}/AUTHORS

@@ -5,6 +5,7 @@ alphabetical order):
 - Abdul Qabiz
 - Alexandre Chataignon (@xouillet)
 - Alexey Bazhin
+- amesgen
 - Andreas Sieferlinger
 - Andriy Dzedolik (@IrvinDitz)
 - Antoine Beaupré
@@ -15,7 +16,8 @@ alphabetical order):
 - Cédric Bosdonnat
 - Christophe-Marie Duquesne
 - Craig Gallek
-- @datro
+- datro
+- David Runge
 - David Schultz
 - David Siroky
 - Edward Betts
@@ -36,12 +38,16 @@ alphabetical order):
 - Keith Feldman
 - Keith Johnson
 - Kevin Murray
+- ksfeldman
+- Lixeiden
 - Lucas Cimon
 - Lukas Vacek
-- Luke Cyca (@lukecyca)
+- Luke Cyca
+- Markus Blöchl
 - Mate Lakat
 - Mathieu Leplatre (@leplatrem)
 - Matthias Vogelgesang
+- max (maauer)
 - Miroslav Pavleski
 - Nicolas Arnaud-Cormos
 - Nikolai Prokoschenko
@@ -58,6 +64,7 @@ alphabetical order):
 - @t-animal
 - @thomasdn
 - Thomas Misilo
+- Tilman Adler
 - Tim AtLee
 - Tim Davies
 - @tired-engineer

{sigal-2.4 → sigal-2.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: sigal
-Version: 2.4
+Version: 2.5
 Summary: Simple static gallery generator
 Author-email: Simon Conseil <contact@saimon.org>
 License: MIT License
@@ -12,14 +12,10 @@ 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: Programming Language :: Python :: 3.11
 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
@@ -30,17 +26,17 @@ 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"
+Requires-Dist: pillow-heif; extra == "all"
 Provides-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: alabaster; 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 requires Python 3.8+.
+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
 -------------
@@ -96,5 +92,4 @@ Javascript libraries:
 .. _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.4 → sigal-2.5}/README.rst

@@ -23,14 +23,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 requires Python 3.8+.
+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
 -------------
@@ -51,5 +51,4 @@ Javascript libraries:
 .. _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.4 → sigal-2.5}/docs/album_information.rst

@@ -22,8 +22,8 @@ gallery:
   represent the gallery.
 - *Author*: the author of the gallery, if present it is used instead of the
   author setting.
-- *Sort*: the sort order for this album. If prefixed with a '-' it will be in
-  reversed order.
+- *Sort*: the sort order for the sub-albums of this album. If prefixed with
+  a '-' it will be in reversed order. Not supported to sort medias.
 
 Any additional meta-data is available in the templates. For instance::
 

{sigal-2.4 → sigal-2.5}/docs/changelog.rst

@@ -2,6 +2,30 @@
  Changelog
 ===========
 
+Version 2.5
+~~~~~~~~~~~
+
+Released on 2025-02-25.
+
+Sigal now requires Python 3.9+.
+
+- Remove s3 plugin since it relied on boto which is no longer maintained. Help
+  is welcome to update the plugin with the new boto3 library. [:issue:`513`]
+- Cache input size to make updating faster [:issue:`506`].
+- Allow sorting albums with negative numbers [:issue:`507`].
+- Write the static files only once [:issue:`510`].
+- Remove subdirectories for the ones skipped with ``ignore_dirs``
+  [:issue:`515`].
+- New cli flag ``sigal serve --browser`` to open in default browser
+  [:issue:`516`].
+- Add support for ``.heic`` files (requires the optional pillow-heif package)
+  [:issue:`519`].
+- Add autoplay setting for galleria [:issue:`520`].
+- Show HTML in media description (with galleria) [:issue:`521`].
+- New ``display_timestamp`` setting to show the generation timestamp
+  [:issue:`524`].
+- Update photoswipe to v5.4.4 [:issue:`528`].
+
 Version 2.4
 ~~~~~~~~~~~
 

sigal-2.5/docs/conf.py

@@ -0,0 +1,100 @@
+import os
+
+from sigal import __version__
+
+# -- General configuration ----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+# needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ["sphinx.ext.autodoc", "sphinx.ext.extlinks"]
+
+extlinks = {"issue": ("https://github.com/saimn/sigal/issues/%s", "#%s")}
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ["_templates"]
+
+# The suffix of source filenames.
+source_suffix = ".rst"
+
+# The encoding of source files.
+# source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = "index"
+
+# General information about the project.
+project = "Sigal"
+copyright = "2012-2023, Simon Conseil"
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+release = __version__
+version = __version__
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+# language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+# today = ''
+# Else, today_fmt is used as the format for a strftime call.
+# today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ["_build"]
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+# add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+# add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+# show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = "sphinx"
+pygments_dark_style = "monokai"
+
+# A list of ignored prefixes for module index sorting.
+# modindex_common_prefix = []
+
+
+# -- Options for HTML output --------------------------------------------------
+
+# Define the canonical URL if you are using a custom domain on Read the Docs
+html_baseurl = os.environ.get("READTHEDOCS_CANONICAL_URL", "")
+
+# Tell Jinja2 templates the build is running on Read the Docs
+html_context = {"READTHEDOCS": os.environ.get("READTHEDOCS", "") == "True"}
+
+html_theme = "furo"
+
+html_theme_options = {
+    "source_repository": "https://github.com/saimn/sigal/",
+    "source_branch": "main",
+    "source_directory": "docs/",
+    "footer_icons": [
+        {
+            "name": "GitHub",
+            "url": "https://github.com/saimn/sigal",
+            "html": """
+                <svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 16 16">
+                    <path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path>
+                </svg>
+            """,  # noqa: E501
+            "class": "",
+        },
+    ],
+}
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = "Sigaldoc"

{sigal-2.4 → sigal-2.5}/docs/faq.rst

@@ -2,8 +2,6 @@
  Frequently Asked Questions (FAQ)
 ==================================
 
-.. contents::
-
 How do I protect the gallery with a password?
 ---------------------------------------------
 

{sigal-2.4 → sigal-2.5}/docs/installation.rst

@@ -25,6 +25,7 @@ The mandatory dependencies are:
 - Blinker
 - Click
 - Jinja2
+- natsort
 - Pilkit
 - Pillow
 - Python Markdown
@@ -33,8 +34,9 @@ There are also a number of optional dependencies for the :doc:`plugins`,
 installable with the ``[all]`` marker:
 
 - Brotli, zopfli (compress assets plugin)
-- Boto (upload to S3 plugin)
 - feedgenerator (feeds plugin)
+- cryptography (encrypt plugin)
+- pillow-heif (HEIF/HEIC support)
 
 Packages
 ~~~~~~~~

{sigal-2.4 → sigal-2.5}/docs/license.rst

@@ -52,3 +52,6 @@ tests:
   (https://github.com/saimn/sigal/pull/233#issuecomment-275430083)
 - ``example video.ogv`` : https://commons.wikimedia.org/wiki/File:Examplevideo.ogv
   (Public domain)
+- ``outdoor.heic``: From @ususdei,
+  https://github.com/saimn/sigal/pull/519#issuecomment-2543310727
+  (Public domain)

{sigal-2.4 → sigal-2.5}/docs/plugins.rst

@@ -2,8 +2,6 @@
  Plugins
 =========
 
-.. contents::
-
 How to use plugins
 ------------------
 
@@ -131,10 +129,10 @@ Non-media Files plugin
 
 .. automodule:: sigal.plugins.nonmedia_files
 
-Upload to S3 plugin
-===================
+Titleregexp plugin
+==================
 
-.. automodule:: sigal.plugins.upload_s3
+.. automodule:: sigal.plugins.titleregexp
 
 Watermark plugin
 ================
@@ -145,8 +143,3 @@ ZIP Gallery plugin
 ==================
 
 .. automodule:: sigal.plugins.zip_gallery
-
-Titleregexp plugin
-==================
-
-.. automodule:: sigal.plugins.titleregexp

{sigal-2.4 → sigal-2.5}/docs/themes.rst

@@ -85,7 +85,7 @@ This script will then be imported and all defined functions will be available as
 with the same names in your templates.
 
 Documentation of sigal's main classes
--------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. autoclass:: sigal.gallery.Album
    :members:

{sigal-2.4 → sigal-2.5}/pyproject.toml

@@ -15,15 +15,11 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
     "Topic :: Internet :: WWW/HTTP",
     "Topic :: Multimedia :: Graphics :: Viewers",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 dependencies = [
     "blinker",
     "click",
@@ -36,9 +32,9 @@ dependencies = [
 dynamic = ["version"]
 
 [project.optional-dependencies]
-all = ["boto", "brotli", "feedgenerator", "zopfli", "cryptography"]
+all = ["brotli", "feedgenerator", "zopfli", "cryptography", "pillow-heif"]
 tests = ["pytest", "pytest-cov"]
-docs = ["Sphinx>=4.1.0", "alabaster", "cryptography"]
+docs = ["Sphinx>=4.1.0", "furo", "cryptography"]
 
 [project.scripts]
 sigal = "sigal.__main__:main"
@@ -55,15 +51,16 @@ license-files = ["LICENSE"]
 where = ["src"]
 namespaces = true
 
+[tool.setuptools.package-data]
+sigal = [
+    "plugins/encrypt/static/*",
+    "themes/**",
+]
+
 [tool.setuptools_scm]
 write_to = "src/sigal/version.py"
 
-[tool.black]
-line-length = 88
-target-version = ['py38']
-
-[tool.ruff]
-target-version = "py38"
+[tool.ruff.lint]
 select = [
   "E", "F", "W", # flake8
   "I",           # isort
@@ -74,7 +71,7 @@ unfixable = [
   "F841", # Removes unused variables
 ]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["sigal"]
 
 [tool.coverage.run]

{sigal-2.4 → sigal-2.5}/src/sigal/__main__.py

@@ -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
@@ -253,6 +255,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()

{sigal-2.4 → sigal-2.5}/src/sigal/gallery.py

@@ -45,7 +45,13 @@ 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 .image import (
+    EXIF_EXTENSIONS,
+    get_exif_tags,
+    get_image_metadata,
+    get_size,
+    process_image,
+)
 from .settings import Status, get_thumb
 from .utils import (
     Devnull,
@@ -264,7 +270,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 +295,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 +492,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 +522,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 +537,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"])
@@ -734,6 +743,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 +781,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 +789,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,12 +905,13 @@ 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,