now gzips rotated logs

.github/workflows/build-release.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Install Dependencies
         run: pip install -r requirements.txt
       - name: Build Package
-        run: pyinstaller builder.py modules/*.py -n StaticGalleryBuilder -F --add-data files:files --add-data templates:templates --add-data .version:.
+        run: pyinstaller builder.py modules/*.py -n StaticGalleryBuilder-$(cat .version)-linux -F --add-data files:files --add-data templates:templates --add-data .version:.
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
@@ -20,4 +20,4 @@ jobs:
           make_latest: true
           generate_release_notes: true
           files: |
-            dist/StaticGalleryBuilder
+            dist/StaticGalleryBuilder*

.version

@@ -1 +1 @@
-2.3.1
+2.3.4

README.md

@@ -26,13 +26,14 @@ Python script to generate static HTML files for website galleries.
 - `Pillow` library
 - `rich_argparse` library
 - `cairosvg` library (for SVG to PNG icon conversion)
+- `python-json-logger` library (for logging)
 
 ## Installation
 
 Install the required libraries using pip:
 
 ```sh
-pip install numpy tqdm Jinja2 Pillow rich-argparse cairosvg
+pip install numpy tqdm Jinja2 Pillow rich-argparse cairosvg python-json-logger
 ```
 
 ## Usage

StaticGalleryBuilder.code-workspace

@@ -157,6 +157,14 @@
                 "label": "Delete Lockfile",
                 "problemMatcher": [],
                 "type": "shell",
+                "presentation": {
+                    "echo": false,
+                    "reveal": "never",
+                    "focus": false,
+                    "panel": "shared",
+                    "showReuseMessage": false,
+                    "clear": true
+                }
             },
             {
                 "command": "rm -f /home/user/woek/Pictures/.lock",
@@ -164,7 +172,53 @@
                 "label": "Delete Lockfile 2",
                 "problemMatcher": [],
                 "type": "shell",
+                "presentation": {
+                    "echo": false,
+                    "reveal": "never",
+                    "focus": false,
+                    "panel": "shared",
+                    "showReuseMessage": false,
+                    "clear": true
+                }
             },
+            {
+                "command": "pyinstaller builder.py modules/*.py -n StaticGalleryBuilder-$(cat .version)-linux -F --add-data files:files --add-data templates:templates --add-data .version:.",
+                "isBackground": false,
+                "label": "Build",
+                "problemMatcher": [],
+                "type": "shell",
+                "presentation": {
+                    "echo": true,
+                    "reveal": "always",
+                    "focus": false,
+                    "panel": "shared",
+                    "showReuseMessage": false,
+                    "clear": false
+                },
+                "group": {
+                    "kind": "build",
+                    "isDefault": true
+                },
+                "dependsOn": [
+                    "Clean"
+                ]
+            },
+            {
+                "command": "rm -rf build dist",
+                "isBackground": true,
+                "label": "Clean",
+                "problemMatcher": [],
+                "type": "shell",
+                "presentation": {
+                    "echo": true,
+                    "reveal": "never",
+                    "focus": false,
+                    "panel": "shared",
+                    "showReuseMessage": false,
+                    "clear": true
+                },
+                "group": "build"
+            }
         ],
     },
 }

builder.py

@@ -34,7 +34,6 @@ RAW_EXTENSIONS = [
 ]
 IMG_EXTENSIONS = [".jpg", ".jpeg", ".png"]
 NOT_LIST = ["*/Galleries/*", "Archives"]
-LOG_FILE = os.path.join(SCRIPTDIR, "log.json")
 # fmt: on
 
 pbardict: Dict[str, tqdm] = {}
@@ -101,8 +100,8 @@ def copy_static_files(_args: Args) -> None:
         logger.info("found foldericon", extra={"foldericon": foldericon})
         break
     if "url" in foldericon:
-        shutil.copyfile(_args.theme_path, os.path.join(static_dir, "theme.css"))
         logger.info("foldericon in theme file, using it")
+        shutil.copyfile(_args.theme_path, os.path.join(static_dir, "theme.css"))
         return
     with open(os.path.join(SCRIPTDIR, foldericon), "r", encoding="utf-8") as f:
         logger.info("Reading foldericon svg")
@@ -110,10 +109,8 @@ def copy_static_files(_args: Args) -> None:
     if "svg.j2" in foldericon:
         logger.info("foldericon in theme file is a jinja2 template")
         colorscheme = extract_colorscheme(_args.theme_path)
-        svg = svg.replace("{{ color1 }}", colorscheme["color1"])
+        for color_key, color_value in colorscheme.items():
-        svg = svg.replace("{{ color2 }}", colorscheme["color2"])
+            svg = svg.replace(f"{{{{ {color_key} }}}}", color_value)
-        svg = svg.replace("{{ color3 }}", colorscheme["color3"])
-        svg = svg.replace("{{ color4 }}", colorscheme["color4"])
         logger.info("replaced colors in svg")
     svg = urllib.parse.quote(svg)
     with open(os.path.join(static_dir, "theme.css"), "x", encoding="utf-8") as f:

generate_previews.py

@@ -4,21 +4,18 @@ import sys
 import time
 import shutil
 import base64
-import logging
 import fileinput
 import urllib.parse
 import urllib.request
 from typing import List
 from selenium import webdriver
+from selenium.webdriver.common.by import By
 from selenium.webdriver.chrome.service import Service
 from selenium.webdriver.chrome.options import Options
-from selenium.webdriver.common.by import By
 
+from modules.logger import consolelogger as logger
 from modules.css_color import extract_colorscheme
 
-# Set up logging
-logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
-
 
 def replace_all(file, search_exp, replace_exp):
     for line in fileinput.input(file, inplace=1):
@@ -36,11 +33,14 @@ def take_screenshot(html_file_path: str, css_file: str, output_file: str, driver
         output_file (str): Path where the screenshot will be saved.
         driver (webdriver.Chrome): The Chrome WebDriver instance.
     """
+    logger.info("taking screenshot for %s", css_file)
     try:
         # Open the HTML file or URL
         if html_file_path.startswith(("http://", "https://")):
+            logger.info("opening URL: %s", html_file_path)
             driver.get(html_file_path)
         else:
+            logger.info("opening file: %s", html_file_path)
             driver.get(f"file://{os.path.abspath(html_file_path)}")
 
         # Remove current theme.css
@@ -52,9 +52,11 @@ def take_screenshot(html_file_path: str, css_file: str, output_file: str, driver
                 }
             });
         """
+        logger.info("removing current theme.css")
         driver.execute_script(remove_css_script)
 
         with open(css_file, "r", encoding="utf-8") as f:
+            logger.info("reading CSS file: %s", css_file)
             css_content = f.read()
 
         # Extract folder icon content
@@ -65,20 +67,26 @@ def take_screenshot(html_file_path: str, css_file: str, output_file: str, driver
         folder_icon_content = re.sub(r"/\*.*\*/", "", folder_icon_content)
 
         for match in re.finditer(r"content: (.*);", folder_icon_content):
+            logger.info("found foldericon", extra={"foldericon": folder_icon_content})
             folder_icon_content = match.group(1).replace('"', "")
             break
 
         if "url" not in folder_icon_content:
+            logger.info("Reading foldericon svg")
             with open(folder_icon_content, "r", encoding="utf-8") as f:
                 svg = f.read()
             if "svg.j2" in folder_icon_content:
+                logger.info("foldericon in theme file is a jinja2 template")
                 colorscheme = extract_colorscheme(css_file)
                 for color_key, color_value in colorscheme.items():
                     svg = svg.replace(f"{{{{ {color_key} }}}}", color_value)
+                logger.info("replaced colors in svg")
             svg = urllib.parse.quote(svg)
+
             css_content = f'{css_head}\n.foldericon {{\n  content: url("data:image/svg+xml,{svg}");\n}}\n{css_tail}'
 
         # Encode CSS content as Base64
+        logger.info("encoding css content as base64")
         encoded_css = base64.b64encode(css_content.encode("utf-8")).decode("utf-8")
 
         # Inject CSS into HTML using JavaScript
@@ -87,24 +95,28 @@ def take_screenshot(html_file_path: str, css_file: str, output_file: str, driver
             style.innerHTML = atob('{encoded_css}');
             document.head.appendChild(style);
         """
+        logger.info("injecting CSS into HTML")
         driver.execute_script(apply_css_script)
 
         # Wait for a while to ensure CSS is applied
-        time.sleep(2)
+        # time.sleep(1)
 
         # Move mouse to info
+        logger.info("moving mouse to info")
         hoverable = driver.find_element(By.CLASS_NAME, "tooltip")
         webdriver.ActionChains(driver).move_to_element(hoverable).perform()
 
         # Capture screenshot
+        logger.info("taking screenshot")
         driver.save_screenshot(output_file)
-        logging.info("Screenshot saved to %s", output_file)
+        logger.info("screenshot saved to %s", output_file)
 
     except Exception as e:
-        logging.error("Failed to take screenshot for %s: %s", css_file, e)
+        logger.error("failed to take screenshot for %s: %s", css_file, e)
 
 
 def create_preview(html_file_path: str, css_file: str, previews_folder: str):
+    logger.info("creating preview for %s", css_file)
     out_file = os.path.basename(css_file).removesuffix(".css") + ".html"
     urllib.request.urlretrieve(html_file_path, os.path.join(previews_folder, out_file))
     basename = os.path.basename(css_file)
@@ -127,21 +139,25 @@ def create_preview(html_file_path: str, css_file: str, previews_folder: str):
         foldericon = foldericon.replace('"', "")
         break
     if "url" in foldericon:
+        logger.info("foldericon in theme file, using it")
         shutil.copyfile(css_file, os.path.join(path, "previews", basename))
-    else:
+        return
-        with open(os.path.join(path, foldericon.removeprefix("themes/")), "r", encoding="utf-8") as f:
+    with open(os.path.join(path, foldericon.removeprefix("themes/")), "r", encoding="utf-8") as f:
-            svg = f.read()
+        logger.info("Reading foldericon svg")
-        if "svg.j2" in foldericon:
+        svg = f.read()
-            colorscheme = extract_colorscheme(css_file)
+    if "svg.j2" in foldericon:
-            svg = svg.replace("{{ color1 }}", colorscheme["color1"])
+        logger.info("foldericon in theme file is a jinja2 template")
-            svg = svg.replace("{{ color2 }}", colorscheme["color2"])
+        colorscheme = extract_colorscheme(css_file)
-            svg = svg.replace("{{ color3 }}", colorscheme["color3"])
+        for color_key, color_value in colorscheme.items():
-            svg = svg.replace("{{ color4 }}", colorscheme["color4"])
+            svg = svg.replace(f"{{{{ {color_key} }}}}", color_value)
-        svg = urllib.parse.quote(svg)
+        logger.info("replaced colors in svg")
-        if os.path.exists(os.path.join(path, "previews", basename)):
+    svg = urllib.parse.quote(svg)
-            os.remove(os.path.join(path, "previews", basename))
+    if os.path.exists(os.path.join(path, "previews", basename)):
-        with open(os.path.join(path, "previews", basename), "x", encoding="utf-8") as f:
+        os.remove(os.path.join(path, "previews", basename))
-            f.write(themehead + '\n.foldericon {\n  content: url("data:image/svg+xml,' + svg + '");\n}\n' + themetail)
+    with open(os.path.join(path, "previews", basename), "x", encoding="utf-8") as f:
+        logger.info("writing theme file")
+        f.write(themehead + '\n.foldericon {\n  content: url("data:image/svg+xml,' + svg + '");\n}\n' + themetail)
+    logger.info("preview created for %s", css_file)
 
 
 def write_readme(directory_path: str, themes: List[str]) -> None:
@@ -155,6 +171,7 @@ def write_readme(directory_path: str, themes: List[str]) -> None:
     readme_path = os.path.join(directory_path, "README.md")
     try:
         with open(readme_path, "r", encoding="utf-8") as f:
+            logger.info("reading README.md", extra={"file": readme_path})
             readme = f.read()
 
         readme_head = readme.split("## Previews of included themes")[0]
@@ -162,14 +179,15 @@ def write_readme(directory_path: str, themes: List[str]) -> None:
         readme_head += "".join([f"\n### {theme}\n\n![{theme}](screenshots/{theme}.png)\n" for theme in themes])
 
         with open(readme_path, "w", encoding="utf-8") as f:
+            logger.info("writing README.md", extra={"file": readme_path})
             f.write(readme_head)
 
-        logging.info("README.md updated with previews of included themes.")
+        logger.info("README.md updated with previews of included themes.")
 
     except FileNotFoundError:
-        logging.error("README.md not found in %s", directory_path)
+        logger.error("README.md not found in %s", directory_path)
     except Exception as e:
-        logging.error("Failed to write README.md: %s", e)
+        logger.error("failed to write README.md: %s", e)
 
 
 def write_index(directory_path: str, themes: List[str]) -> None:
@@ -198,7 +216,7 @@ def main(directory_path: str, html_file_path: str) -> None:
         html_file_path (str): Path to the HTML file or URL for rendering.
     """
     if not os.path.exists(directory_path):
-        logging.error('Error: Folder path "%s" does not exist.', directory_path)
+        logger.error('Error: Folder path "%s" does not exist.', directory_path)
         return
 
     # Setup Chrome options
@@ -207,8 +225,9 @@ def main(directory_path: str, html_file_path: str) -> None:
     chrome_options.add_argument("--window-size=1920,1080")  # Set window size to at least 1920x1080
 
     # Initialize Chrome WebDriver
-    chromedriver_path = "/usr/bin/chromedriver"  # Replace with your actual path
+    chromedriver_path = "/usr/bin/chromedriver"
     service = Service(chromedriver_path)
+    logger.info("Using chromedriver at %s", chromedriver_path, extra={"chrome_options": chrome_options})
     driver = webdriver.Chrome(service=service, options=chrome_options)
 
     try:
@@ -235,13 +254,16 @@ def main(directory_path: str, html_file_path: str) -> None:
         write_index(directory_path, themes)
 
     finally:
+        logger.info("closing chrome webdriver")
         driver.quit()
 
 
 if __name__ == "__main__":
     if len(sys.argv) != 3:
-        logging.error("Usage: python script_name.py directory_path html_file_path")
+        logger.error("Usage: python script_name.py directory_path html_file_path")
     else:
         dir_path = sys.argv[1]
         html_path = sys.argv[2]
+        logger.info("Starting script", extra={"directory_path": dir_path, "html_file_path": html_path})
         main(dir_path, html_path)
+        logger.info("Done!", extra={"directory_path": dir_path})

help.svg

@@ -19,118 +19,118 @@
         font-weight: 700;
     }
 
-    .terminal-3756623299-matrix {
+    .terminal-2271905219-matrix {
         font-family: Fira Code, monospace;
         font-size: 20px;
         line-height: 24.4px;
         font-variant-east-asian: full-width;
     }
 
-    .terminal-3756623299-title {
+    .terminal-2271905219-title {
         font-size: 18px;
         font-weight: bold;
         font-family: arial;
     }
 
-    .terminal-3756623299-r1 { fill: #ff8700 }
+    .terminal-2271905219-r1 { fill: #ff8700 }
-.terminal-3756623299-r2 { fill: #c5c8c6 }
+.terminal-2271905219-r2 { fill: #c5c8c6 }
-.terminal-3756623299-r3 { fill: #808080 }
+.terminal-2271905219-r3 { fill: #808080 }
-.terminal-3756623299-r4 { fill: #68a0b3 }
+.terminal-2271905219-r4 { fill: #68a0b3 }
-.terminal-3756623299-r5 { fill: #00af87 }
+.terminal-2271905219-r5 { fill: #00af87 }
     </style>
 
     <defs>
-    <clipPath id="terminal-3756623299-clip-terminal">
+    <clipPath id="terminal-2271905219-clip-terminal">
       <rect x="0" y="0" width="1463.0" height="755.4" />
     </clipPath>
-    <clipPath id="terminal-3756623299-line-0">
+    <clipPath id="terminal-2271905219-line-0">
     <rect x="0" y="1.5" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-1">
+<clipPath id="terminal-2271905219-line-1">
     <rect x="0" y="25.9" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-2">
+<clipPath id="terminal-2271905219-line-2">
     <rect x="0" y="50.3" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-3">
+<clipPath id="terminal-2271905219-line-3">
     <rect x="0" y="74.7" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-4">
+<clipPath id="terminal-2271905219-line-4">
     <rect x="0" y="99.1" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-5">
+<clipPath id="terminal-2271905219-line-5">
     <rect x="0" y="123.5" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-6">
+<clipPath id="terminal-2271905219-line-6">
     <rect x="0" y="147.9" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-7">
+<clipPath id="terminal-2271905219-line-7">
     <rect x="0" y="172.3" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-8">
+<clipPath id="terminal-2271905219-line-8">
     <rect x="0" y="196.7" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-9">
+<clipPath id="terminal-2271905219-line-9">
     <rect x="0" y="221.1" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-10">
+<clipPath id="terminal-2271905219-line-10">
     <rect x="0" y="245.5" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-11">
+<clipPath id="terminal-2271905219-line-11">
     <rect x="0" y="269.9" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-12">
+<clipPath id="terminal-2271905219-line-12">
     <rect x="0" y="294.3" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-13">
+<clipPath id="terminal-2271905219-line-13">
     <rect x="0" y="318.7" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-14">
+<clipPath id="terminal-2271905219-line-14">
     <rect x="0" y="343.1" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-15">
+<clipPath id="terminal-2271905219-line-15">
     <rect x="0" y="367.5" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-16">
+<clipPath id="terminal-2271905219-line-16">
     <rect x="0" y="391.9" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-17">
+<clipPath id="terminal-2271905219-line-17">
     <rect x="0" y="416.3" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-18">
+<clipPath id="terminal-2271905219-line-18">
     <rect x="0" y="440.7" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-19">
+<clipPath id="terminal-2271905219-line-19">
     <rect x="0" y="465.1" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-20">
+<clipPath id="terminal-2271905219-line-20">
     <rect x="0" y="489.5" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-21">
+<clipPath id="terminal-2271905219-line-21">
     <rect x="0" y="513.9" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-22">
+<clipPath id="terminal-2271905219-line-22">
     <rect x="0" y="538.3" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-23">
+<clipPath id="terminal-2271905219-line-23">
     <rect x="0" y="562.7" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-24">
+<clipPath id="terminal-2271905219-line-24">
     <rect x="0" y="587.1" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-25">
+<clipPath id="terminal-2271905219-line-25">
     <rect x="0" y="611.5" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-26">
+<clipPath id="terminal-2271905219-line-26">
     <rect x="0" y="635.9" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-27">
+<clipPath id="terminal-2271905219-line-27">
     <rect x="0" y="660.3" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-28">
+<clipPath id="terminal-2271905219-line-28">
     <rect x="0" y="684.7" width="1464" height="24.65"/>
             </clipPath>
-<clipPath id="terminal-3756623299-line-29">
+<clipPath id="terminal-2271905219-line-29">
     <rect x="0" y="709.1" width="1464" height="24.65"/>
             </clipPath>
     </defs>
@@ -142,40 +142,40 @@
             <circle cx="44" cy="0" r="7" fill="#28c840"/>
             </g>
         
-    <g transform="translate(9, 41)" clip-path="url(#terminal-3756623299-clip-terminal)">
+    <g transform="translate(9, 41)" clip-path="url(#terminal-2271905219-clip-terminal)">
     
-    <g class="terminal-3756623299-matrix">
+    <g class="terminal-2271905219-matrix">
-    <text class="terminal-3756623299-r1" x="0" y="20" textLength="73.2" clip-path="url(#terminal-3756623299-line-0)">Usage:</text><text class="terminal-3756623299-r3" x="85.4" y="20" textLength="122" clip-path="url(#terminal-3756623299-line-0)">builder.py</text><text class="terminal-3756623299-r2" x="207.4" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">&#160;[</text><text class="terminal-3756623299-r4" x="231.8" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-h</text><text class="terminal-3756623299-r2" x="256.2" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">]&#160;</text><text class="terminal-3756623299-r4" x="280.6" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-p</text><text class="terminal-3756623299-r5" x="317.2" y="20" textLength="48.8" clip-path="url(#terminal-3756623299-line-0)">ROOT</text><text class="terminal-3756623299-r4" x="378.2" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-w</text><text class="terminal-3756623299-r5" x="414.8" y="20" textLength="36.6" clip-path="url(#terminal-3756623299-line-0)">URL</text><text class="terminal-3756623299-r4" x="463.6" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-t</text><text class="terminal-3756623299-r5" x="500.2" y="20" textLength="61" clip-path="url(#terminal-3756623299-line-0)">TITLE</text><text class="terminal-3756623299-r2" x="561.2" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">&#160;[</text><text class="terminal-3756623299-r4" x="585.6" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-r</text><text class="terminal-3756623299-r2" x="610" y="20" textLength="36.6" clip-path="url(#terminal-3756623299-line-0)">]&#160;[</text><text class="terminal-3756623299-r4" x="646.6" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-n</text><text class="terminal-3756623299-r2" x="671" y="20" textLength="36.6" clip-path="url(#terminal-3756623299-line-0)">]&#160;[</text><text class="terminal-3756623299-r4" x="707.6" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-l</text><text class="terminal-3756623299-r5" x="744.2" y="20" textLength="85.4" clip-path="url(#terminal-3756623299-line-0)">LICENSE</text><text class="terminal-3756623299-r2" x="829.6" y="20" textLength="36.6" clip-path="url(#terminal-3756623299-line-0)">]&#160;[</text><text class="terminal-3756623299-r4" x="866.2" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-a</text><text class="terminal-3756623299-r5" x="902.8" y="20" textLength="73.2" clip-path="url(#terminal-3756623299-line-0)">AUTHOR</text><text class="terminal-3756623299-r2" x="976" y="20" textLength="36.6" clip-path="url(#terminal-3756623299-line-0)">]&#160;[</text><text class="terminal-3756623299-r4" x="1012.6" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-e</text><text class="terminal-3756623299-r5" x="1049.2" y="20" textLength="109.8" clip-path="url(#terminal-3756623299-line-0)">EXTENSION</text><text class="terminal-3756623299-r2" x="1159" y="20" textLength="36.6" clip-path="url(#terminal-3756623299-line-0)">]&#160;[</text><text class="terminal-3756623299-r4" x="1195.6" y="20" textLength="24.4" clip-path="url(#terminal-3756623299-line-0)">-m</text><text class="terminal-3756623299-r2" x="1220" y="20" textLength="12.2" clip-path="url(#terminal-3756623299-line-0)">]</text><text class="terminal-3756623299-r2" x="1464" y="20" textLength="12.2" clip-path="url(#terminal-3756623299-line-0)">
+    <text class="terminal-2271905219-r1" x="0" y="20" textLength="73.2" clip-path="url(#terminal-2271905219-line-0)">Usage:</text><text class="terminal-2271905219-r3" x="85.4" y="20" textLength="122" clip-path="url(#terminal-2271905219-line-0)">builder.py</text><text class="terminal-2271905219-r2" x="207.4" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">&#160;[</text><text class="terminal-2271905219-r4" x="231.8" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-h</text><text class="terminal-2271905219-r2" x="256.2" y="20" textLength="36.6" clip-path="url(#terminal-2271905219-line-0)">]&#160;[</text><text class="terminal-2271905219-r4" x="292.8" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-a</text><text class="terminal-2271905219-r5" x="329.4" y="20" textLength="73.2" clip-path="url(#terminal-2271905219-line-0)">AUTHOR</text><text class="terminal-2271905219-r2" x="402.6" y="20" textLength="36.6" clip-path="url(#terminal-2271905219-line-0)">]&#160;[</text><text class="terminal-2271905219-r4" x="439.2" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-e</text><text class="terminal-2271905219-r5" x="475.8" y="20" textLength="109.8" clip-path="url(#terminal-2271905219-line-0)">EXTENSION</text><text class="terminal-2271905219-r2" x="585.6" y="20" textLength="36.6" clip-path="url(#terminal-2271905219-line-0)">]&#160;[</text><text class="terminal-2271905219-r4" x="622.2" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-l</text><text class="terminal-2271905219-r5" x="658.8" y="20" textLength="85.4" clip-path="url(#terminal-2271905219-line-0)">LICENSE</text><text class="terminal-2271905219-r2" x="744.2" y="20" textLength="36.6" clip-path="url(#terminal-2271905219-line-0)">]&#160;[</text><text class="terminal-2271905219-r4" x="780.8" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-m</text><text class="terminal-2271905219-r2" x="805.2" y="20" textLength="36.6" clip-path="url(#terminal-2271905219-line-0)">]&#160;[</text><text class="terminal-2271905219-r4" x="841.8" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-n</text><text class="terminal-2271905219-r2" x="866.2" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">]&#160;</text><text class="terminal-2271905219-r4" x="890.6" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-p</text><text class="terminal-2271905219-r5" x="927.2" y="20" textLength="48.8" clip-path="url(#terminal-2271905219-line-0)">ROOT</text><text class="terminal-2271905219-r2" x="976" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">&#160;[</text><text class="terminal-2271905219-r4" x="1000.4" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-r</text><text class="terminal-2271905219-r2" x="1024.8" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">]&#160;</text><text class="terminal-2271905219-r4" x="1049.2" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-t</text><text class="terminal-2271905219-r5" x="1085.8" y="20" textLength="61" clip-path="url(#terminal-2271905219-line-0)">TITLE</text><text class="terminal-2271905219-r4" x="1159" y="20" textLength="24.4" clip-path="url(#terminal-2271905219-line-0)">-w</text><text class="terminal-2271905219-r5" x="1195.6" y="20" textLength="36.6" clip-path="url(#terminal-2271905219-line-0)">URL</text><text class="terminal-2271905219-r2" x="1464" y="20" textLength="12.2" clip-path="url(#terminal-2271905219-line-0)">
-</text><text class="terminal-3756623299-r2" x="0" y="44.4" textLength="231.8" clip-path="url(#terminal-3756623299-line-1)">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;[</text><text class="terminal-3756623299-r4" x="231.8" y="44.4" textLength="146.4" clip-path="url(#terminal-3756623299-line-1)">--theme-path</text><text class="terminal-3756623299-r5" x="390.4" y="44.4" textLength="48.8" clip-path="url(#terminal-3756623299-line-1)">PATH</text><text class="terminal-3756623299-r2" x="439.2" y="44.4" textLength="36.6" clip-path="url(#terminal-3756623299-line-1)">]&#160;[</text><text class="terminal-3756623299-r4" x="475.8" y="44.4" textLength="231.8" clip-path="url(#terminal-3756623299-line-1)">--use-fancy-folders</text><text class="terminal-3756623299-r2" x="707.6" y="44.4" textLength="36.6" clip-path="url(#terminal-3756623299-line-1)">]&#160;[</text><text class="terminal-3756623299-r4" x="744.2" y="44.4" textLength="244" clip-path="url(#terminal-3756623299-line-1)">--ignore-other-files</text><text class="terminal-3756623299-r2" x="988.2" y="44.4" textLength="36.6" clip-path="url(#terminal-3756623299-line-1)">]&#160;[</text><text class="terminal-3756623299-r4" x="1024.8" y="44.4" textLength="195.2" clip-path="url(#terminal-3756623299-line-1)">--exclude-folder</text><text class="terminal-3756623299-r5" x="1232.2" y="44.4" textLength="73.2" clip-path="url(#terminal-3756623299-line-1)">FOLDER</text><text class="terminal-3756623299-r2" x="1305.4" y="44.4" textLength="12.2" clip-path="url(#terminal-3756623299-line-1)">]</text><text class="terminal-3756623299-r2" x="1464" y="44.4" textLength="12.2" clip-path="url(#terminal-3756623299-line-1)">
+</text><text class="terminal-2271905219-r2" x="0" y="44.4" textLength="231.8" clip-path="url(#terminal-2271905219-line-1)">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;[</text><text class="terminal-2271905219-r4" x="231.8" y="44.4" textLength="195.2" clip-path="url(#terminal-2271905219-line-1)">--exclude-folder</text><text class="terminal-2271905219-r5" x="439.2" y="44.4" textLength="73.2" clip-path="url(#terminal-2271905219-line-1)">FOLDER</text><text class="terminal-2271905219-r2" x="512.4" y="44.4" textLength="36.6" clip-path="url(#terminal-2271905219-line-1)">]&#160;[</text><text class="terminal-2271905219-r4" x="549" y="44.4" textLength="244" clip-path="url(#terminal-2271905219-line-1)">--ignore-other-files</text><text class="terminal-2271905219-r2" x="793" y="44.4" textLength="36.6" clip-path="url(#terminal-2271905219-line-1)">]&#160;[</text><text class="terminal-2271905219-r4" x="829.6" y="44.4" textLength="146.4" clip-path="url(#terminal-2271905219-line-1)">--theme-path</text><text class="terminal-2271905219-r5" x="988.2" y="44.4" textLength="48.8" clip-path="url(#terminal-2271905219-line-1)">PATH</text><text class="terminal-2271905219-r2" x="1037" y="44.4" textLength="36.6" clip-path="url(#terminal-2271905219-line-1)">]&#160;[</text><text class="terminal-2271905219-r4" x="1073.6" y="44.4" textLength="231.8" clip-path="url(#terminal-2271905219-line-1)">--use-fancy-folders</text><text class="terminal-2271905219-r2" x="1305.4" y="44.4" textLength="12.2" clip-path="url(#terminal-2271905219-line-1)">]</text><text class="terminal-2271905219-r2" x="1464" y="44.4" textLength="12.2" clip-path="url(#terminal-2271905219-line-1)">
-</text><text class="terminal-3756623299-r2" x="0" y="68.8" textLength="231.8" clip-path="url(#terminal-3756623299-line-2)">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;[</text><text class="terminal-3756623299-r4" x="231.8" y="68.8" textLength="109.8" clip-path="url(#terminal-3756623299-line-2)">--version</text><text class="terminal-3756623299-r2" x="341.6" y="68.8" textLength="12.2" clip-path="url(#terminal-3756623299-line-2)">]</text><text class="terminal-3756623299-r2" x="1464" y="68.8" textLength="12.2" clip-path="url(#terminal-3756623299-line-2)">
+</text><text class="terminal-2271905219-r2" x="0" y="68.8" textLength="231.8" clip-path="url(#terminal-2271905219-line-2)">&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;[</text><text class="terminal-2271905219-r4" x="231.8" y="68.8" textLength="109.8" clip-path="url(#terminal-2271905219-line-2)">--version</text><text class="terminal-2271905219-r2" x="341.6" y="68.8" textLength="12.2" clip-path="url(#terminal-2271905219-line-2)">]</text><text class="terminal-2271905219-r2" x="1464" y="68.8" textLength="12.2" clip-path="url(#terminal-2271905219-line-2)">
-</text><text class="terminal-3756623299-r2" x="1464" y="93.2" textLength="12.2" clip-path="url(#terminal-3756623299-line-3)">
+</text><text class="terminal-2271905219-r2" x="1464" y="93.2" textLength="12.2" clip-path="url(#terminal-2271905219-line-3)">
-</text><text class="terminal-3756623299-r2" x="0" y="117.6" textLength="671" clip-path="url(#terminal-3756623299-line-4)">Generate&#160;HTML&#160;files&#160;for&#160;a&#160;static&#160;image&#160;hosting&#160;website.</text><text class="terminal-3756623299-r2" x="1464" y="117.6" textLength="12.2" clip-path="url(#terminal-3756623299-line-4)">
+</text><text class="terminal-2271905219-r2" x="0" y="117.6" textLength="671" clip-path="url(#terminal-2271905219-line-4)">Generate&#160;HTML&#160;files&#160;for&#160;a&#160;static&#160;image&#160;hosting&#160;website.</text><text class="terminal-2271905219-r2" x="1464" y="117.6" textLength="12.2" clip-path="url(#terminal-2271905219-line-4)">
-</text><text class="terminal-3756623299-r2" x="1464" y="142" textLength="12.2" clip-path="url(#terminal-3756623299-line-5)">
+</text><text class="terminal-2271905219-r2" x="1464" y="142" textLength="12.2" clip-path="url(#terminal-2271905219-line-5)">
-</text><text class="terminal-3756623299-r1" x="0" y="166.4" textLength="97.6" clip-path="url(#terminal-3756623299-line-6)">Options:</text><text class="terminal-3756623299-r2" x="1464" y="166.4" textLength="12.2" clip-path="url(#terminal-3756623299-line-6)">
+</text><text class="terminal-2271905219-r1" x="0" y="166.4" textLength="97.6" clip-path="url(#terminal-2271905219-line-6)">Options:</text><text class="terminal-2271905219-r2" x="1464" y="166.4" textLength="12.2" clip-path="url(#terminal-2271905219-line-6)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="190.8" textLength="24.4" clip-path="url(#terminal-3756623299-line-7)">-h</text><text class="terminal-3756623299-r2" x="48.8" y="190.8" textLength="24.4" clip-path="url(#terminal-3756623299-line-7)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="190.8" textLength="73.2" clip-path="url(#terminal-3756623299-line-7)">--help</text><text class="terminal-3756623299-r2" x="292.8" y="190.8" textLength="378.2" clip-path="url(#terminal-3756623299-line-7)">show&#160;this&#160;help&#160;message&#160;and&#160;exit</text><text class="terminal-3756623299-r2" x="1464" y="190.8" textLength="12.2" clip-path="url(#terminal-3756623299-line-7)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="190.8" textLength="24.4" clip-path="url(#terminal-2271905219-line-7)">-h</text><text class="terminal-2271905219-r2" x="48.8" y="190.8" textLength="24.4" clip-path="url(#terminal-2271905219-line-7)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="190.8" textLength="73.2" clip-path="url(#terminal-2271905219-line-7)">--help</text><text class="terminal-2271905219-r2" x="292.8" y="190.8" textLength="378.2" clip-path="url(#terminal-2271905219-line-7)">show&#160;this&#160;help&#160;message&#160;and&#160;exit</text><text class="terminal-2271905219-r2" x="1464" y="190.8" textLength="12.2" clip-path="url(#terminal-2271905219-line-7)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="215.2" textLength="24.4" clip-path="url(#terminal-3756623299-line-8)">-p</text><text class="terminal-3756623299-r2" x="48.8" y="215.2" textLength="24.4" clip-path="url(#terminal-3756623299-line-8)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="215.2" textLength="195.2" clip-path="url(#terminal-3756623299-line-8)">--root-directory</text><text class="terminal-3756623299-r5" x="280.6" y="215.2" textLength="48.8" clip-path="url(#terminal-3756623299-line-8)">ROOT</text><text class="terminal-3756623299-r2" x="1464" y="215.2" textLength="12.2" clip-path="url(#terminal-3756623299-line-8)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="215.2" textLength="24.4" clip-path="url(#terminal-2271905219-line-8)">-a</text><text class="terminal-2271905219-r2" x="48.8" y="215.2" textLength="24.4" clip-path="url(#terminal-2271905219-line-8)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="215.2" textLength="158.6" clip-path="url(#terminal-2271905219-line-8)">--author-name</text><text class="terminal-2271905219-r5" x="244" y="215.2" textLength="73.2" clip-path="url(#terminal-2271905219-line-8)">AUTHOR</text><text class="terminal-2271905219-r2" x="1464" y="215.2" textLength="12.2" clip-path="url(#terminal-2271905219-line-8)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="239.6" textLength="451.4" clip-path="url(#terminal-3756623299-line-9)">Root&#160;directory&#160;containing&#160;the&#160;images.</text><text class="terminal-3756623299-r2" x="1464" y="239.6" textLength="12.2" clip-path="url(#terminal-3756623299-line-9)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="239.6" textLength="402.6" clip-path="url(#terminal-2271905219-line-9)">Name&#160;of&#160;the&#160;author&#160;of&#160;the&#160;images.</text><text class="terminal-2271905219-r2" x="1464" y="239.6" textLength="12.2" clip-path="url(#terminal-2271905219-line-9)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="264" textLength="24.4" clip-path="url(#terminal-3756623299-line-10)">-w</text><text class="terminal-3756623299-r2" x="48.8" y="264" textLength="24.4" clip-path="url(#terminal-3756623299-line-10)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="264" textLength="170.8" clip-path="url(#terminal-3756623299-line-10)">--web-root-url</text><text class="terminal-3756623299-r5" x="256.2" y="264" textLength="36.6" clip-path="url(#terminal-3756623299-line-10)">URL</text><text class="terminal-3756623299-r2" x="1464" y="264" textLength="12.2" clip-path="url(#terminal-3756623299-line-10)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="264" textLength="24.4" clip-path="url(#terminal-2271905219-line-10)">-e</text><text class="terminal-2271905219-r2" x="48.8" y="264" textLength="24.4" clip-path="url(#terminal-2271905219-line-10)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="264" textLength="207.4" clip-path="url(#terminal-2271905219-line-10)">--file-extensions</text><text class="terminal-2271905219-r5" x="292.8" y="264" textLength="109.8" clip-path="url(#terminal-2271905219-line-10)">EXTENSION</text><text class="terminal-2271905219-r2" x="1464" y="264" textLength="12.2" clip-path="url(#terminal-2271905219-line-10)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="288.4" textLength="634.4" clip-path="url(#terminal-3756623299-line-11)">Base&#160;URL&#160;of&#160;the&#160;web&#160;root&#160;for&#160;the&#160;image&#160;hosting&#160;site.</text><text class="terminal-3756623299-r2" x="1464" y="288.4" textLength="12.2" clip-path="url(#terminal-3756623299-line-11)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="288.4" textLength="744.2" clip-path="url(#terminal-2271905219-line-11)">File&#160;extensions&#160;to&#160;include&#160;(can&#160;be&#160;specified&#160;multiple&#160;times).</text><text class="terminal-2271905219-r2" x="1464" y="288.4" textLength="12.2" clip-path="url(#terminal-2271905219-line-11)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="312.8" textLength="24.4" clip-path="url(#terminal-3756623299-line-12)">-t</text><text class="terminal-3756623299-r2" x="48.8" y="312.8" textLength="24.4" clip-path="url(#terminal-3756623299-line-12)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="312.8" textLength="146.4" clip-path="url(#terminal-3756623299-line-12)">--site-title</text><text class="terminal-3756623299-r5" x="231.8" y="312.8" textLength="61" clip-path="url(#terminal-3756623299-line-12)">TITLE</text><text class="terminal-3756623299-r2" x="1464" y="312.8" textLength="12.2" clip-path="url(#terminal-3756623299-line-12)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="312.8" textLength="24.4" clip-path="url(#terminal-2271905219-line-12)">-l</text><text class="terminal-2271905219-r2" x="48.8" y="312.8" textLength="24.4" clip-path="url(#terminal-2271905219-line-12)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="312.8" textLength="170.8" clip-path="url(#terminal-2271905219-line-12)">--license-type</text><text class="terminal-2271905219-r5" x="256.2" y="312.8" textLength="85.4" clip-path="url(#terminal-2271905219-line-12)">LICENSE</text><text class="terminal-2271905219-r2" x="1464" y="312.8" textLength="12.2" clip-path="url(#terminal-2271905219-line-12)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="337.2" textLength="390.4" clip-path="url(#terminal-3756623299-line-13)">Title&#160;of&#160;the&#160;image&#160;hosting&#160;site.</text><text class="terminal-3756623299-r2" x="1464" y="337.2" textLength="12.2" clip-path="url(#terminal-3756623299-line-13)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="337.2" textLength="488" clip-path="url(#terminal-2271905219-line-13)">Specify&#160;the&#160;license&#160;type&#160;for&#160;the&#160;images.</text><text class="terminal-2271905219-r2" x="1464" y="337.2" textLength="12.2" clip-path="url(#terminal-2271905219-line-13)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="361.6" textLength="24.4" clip-path="url(#terminal-3756623299-line-14)">-r</text><text class="terminal-3756623299-r2" x="48.8" y="361.6" textLength="24.4" clip-path="url(#terminal-3756623299-line-14)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="361.6" textLength="280.6" clip-path="url(#terminal-3756623299-line-14)">--regenerate-thumbnails</text><text class="terminal-3756623299-r2" x="1464" y="361.6" textLength="12.2" clip-path="url(#terminal-3756623299-line-14)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="361.6" textLength="24.4" clip-path="url(#terminal-2271905219-line-14)">-m</text><text class="terminal-2271905219-r2" x="48.8" y="361.6" textLength="24.4" clip-path="url(#terminal-2271905219-line-14)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="361.6" textLength="170.8" clip-path="url(#terminal-2271905219-line-14)">--web-manifest</text><text class="terminal-2271905219-r2" x="292.8" y="361.6" textLength="353.8" clip-path="url(#terminal-2271905219-line-14)">Generate&#160;a&#160;web&#160;manifest&#160;file.</text><text class="terminal-2271905219-r2" x="1464" y="361.6" textLength="12.2" clip-path="url(#terminal-2271905219-line-14)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="386" textLength="597.8" clip-path="url(#terminal-3756623299-line-15)">Regenerate&#160;thumbnails&#160;even&#160;if&#160;they&#160;already&#160;exist.</text><text class="terminal-3756623299-r2" x="1464" y="386" textLength="12.2" clip-path="url(#terminal-3756623299-line-15)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="386" textLength="24.4" clip-path="url(#terminal-2271905219-line-15)">-n</text><text class="terminal-2271905219-r2" x="48.8" y="386" textLength="24.4" clip-path="url(#terminal-2271905219-line-15)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="386" textLength="268.4" clip-path="url(#terminal-2271905219-line-15)">--non-interactive-mode</text><text class="terminal-2271905219-r2" x="1464" y="386" textLength="12.2" clip-path="url(#terminal-2271905219-line-15)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="410.4" textLength="24.4" clip-path="url(#terminal-3756623299-line-16)">-n</text><text class="terminal-3756623299-r2" x="48.8" y="410.4" textLength="24.4" clip-path="url(#terminal-3756623299-line-16)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="410.4" textLength="268.4" clip-path="url(#terminal-3756623299-line-16)">--non-interactive-mode</text><text class="terminal-3756623299-r2" x="1464" y="410.4" textLength="12.2" clip-path="url(#terminal-3756623299-line-16)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="410.4" textLength="646.6" clip-path="url(#terminal-2271905219-line-16)">Run&#160;in&#160;non-interactive&#160;mode,&#160;disabling&#160;progress&#160;bars.</text><text class="terminal-2271905219-r2" x="1464" y="410.4" textLength="12.2" clip-path="url(#terminal-2271905219-line-16)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="434.8" textLength="646.6" clip-path="url(#terminal-3756623299-line-17)">Run&#160;in&#160;non-interactive&#160;mode,&#160;disabling&#160;progress&#160;bars.</text><text class="terminal-3756623299-r2" x="1464" y="434.8" textLength="12.2" clip-path="url(#terminal-3756623299-line-17)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="434.8" textLength="24.4" clip-path="url(#terminal-2271905219-line-17)">-p</text><text class="terminal-2271905219-r2" x="48.8" y="434.8" textLength="24.4" clip-path="url(#terminal-2271905219-line-17)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="434.8" textLength="195.2" clip-path="url(#terminal-2271905219-line-17)">--root-directory</text><text class="terminal-2271905219-r5" x="280.6" y="434.8" textLength="48.8" clip-path="url(#terminal-2271905219-line-17)">ROOT</text><text class="terminal-2271905219-r2" x="1464" y="434.8" textLength="12.2" clip-path="url(#terminal-2271905219-line-17)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="459.2" textLength="24.4" clip-path="url(#terminal-3756623299-line-18)">-l</text><text class="terminal-3756623299-r2" x="48.8" y="459.2" textLength="24.4" clip-path="url(#terminal-3756623299-line-18)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="459.2" textLength="170.8" clip-path="url(#terminal-3756623299-line-18)">--license-type</text><text class="terminal-3756623299-r5" x="256.2" y="459.2" textLength="85.4" clip-path="url(#terminal-3756623299-line-18)">LICENSE</text><text class="terminal-3756623299-r2" x="1464" y="459.2" textLength="12.2" clip-path="url(#terminal-3756623299-line-18)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="459.2" textLength="451.4" clip-path="url(#terminal-2271905219-line-18)">Root&#160;directory&#160;containing&#160;the&#160;images.</text><text class="terminal-2271905219-r2" x="1464" y="459.2" textLength="12.2" clip-path="url(#terminal-2271905219-line-18)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="483.6" textLength="488" clip-path="url(#terminal-3756623299-line-19)">Specify&#160;the&#160;license&#160;type&#160;for&#160;the&#160;images.</text><text class="terminal-3756623299-r2" x="1464" y="483.6" textLength="12.2" clip-path="url(#terminal-3756623299-line-19)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="483.6" textLength="24.4" clip-path="url(#terminal-2271905219-line-19)">-r</text><text class="terminal-2271905219-r2" x="48.8" y="483.6" textLength="24.4" clip-path="url(#terminal-2271905219-line-19)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="483.6" textLength="280.6" clip-path="url(#terminal-2271905219-line-19)">--regenerate-thumbnails</text><text class="terminal-2271905219-r2" x="1464" y="483.6" textLength="12.2" clip-path="url(#terminal-2271905219-line-19)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="508" textLength="24.4" clip-path="url(#terminal-3756623299-line-20)">-a</text><text class="terminal-3756623299-r2" x="48.8" y="508" textLength="24.4" clip-path="url(#terminal-3756623299-line-20)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="508" textLength="158.6" clip-path="url(#terminal-3756623299-line-20)">--author-name</text><text class="terminal-3756623299-r5" x="244" y="508" textLength="73.2" clip-path="url(#terminal-3756623299-line-20)">AUTHOR</text><text class="terminal-3756623299-r2" x="1464" y="508" textLength="12.2" clip-path="url(#terminal-3756623299-line-20)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="508" textLength="597.8" clip-path="url(#terminal-2271905219-line-20)">Regenerate&#160;thumbnails&#160;even&#160;if&#160;they&#160;already&#160;exist.</text><text class="terminal-2271905219-r2" x="1464" y="508" textLength="12.2" clip-path="url(#terminal-2271905219-line-20)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="532.4" textLength="402.6" clip-path="url(#terminal-3756623299-line-21)">Name&#160;of&#160;the&#160;author&#160;of&#160;the&#160;images.</text><text class="terminal-3756623299-r2" x="1464" y="532.4" textLength="12.2" clip-path="url(#terminal-3756623299-line-21)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="532.4" textLength="24.4" clip-path="url(#terminal-2271905219-line-21)">-t</text><text class="terminal-2271905219-r2" x="48.8" y="532.4" textLength="24.4" clip-path="url(#terminal-2271905219-line-21)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="532.4" textLength="146.4" clip-path="url(#terminal-2271905219-line-21)">--site-title</text><text class="terminal-2271905219-r5" x="231.8" y="532.4" textLength="61" clip-path="url(#terminal-2271905219-line-21)">TITLE</text><text class="terminal-2271905219-r2" x="1464" y="532.4" textLength="12.2" clip-path="url(#terminal-2271905219-line-21)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="556.8" textLength="24.4" clip-path="url(#terminal-3756623299-line-22)">-e</text><text class="terminal-3756623299-r2" x="48.8" y="556.8" textLength="24.4" clip-path="url(#terminal-3756623299-line-22)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="556.8" textLength="207.4" clip-path="url(#terminal-3756623299-line-22)">--file-extensions</text><text class="terminal-3756623299-r5" x="292.8" y="556.8" textLength="109.8" clip-path="url(#terminal-3756623299-line-22)">EXTENSION</text><text class="terminal-3756623299-r2" x="1464" y="556.8" textLength="12.2" clip-path="url(#terminal-3756623299-line-22)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="556.8" textLength="390.4" clip-path="url(#terminal-2271905219-line-22)">Title&#160;of&#160;the&#160;image&#160;hosting&#160;site.</text><text class="terminal-2271905219-r2" x="1464" y="556.8" textLength="12.2" clip-path="url(#terminal-2271905219-line-22)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="581.2" textLength="744.2" clip-path="url(#terminal-3756623299-line-23)">File&#160;extensions&#160;to&#160;include&#160;(can&#160;be&#160;specified&#160;multiple&#160;times).</text><text class="terminal-3756623299-r2" x="1464" y="581.2" textLength="12.2" clip-path="url(#terminal-3756623299-line-23)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="581.2" textLength="24.4" clip-path="url(#terminal-2271905219-line-23)">-w</text><text class="terminal-2271905219-r2" x="48.8" y="581.2" textLength="24.4" clip-path="url(#terminal-2271905219-line-23)">,&#160;</text><text class="terminal-2271905219-r4" x="73.2" y="581.2" textLength="170.8" clip-path="url(#terminal-2271905219-line-23)">--web-root-url</text><text class="terminal-2271905219-r5" x="256.2" y="581.2" textLength="36.6" clip-path="url(#terminal-2271905219-line-23)">URL</text><text class="terminal-2271905219-r2" x="1464" y="581.2" textLength="12.2" clip-path="url(#terminal-2271905219-line-23)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="605.6" textLength="24.4" clip-path="url(#terminal-3756623299-line-24)">-m</text><text class="terminal-3756623299-r2" x="48.8" y="605.6" textLength="24.4" clip-path="url(#terminal-3756623299-line-24)">,&#160;</text><text class="terminal-3756623299-r4" x="73.2" y="605.6" textLength="170.8" clip-path="url(#terminal-3756623299-line-24)">--web-manifest</text><text class="terminal-3756623299-r2" x="292.8" y="605.6" textLength="353.8" clip-path="url(#terminal-3756623299-line-24)">Generate&#160;a&#160;web&#160;manifest&#160;file.</text><text class="terminal-3756623299-r2" x="1464" y="605.6" textLength="12.2" clip-path="url(#terminal-3756623299-line-24)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="605.6" textLength="634.4" clip-path="url(#terminal-2271905219-line-24)">Base&#160;URL&#160;of&#160;the&#160;web&#160;root&#160;for&#160;the&#160;image&#160;hosting&#160;site.</text><text class="terminal-2271905219-r2" x="1464" y="605.6" textLength="12.2" clip-path="url(#terminal-2271905219-line-24)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="630" textLength="146.4" clip-path="url(#terminal-3756623299-line-25)">--theme-path</text><text class="terminal-3756623299-r5" x="183" y="630" textLength="48.8" clip-path="url(#terminal-3756623299-line-25)">PATH</text><text class="terminal-3756623299-r2" x="292.8" y="630" textLength="329.4" clip-path="url(#terminal-3756623299-line-25)">Path&#160;to&#160;the&#160;CSS&#160;theme&#160;file.</text><text class="terminal-3756623299-r2" x="1464" y="630" textLength="12.2" clip-path="url(#terminal-3756623299-line-25)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="630" textLength="195.2" clip-path="url(#terminal-2271905219-line-25)">--exclude-folder</text><text class="terminal-2271905219-r5" x="231.8" y="630" textLength="73.2" clip-path="url(#terminal-2271905219-line-25)">FOLDER</text><text class="terminal-2271905219-r2" x="1464" y="630" textLength="12.2" clip-path="url(#terminal-2271905219-line-25)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="654.4" textLength="231.8" clip-path="url(#terminal-3756623299-line-26)">--use-fancy-folders</text><text class="terminal-3756623299-r2" x="292.8" y="654.4" textLength="890.6" clip-path="url(#terminal-3756623299-line-26)">Enable&#160;fancy&#160;folder&#160;view&#160;instead&#160;of&#160;the&#160;default&#160;Apache&#160;directory&#160;listing.</text><text class="terminal-3756623299-r2" x="1464" y="654.4" textLength="12.2" clip-path="url(#terminal-3756623299-line-26)">
+</text><text class="terminal-2271905219-r2" x="292.8" y="654.4" textLength="1049.2" clip-path="url(#terminal-2271905219-line-26)">Folders&#160;to&#160;exclude&#160;from&#160;processing,&#160;globs&#160;supported&#160;(can&#160;be&#160;specified&#160;multiple&#160;times).</text><text class="terminal-2271905219-r2" x="1464" y="654.4" textLength="12.2" clip-path="url(#terminal-2271905219-line-26)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="678.8" textLength="244" clip-path="url(#terminal-3756623299-line-27)">--ignore-other-files</text><text class="terminal-3756623299-r2" x="292.8" y="678.8" textLength="683.2" clip-path="url(#terminal-3756623299-line-27)">Ignore&#160;files&#160;that&#160;do&#160;not&#160;match&#160;the&#160;specified&#160;extensions.</text><text class="terminal-3756623299-r2" x="1464" y="678.8" textLength="12.2" clip-path="url(#terminal-3756623299-line-27)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="678.8" textLength="244" clip-path="url(#terminal-2271905219-line-27)">--ignore-other-files</text><text class="terminal-2271905219-r2" x="292.8" y="678.8" textLength="683.2" clip-path="url(#terminal-2271905219-line-27)">Ignore&#160;files&#160;that&#160;do&#160;not&#160;match&#160;the&#160;specified&#160;extensions.</text><text class="terminal-2271905219-r2" x="1464" y="678.8" textLength="12.2" clip-path="url(#terminal-2271905219-line-27)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="703.2" textLength="195.2" clip-path="url(#terminal-3756623299-line-28)">--exclude-folder</text><text class="terminal-3756623299-r5" x="231.8" y="703.2" textLength="73.2" clip-path="url(#terminal-3756623299-line-28)">FOLDER</text><text class="terminal-3756623299-r2" x="1464" y="703.2" textLength="12.2" clip-path="url(#terminal-3756623299-line-28)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="703.2" textLength="146.4" clip-path="url(#terminal-2271905219-line-28)">--theme-path</text><text class="terminal-2271905219-r5" x="183" y="703.2" textLength="48.8" clip-path="url(#terminal-2271905219-line-28)">PATH</text><text class="terminal-2271905219-r2" x="292.8" y="703.2" textLength="329.4" clip-path="url(#terminal-2271905219-line-28)">Path&#160;to&#160;the&#160;CSS&#160;theme&#160;file.</text><text class="terminal-2271905219-r2" x="1464" y="703.2" textLength="12.2" clip-path="url(#terminal-2271905219-line-28)">
-</text><text class="terminal-3756623299-r2" x="292.8" y="727.6" textLength="1049.2" clip-path="url(#terminal-3756623299-line-29)">Folders&#160;to&#160;exclude&#160;from&#160;processing,&#160;globs&#160;supported&#160;(can&#160;be&#160;specified&#160;multiple&#160;times).</text><text class="terminal-3756623299-r2" x="1464" y="727.6" textLength="12.2" clip-path="url(#terminal-3756623299-line-29)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="727.6" textLength="231.8" clip-path="url(#terminal-2271905219-line-29)">--use-fancy-folders</text><text class="terminal-2271905219-r2" x="292.8" y="727.6" textLength="890.6" clip-path="url(#terminal-2271905219-line-29)">Enable&#160;fancy&#160;folder&#160;view&#160;instead&#160;of&#160;the&#160;default&#160;Apache&#160;directory&#160;listing.</text><text class="terminal-2271905219-r2" x="1464" y="727.6" textLength="12.2" clip-path="url(#terminal-2271905219-line-29)">
-</text><text class="terminal-3756623299-r4" x="24.4" y="752" textLength="109.8" clip-path="url(#terminal-3756623299-line-30)">--version</text><text class="terminal-3756623299-r2" x="292.8" y="752" textLength="463.6" clip-path="url(#terminal-3756623299-line-30)">show&#160;program&#x27;s&#160;version&#160;number&#160;and&#160;exit</text><text class="terminal-3756623299-r2" x="1464" y="752" textLength="12.2" clip-path="url(#terminal-3756623299-line-30)">
+</text><text class="terminal-2271905219-r4" x="24.4" y="752" textLength="109.8" clip-path="url(#terminal-2271905219-line-30)">--version</text><text class="terminal-2271905219-r2" x="292.8" y="752" textLength="463.6" clip-path="url(#terminal-2271905219-line-30)">show&#160;program&#x27;s&#160;version&#160;number&#160;and&#160;exit</text><text class="terminal-2271905219-r2" x="1464" y="752" textLength="12.2" clip-path="url(#terminal-2271905219-line-30)">
 </text>
     </g>
     </g>

modules/argumentparser.py

@@ -99,12 +99,6 @@ def parse_arguments(version: str) -> Args:
     """
     # fmt: off
     parser = argparse.ArgumentParser(description="Generate HTML files for a static image hosting website.", formatter_class=RichHelpFormatter)
-    parser.add_argument("--exclude-folder", help="Folders to exclude from processing, globs supported (can be specified multiple times).", action="append", dest="exclude_folders", metavar="FOLDER")
-    parser.add_argument("--generate-help-preview", action=HelpPreviewAction, path="help.svg")
-    parser.add_argument("--ignore-other-files", help="Ignore files that do not match the specified extensions.", action="store_true", default=False, dest="ignore_other_files")
-    parser.add_argument("--theme-path", help="Path to the CSS theme file.", default=DEFAULT_THEME_PATH, type=str, dest="theme_path", metavar="PATH")
-    parser.add_argument("--use-fancy-folders", help="Enable fancy folder view instead of the default Apache directory listing.", action="store_true", default=False, dest="use_fancy_folders")
-    parser.add_argument("--version", action="version", version=f"%(prog)s {version}")
     parser.add_argument("-a", "--author-name", help="Name of the author of the images.", default=DEFAULT_AUTHOR, type=str, dest="author_name", metavar="AUTHOR")
     parser.add_argument("-e", "--file-extensions", help="File extensions to include (can be specified multiple times).", action="append", dest="file_extensions", metavar="EXTENSION")
     parser.add_argument("-l", "--license-type", help="Specify the license type for the images.", choices=["cc-zero", "cc-by", "cc-by-sa", "cc-by-nd", "cc-by-nc", "cc-by-nc-sa", "cc-by-nc-nd"], default=None, dest="license_type", metavar="LICENSE")
@@ -114,6 +108,12 @@ def parse_arguments(version: str) -> Args:
     parser.add_argument("-r", "--regenerate-thumbnails", help="Regenerate thumbnails even if they already exist.", action="store_true", default=False, dest="regenerate_thumbnails")
     parser.add_argument("-t", "--site-title", help="Title of the image hosting site.", required=True, type=str, dest="site_title", metavar="TITLE")
     parser.add_argument("-w", "--web-root-url", help="Base URL of the web root for the image hosting site.", required=True, type=str, dest="web_root_url", metavar="URL")
+    parser.add_argument("--exclude-folder", help="Folders to exclude from processing, globs supported (can be specified multiple times).", action="append", dest="exclude_folders", metavar="FOLDER")
+    parser.add_argument("--generate-help-preview", action=HelpPreviewAction, path="help.svg", )
+    parser.add_argument("--ignore-other-files", help="Ignore files that do not match the specified extensions.", action="store_true", default=False, dest="ignore_other_files")
+    parser.add_argument("--theme-path", help="Path to the CSS theme file.", default=DEFAULT_THEME_PATH, type=str, dest="theme_path", metavar="PATH")
+    parser.add_argument("--use-fancy-folders", help="Enable fancy folder view instead of the default Apache directory listing.", action="store_true", default=False, dest="use_fancy_folders")
+    parser.add_argument("--version", action="version", version=f"%(prog)s {version}")
     parsed_args = parser.parse_args()
     # fmt: on
     _args = Args(

modules/css_color.py

@@ -33,8 +33,7 @@ def extract_colorscheme(theme_path: str) -> Dict[str, str]:
         color_value = match[1]
         hex_color_value = css_color_to_hex(color_value)
         colorscheme[variable_name] = hex_color_value
-    logger.debug("extracted variable", extra={"variable": variable_name, "value": hex_color_value})
+        logger.debug("extracted variable", extra={"variable": variable_name, "value": hex_color_value})
-    logger.info("extracted color scheme", extra={"colorscheme": colorscheme})
 
     return colorscheme
 

modules/logger.py

@@ -1,5 +1,5 @@
 """
-loggerdabn.py
+logger.py
 
 This module provides functionality for setting up a centralized logging system using the
 `logging` library and the `python-json-logger` to output logs in JSON format. It handles
@@ -9,11 +9,14 @@ Functions:
 - log_format(keys): Generates the logging format string based on the list of keys.
 - rotate_log_file(): Handles renaming the existing log file to a timestamp-based name.
 - setup_logger(): Configures the logging system, applies a JSON format, and returns a logger instance.
+- setup_consolelogger(): Configures the logging system to output logs in console format.
 """
 
-import logging
 import os
 import json
+import gzip
+import shutil
+import logging
 from datetime import datetime
 from pythonjsonlogger import jsonlogger
 
@@ -43,11 +46,13 @@ def log_format(keys):
     return [f"%({i})s" for i in keys]
 
 
-def rotate_log_file():
+def rotate_log_file(compress=False):
     """
     Renames the existing 'latest.jsonl' file to a timestamped file based on the first log entry's asctime.
+    Optionally compresses the old log file using gzip.
 
-    If 'latest.jsonl' exists, it's renamed to the first timestamp found in the log entry.
+    Args:
+        compress (bool): If True, compress the old log file using gzip.
     """
     if os.path.exists(LATEST_LOG_FILE):
         with open(LATEST_LOG_FILE, "r", encoding="utf-8") as f:
@@ -64,20 +69,24 @@ def rotate_log_file():
 
         os.rename(LATEST_LOG_FILE, old_log_filename)
 
+        if compress:
+            with open(old_log_filename, "rb") as f_in:
+                with gzip.open(f"{old_log_filename}.gz", "wb") as f_out:
+                    shutil.copyfileobj(f_in, f_out)
+            os.remove(old_log_filename)
 
-def setup_logger():
+
+def setup_logger(level=logging.INFO):
     """
     Configures the logging system with a custom format and outputs logs in JSON format.
 
     The logger will write to the 'logs/latest.jsonl' file, and it will include
     multiple attributes such as the time of logging, the filename, function name, log level, etc.
-    If 'latest.jsonl' already exists, it will be renamed to a timestamped file before creating a new one.
 
     Returns:
         logging.Logger: A configured logger instance that can be used to log messages.
     """
-    rotate_log_file()
+    _logger = logging.getLogger(name="defaultlogger")
-    app_logger = logging.getLogger()
 
     supported_keys = ["asctime", "created", "filename", "funcName", "levelname", "levelno", "lineno", "module", "msecs", "message", "name", "pathname", "process", "processName", "relativeCreated", "thread", "threadName", "taskName"]
 
@@ -87,10 +96,38 @@ def setup_logger():
     log_handler = logging.FileHandler(LATEST_LOG_FILE)
     log_handler.setFormatter(formatter)
 
-    app_logger.addHandler(log_handler)
+    _logger.addHandler(log_handler)
-    app_logger.setLevel(logging.INFO)
+    _logger.setLevel(level=level)
 
-    return app_logger
+    return _logger
 
 
+def setup_consolelogger(level=logging.INFO):
+    """
+    Configures the logging system to output logs in console and JSON format.
+
+    The logger will write to the 'logs/latest.jsonl' file, and it will include
+    multiple attributes such as the time of logging, the filename, function name, log level, etc.
+
+    Returns:
+        logging.Logger: A configured logger instance that can be used to log messages.
+    """
+    _logger = logging.getLogger(name="consolelogger")
+
+    supported_keys = ["asctime", "created", "filename", "funcName", "levelname", "levelno", "lineno", "module", "msecs", "message", "name", "pathname", "process", "processName", "relativeCreated", "thread", "threadName", "taskName"]
+
+    custom_format = " ".join(log_format(supported_keys))
+    formatter = jsonlogger.JsonFormatter(custom_format)
+
+    log_handler = logging.FileHandler(LATEST_LOG_FILE)
+    log_handler.setFormatter(formatter)
+
+    _logger.addHandler(log_handler)
+    _logger.addHandler(logging.StreamHandler())
+    _logger.setLevel(level=level)
+    return _logger
+
+
+rotate_log_file(compress=True)
 logger = setup_logger()
+consolelogger = setup_consolelogger()

modules/svg_handling.py

@@ -1,6 +1,7 @@
 import os
 import shutil
 from typing import List, Dict
+from subprocess import Popen, PIPE
 from PIL import Image
 from jinja2 import Environment, FileSystemLoader
 
@@ -92,10 +93,23 @@ def generate_favicon(iconspath: str, root_directory: str) -> None:
     """
     favicon = os.path.join(root_directory, ".static", "favicon.ico")
     logger.info("generating favicon with imagemagick", extra={"iconspath": iconspath, "favicon": favicon})
-    command = f'magick {os.path.join(iconspath, "icon.png")} -define icon:auto-resize=16,32,48,64,72,96,144,192 {favicon}'
+    _env = dict(os.environ)
+    lp_key = "LD_LIBRARY_PATH"
+    lp_orig = _env.get(lp_key + "_ORIG")
+    if lp_orig is not None:
+        _env[lp_key] = lp_orig
+    else:
+        _env.pop(lp_key, None)
     if not shutil.which("magick"):
-        command = f'convert {os.path.join(iconspath, "icon.png")} -define icon:auto-resize=16,32,48,64,72,96,144,192 {favicon}'
+        magick = shutil.which("convert")
-    os.system(command)
+    else:
+        magick = shutil.which("magick")
+    command = [magick, os.path.join(iconspath, "icon.png"), "-define", "icon:auto-resize=16,32,48,64,72,96,144,192", favicon]
+    with Popen(command, stdin=PIPE, stdout=PIPE, stderr=PIPE, env=_env, errors="ignore") as p:
+        out, err = p.communicate()
+        if p.returncode != 0:
+            logger.error("error generating favicon: %s", err, extra={"command": command, "out": out, "err": err})
+        logger.info("favicon generated successfully", extra={"command": command, "out": out, "err": err})
 
 
 def icons(_args: Args) -> None:

themes/carnation.css

@@ -5,22 +5,22 @@
   --color2: #b22222;
   --color3: #ff4500;
   --color4: #6e0000;
-  --bcolor1: #ebebeb;
+  --bcolor1: #171717;
   --bcolor2: #191919;
-  --bcolor3: #171717;
+  --bcolor3: #ebebeb;
   --bcolor4: #0a0a0a;
 }
 
 .navbar {
   font-weight: bold;
-  color: var(--bcolor1);
+  color: var(--bcolor3);
   background-color: var(--color1);
   font-weight: 900;
 }
 
 .navbar li a {
   font-weight: 800;
-  color: var(--bcolor1);
+  color: var(--bcolor3);
 }
 
 /* Change the link color on hover */
@@ -30,7 +30,7 @@
 }
 
 .footer {
-  color: var(--bcolor1);
+  color: var(--bcolor3);
   background-color: var(--color3);
   font-weight: 700;
 }

themes/cornflower.css

@@ -5,22 +5,22 @@
   --color2: #1346a4;
   --color3: #0e3377;
   --color4: #3674e7;
-  --bcolor1: #ebebeb;
+  --bcolor1: #171717;
   --bcolor2: #191919;
-  --bcolor3: #171717;
+  --bcolor3: #ebebeb;
   --bcolor4: #0a0a0a;
 }
 
 .navbar {
   font-weight: bold;
-  color: var(--bcolor1);
+  color: var(--bcolor3);
   background-color: var(--color1);
   font-weight: 900;
 }
 
 .navbar li a {
   font-weight: 800;
-  color: var(--bcolor1);
+  color: var(--bcolor3);
 }
 
 /* Change the link color on hover */
@@ -30,7 +30,7 @@
 }
 
 .footer {
-  color: var(--bcolor1);
+  color: var(--bcolor3);
   background-color: var(--color3);
   font-weight: 700;
 }

themes/icons/catpuccin.svg.j2

@@ -1,6 +1,6 @@
 <svg width='64' height='64' viewBox='0 0 24 24' fill='none' xmlns='http://www.w3.org/2000/svg'>
     <path d='M20 6H10L8 4H4C2.89543 4 2 4.89543 2 6V18C2 19.1046 2.89543 20 4 20H20C21.1046 20 22 19.1046 22 18V8C22 6.89543 21.1046 6 20 6Z' fill='{{ color1 }}' />
     <path d='M4 4H8L10 6H20C21.1046 6 22 6.89543 22 8H2C2 6.89543 2.89543 6 4 6V4Z' fill='{{ color4 }}' />
-    <path d='M10 6H14L12 4H8L10 6Z' fill='{{ color2 }}' />
+    <path d='M10 6H14L12 4H8L10 6Z' fill='{{ color3 }}' />
-    <path d='M14 6H18L16 4H12L14 6Z' fill='{{ color3 }}' />
+    <path d='M14 6H18L16 4H12L14 6Z' fill='{{ color2 }}' />
 </svg>

themes/ivy.css

@@ -5,22 +5,22 @@
   --color2: #008000;
   --color3: #32cd32;
   --color4: #004300;
-  --bcolor1: #ebebeb;
+  --bcolor1: #171717;
   --bcolor2: #191919;
-  --bcolor3: #171717;
+  --bcolor3: #ebebeb;
   --bcolor4: #0a0a0a;
 }
 
 .navbar {
   font-weight: bold;
-  color: var(--bcolor1);
+  color: var(--bcolor3);
   background-color: var(--color1);
   font-weight: 900;
 }
 
 .navbar li a {
   font-weight: 800;
-  color: var(--bcolor1);
+  color: var(--bcolor3);
 }
 
 /* Change the link color on hover */
@@ -30,7 +30,7 @@
 }
 
 .footer {
-  color: var(--bcolor1);
+  color: var(--bcolor3);
   background-color: var(--color3);
   font-weight: 700;
 }

themes/sunflower.css

@@ -5,9 +5,9 @@
   --color2: #ffd700;
   --color3: #ffe135;
   --color4: #ce8c00;
-  --bcolor1: #ebebeb;
+  --bcolor1: #171717;
   --bcolor2: #191919;
-  --bcolor3: #171717;
+  --bcolor3: #ebebeb;
   --bcolor4: #0a0a0a;
 }
 
@@ -60,7 +60,7 @@
 
 .row a {
   font-weight: 800;
-  color: var(--color2);
+  color: var(--color1);
   text-decoration: none;
 }
 
@@ -70,7 +70,7 @@
 
 .tooltiptext {
   font-weight: 600;
-  color: var(--bcolor1);
+  color: var(--bcolor3);
   background-color: var(--bcolor2);
 }