.gitea/workflows/release.yml

@@ -3,9 +3,6 @@ name: Release
 on:
   release:
     types: [published]
-  push:
-    branches:
-      - main
 
 jobs:
   build:
@@ -45,28 +42,3 @@ jobs:
         push: ${{ github.event_name != 'pull_request' }}
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-
-  publish_head:
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Login to Gitea Container Registry
-      uses: docker/login-action@v2
-      with:
-        registry: git.dws.rip
-        username: ${{ github.actor }}
-        password: ${{ secrets.GLOBAL_KEY }}
-
-    - name: Build and push "head" image
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        push: true
-        tags: git.dws.rip/${{ github.repository }}:head

README.md

@@ -1,185 +0,0 @@
-# Foldsite
-
-Foldsite is a dynamic site generator built with Python and Flask. It allows you to create and manage a website using Markdown content, HTML templates, and CSS styles.
-
-## Table of Contents
-
-- [Foldsite](#foldsite)
-  - [Table of Contents](#table-of-contents)
-  - [Configuration](#configuration)
-  - [Template Setup](#template-setup)
-  - [Site Setup](#site-setup)
-  - [Style Setup](#style-setup)
-  - [Template and Style Search](#template-and-style-search)
-  - [How a Template is Written](#how-a-template-is-written)
-  - [Jinja Primer](#jinja-primer)
-  - [Added Tools for the Template](#added-tools-for-the-template)
-  - [Tool Input and Return Types](#tool-input-and-return-types)
-    - [`get_sibling_content_files(path: str) -> list`](#get_sibling_content_filespath-str---list)
-    - [`get_text_document_preview(path: str) -> str`](#get_text_document_previewpath-str---str)
-    - [`get_sibling_content_folders(path: str) -> list`](#get_sibling_content_folderspath-str---list)
-    - [`get_folder_contents(path: str) -> list`](#get_folder_contentspath-str---list)
-  - [Example Usages for Tools and Types](#example-usages-for-tools-and-types)
-    - [Example Usage of `get_sibling_content_files`](#example-usage-of-get_sibling_content_files)
-    - [Example Usage of `get_text_document_preview`](#example-usage-of-get_text_document_preview)
-    - [Example Usage of `get_sibling_content_folders`](#example-usage-of-get_sibling_content_folders)
-    - [Example Usage of `get_folder_contents`](#example-usage-of-get_folder_contents)
-  - [Deployment](#deployment)
-  - [Docker Compose Example](#docker-compose-example)
-
-## Configuration
-
-The configuration file is written in TOML format and contains various settings for the application. Below is an example configuration file (`config.toml`):
-
-```toml
-[paths]
-content_dir = "example/content"
-templates_dir = "templates"
-styles_dir = "styles"
-
-[server]
-listen_address = "127.0.0.1"
-listen_port = 8080
-debug = false
-access_log = true
-max_threads = 4
-admin_browser = false
-admin_password = "your_admin_password"
-```
-
-## Template Setup
-
-Templates are HTML files that define the structure of your web pages. They are stored in the `templates` directory. Each template can include other templates and use Jinja2 syntax for dynamic content.
-
-## Site Setup
-
-The site content is stored in the `content` directory. Each Markdown file represents a page on your site. The directory structure of the `content` directory determines the URL structure of your site.
-
-## Style Setup
-
-Styles are CSS files that define the appearance of your web pages. They are stored in the `styles` directory. You can create specific styles for different types of content and categories.
-
-## Template and Style Search
-
-Templates and styles are searched in a specific order to apply the most specific styles first, followed by more general styles, and finally the base style.
-
-## How a Template is Written
-
-Templates are written in HTML and use Jinja2 syntax for dynamic content. Below is an example template (`base.html`):
-
-```html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ title }}</title>
-    <link rel="stylesheet" href="{{ url_for('static', filename='base.css') }}">
-    {% for style in styles %}
-    <link rel="stylesheet" href="{{ style }}">
-    {% endfor %}
-</head>
-<body>
-    <div class="content">
-        {{ content }}
-    </div>
-</body>
-</html>
-```
-
-## Jinja Primer
-
-Jinja2 is a templating engine for Python. It allows you to include dynamic content in your HTML templates. Below are some basic Jinja2 syntax examples:
-
-- Variables: `{{ variable }}`
-- Loops: `{% for item in list %} ... {% endfor %}`
-- Conditionals: `{% if condition %} ... {% endif %}`
-- Includes: `{% include 'template.html' %}`
-
-## Added Tools for the Template
-
-Foldsite provides additional tools for templates, such as functions to get sibling content files, text document previews, and folder contents.
-
-## Tool Input and Return Types
-
-### `get_sibling_content_files(path: str) -> list`
-Returns a list of sibling content files in the specified directory.
-
-### `get_text_document_preview(path: str) -> str`
-Generates a preview of the text document located at the given path.
-
-### `get_sibling_content_folders(path: str) -> list`
-Returns a list of sibling content folders within a specified directory.
-
-### `get_folder_contents(path: str) -> list`
-Retrieves the contents of a folder and returns a list of `TemplateFile` objects.
-
-## Example Usages for Tools and Types
-
-### Example Usage of `get_sibling_content_files`
-
-```html
-<ul>
-    {% for file in get_sibling_content_files('path/to/directory') %}
-    <li>{{ file[0] }} - {{ file[1] }}</li>
-    {% endfor %}
-</ul>
-```
-
-### Example Usage of `get_text_document_preview`
-
-```html
-<div>
-    {{ get_text_document_preview('path/to/document.md') }}
-</div>
-```
-
-### Example Usage of `get_sibling_content_folders`
-
-```html
-<ul>
-    {% for folder in get_sibling_content_folders('path/to/directory') %}
-    <li>{{ folder[0] }} - {{ folder[1] }}</li>
-    {% endfor %}
-</ul>
-```
-
-### Example Usage of `get_folder_contents`
-
-```html
-<ul>
-    {% for item in get_folder_contents('path/to/directory') %}
-    <li>{{ item.name }} - {{ item.path }}</li>
-    {% endfor %}
-</ul>
-```
-
-## Deployment
-
-To deploy Foldsite, you can use Docker. Below is an example Dockerfile:
-
-```dockerfile
-FROM python:3.13.2-bookworm
-WORKDIR /app
-COPY requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
-COPY . .
-CMD ["python", "main.py"]
-```
-
-## Docker Compose Example
-
-Below is an example `docker-compose.yml` file to deploy Foldsite using Docker Compose:
-
-```yaml
-version: '3.8'
-services:
-  foldsite:
-    build: .
-    ports:
-      - "8080:8080"
-    volumes:
-      - .:/app
-    environment:
-      - CONFIG_PATH=config.toml
-```

config.toml.example

@@ -1,7 +1,7 @@
 [paths]
-content_dir = "/home/dubey/projects/foldsite/docs/content"
+content_dir = "/home/dubey/projects/foldsite/example/content"
-templates_dir = "/home/dubey/projects/foldsite/docs/templates"
+templates_dir = "/home/dubey/projects/foldsite/example/templates"
-styles_dir = "/home/dubey/projects/foldsite/docs/styles"
+styles_dir = "/home/dubey/projects/foldsite/example/styles"
 
 [server]
 listen_address = "0.0.0.0"

docs/content/added-tools.md

@@ -1,3 +0,0 @@
-# Added Tools for the Template
-
-Foldsite provides additional tools for templates, such as functions to get sibling content files, text document previews, and folder contents.

docs/content/configuration.md

@@ -1,19 +0,0 @@
-# Configuration
-
-The configuration file is written in TOML format and contains various settings for the application. Below is an example configuration file (`config.toml`):
-
-```toml
-[paths]
-content_dir = "example/content"
-templates_dir = "templates"
-styles_dir = "styles"
-
-[server]
-listen_address = "127.0.0.1"
-listen_port = 8080
-debug = false
-access_log = true
-max_threads = 4
-admin_browser = false
-admin_password = "your_admin_password"
-```

docs/content/deployment.md

@@ -1,12 +0,0 @@
-# Deployment
-
-To deploy Foldsite, you can use Docker. Below is an example Dockerfile:
-
-```dockerfile
-FROM python:3.13.2-bookworm
-WORKDIR /app
-COPY requirements.txt requirements.txt
-RUN pip install --no-cache-dir -r requirements.txt
-COPY . .
-CMD ["python", "main.py"]
-```

docs/content/docker-compose-example.md

@@ -1,16 +0,0 @@
-# Docker Compose Example
-
-Below is an example `docker-compose.yml` file to deploy Foldsite using Docker Compose:
-
-```yaml
-version: '3.8'
-services:
-  foldsite:
-    build: .
-    ports:
-      - "8080:8080"
-    volumes:
-      - .:/app
-    environment:
-      - CONFIG_PATH=config.toml
-```

docs/content/example-usages.md

@@ -1,39 +0,0 @@
-# Example Usages for Tools and Types
-
-### Example Usage of `get_sibling_content_files`
-
-```html
-<ul>
-    {% for file in get_sibling_content_files('path/to/directory') %}
-    <li>{{ file[0] }} - {{ file[1] }}</li>
-    {% endfor %}
-</ul>
-```
-
-### Example Usage of `get_text_document_preview`
-
-```html
-<div>
-    {{ get_text_document_preview('path/to/document.md') }}
-</div>
-```
-
-### Example Usage of `get_sibling_content_folders`
-
-```html
-<ul>
-    {% for folder in get_sibling_content_folders('path/to/directory') %}
-    <li>{{ folder[0] }} - {{ folder[1] }}</li>
-    {% endfor %}
-</ul>
-```
-
-### Example Usage of `get_folder_contents`
-
-```html
-<ul>
-    {% for item in get_folder_contents('path/to/directory') %}
-    <li>{{ item.name }} - {{ item.path }}</li>
-    {% endfor %}
-</ul>
-```

docs/content/how-template-written.md

@@ -1,23 +0,0 @@
-# How a Template is Written
-
-Templates are written in HTML and use Jinja2 syntax for dynamic content. Below is an example template (`base.html`):
-
-```html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ title }}</title>
-    <link rel="stylesheet" href="{{ url_for('static', filename='base.css') }}">
-    {% for style in styles %}
-    <link rel="stylesheet" href="{{ style }}">
-    {% endfor %}
-</head>
-<body>
-    <div class="content">
-        {{ content }}
-    </div>
-</body>
-</html>
-```

docs/content/index.md

@@ -1,20 +0,0 @@
-# Foldsite Documentation
-
-Welcome to the Foldsite documentation. This site will guide you through the setup, configuration, and usage of Foldsite.
-
-## Table of Contents
-
-1. [Introduction](introduction.md)
-2. [Configuration](configuration.md)
-3. [Template Setup](template-setup.md)
-4. [Site Setup](site-setup.md)
-5. [Style Setup](style-setup.md)
-6. [Template and Style Search](template-style-search.md)
-7. [How a Template is Written](how-template-written.md)
-8. [Jinja Primer](jinja-primer.md)
-9. [Added Tools for the Template](added-tools.md)
-10. [Tool Input and Return Types](tool-input-return-types.md)
-11. [Example Usages for Tools and Types](example-usages.md)
-12. [Deployment](deployment.md)
-13. [Docker Compose Example](docker-compose-example.md)
-14. [Folder Layout](folder-layout.md)

docs/content/introduction.md

@@ -1,5 +0,0 @@
-# Introduction
-
-Foldsite is a dynamic site generator built with Python and Flask. It allows you to create and manage a website using Markdown content, HTML templates, and CSS styles.
-
-This documentation will guide you through the setup, configuration, and usage of Foldsite.

docs/content/jinja-primer.md

@@ -1,8 +0,0 @@
-# Jinja Primer
-
-Jinja2 is a templating engine for Python. It allows you to include dynamic content in your HTML templates. Below are some basic Jinja2 syntax examples:
-
-- Variables: `{{ variable }}`
-- Loops: `{% for item in list %} ... {% endfor %}`
-- Conditionals: `{% if condition %} ... {% endif %}`
-- Includes: `{% include 'template.html' %}`

docs/content/site-setup.md

@@ -1,3 +0,0 @@
-# Site Setup
-
-The site content is stored in the `content` directory. Each Markdown file represents a page on your site. The directory structure of the `content` directory determines the URL structure of your site.

docs/content/style-setup.md

@@ -1,3 +0,0 @@
-# Style Setup
-
-Styles are CSS files that define the appearance of your web pages. They are stored in the `styles` directory. You can create specific styles for different types of content and categories.

docs/content/template-setup.md

@@ -1,3 +0,0 @@
-# Template Setup
-
-Templates are HTML files that define the structure of your web pages. They are stored in the `templates` directory. Each template can include other templates and use Jinja2 syntax for dynamic content.

docs/content/template-style-search.md

@@ -1,3 +0,0 @@
-# Template and Style Search
-
-Templates and styles are searched in a specific order to apply the most specific styles first, followed by more general styles, and finally the base style.

docs/content/tool-input-return-types.md

@@ -1,13 +0,0 @@
-# Tool Input and Return Types
-
-### `get_sibling_content_files(path: str) -> list`
-Returns a list of sibling content files in the specified directory.
-
-### `get_text_document_preview(path: str) -> str`
-Generates a preview of the text document located at the given path.
-
-### `get_sibling_content_folders(path: str) -> list`
-Returns a list of sibling content folders within a specified directory.
-
-### `get_folder_contents(path: str) -> list`
-Retrieves the contents of a folder and returns a list of `TemplateFile` objects.

docs/styles/__file.md.css

@@ -1,24 +0,0 @@
-article {
-    max-width: 800px;
-    margin: 0 auto;
-}
-
-article h1, article h2, article h3, article h4, article h5, article h6 {
-    margin-top: 1.5rem;
-}
-
-article p {
-    margin: 1rem 0;
-}
-
-article pre {
-    background: #f4f4f4;
-    padding: 1rem;
-    overflow-x: auto;
-}
-
-article code {
-    background: #f4f4f4;
-    padding: 0.2rem 0.4rem;
-    border-radius: 3px;
-}

docs/styles/base.css

@@ -1,50 +0,0 @@
-body {
-    font-family: Arial, sans-serif;
-    line-height: 1.6;
-    margin: 0;
-    padding: 0;
-}
-
-header {
-    background: #333;
-    color: #fff;
-    padding: 1rem 0;
-    text-align: center;
-}
-
-header h1 {
-    margin: 0;
-}
-
-nav ul {
-    list-style: none;
-    padding: 0;
-}
-
-nav ul li {
-    display: inline;
-    margin-right: 1rem;
-}
-
-nav ul li a {
-    color: #fff;
-    text-decoration: none;
-}
-
-nav ul li a:hover {
-    text-decoration: underline;
-}
-
-main {
-    padding: 2rem;
-}
-
-footer {
-    background: #333;
-    color: #fff;
-    text-align: center;
-    padding: 1rem 0;
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-}

docs/templates/__file.md.html

@@ -1,4 +0,0 @@
-<article>
-    {{ content|safe }}
-</article>
-

docs/templates/base.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{{ title }}</title>
-    <link rel="stylesheet" href="{{ url_for('static', filename='base.css') }}">
-    {% for style in styles %}
-    <link rel="stylesheet" href="{{ style }}">
-    {% endfor %}
-</head>
-<body>
-    <header>
-        <h1>Foldsite Documentation</h1>
-        <nav>
-            <ul>
-                <li><a href="{{ url_for('default_route', path='index.md') }}">Home</a></li>
-                <li><a href="{{ url_for('default_route', path='introduction.md') }}">Introduction</a></li>
-                <li><a href="{{ url_for('default_route', path='configuration.md') }}">Configuration</a></li>
-                <li><a href="{{ url_for('default_route', path='template-setup.md') }}">Template Setup</a></li>
-                <li><a href="{{ url_for('default_route', path='site-setup.md') }}">Site Setup</a></li>
-                <li><a href="{{ url_for('default_route', path='style-setup.md') }}">Style Setup</a></li>
-                <li><a href="{{ url_for('default_route', path='template-style-search.md') }}">Template and Style Search</a></li>
-                <li><a href="{{ url_for('default_route', path='how-template-written.md') }}">How a Template is Written</a></li>
-                <li><a href="{{ url_for('default_route', path='jinja-primer.md') }}">Jinja Primer</a></li>
-                <li><a href="{{ url_for('default_route', path='added-tools.md') }}">Added Tools</a></li>
-                <li><a href="{{ url_for('default_route', path='tool-input-return-types.md') }}">Tool Input and Return Types</a></li>
-                <li><a href="{{ url_for('default_route', path='example-usages.md') }}">Example Usages</a></li>
-                <li><a href="{{ url_for('default_route', path='deployment.md') }}">Deployment</a></li>
-                <li><a href="{{ url_for('default_route', path='docker-compose-example.md') }}">Docker Compose Example</a></li>
-                <li><a href="{{ url_for('default_route', path='folder-layout.md') }}">Folder Layout</a></li>
-            </ul>
-        </nav>
-    </header>
-    <main>
-        {{ content|safe }}
-    </main>
-    <footer>
-        <p>&copy; 2023 Foldsite</p>
-    </footer>
-</body>
-</html>

src/rendering/image.py

@@ -1,9 +1,12 @@
 from PIL import Image
 from io import BytesIO
-from functools import lru_cache
+from functools import cache
+
+@cache
+def generate_thumbnail(image_path, resize_percent, min_width):
+    # Generate a unique key based on the image path, resize percentage, and minimum width
+    key = f"{image_path}_{resize_percent}_{min_width}"
 
-@lru_cache(maxsize=512)
-def generate_thumbnail(image_path, resize_percent, min_width, max_width):
     # Open the image file
     with Image.open(image_path) as img:
         # Calculate the new size based on the resize percentage
@@ -17,34 +20,27 @@ def generate_thumbnail(image_path, resize_percent, min_width, max_width):
             new_width = min_width
             new_height = int(new_height * scale_factor)
 
-        # Ensure the maximum width is not exceeded
-        if new_width > max_width:
-            scale_factor = max_width / new_width
-            new_width = max_width
-            new_height = int(new_height * scale_factor)
-
         # Resize the image while maintaining the aspect ratio
         img.thumbnail((new_width, new_height))
 
         # Rotate the image based on the EXIF orientation tag
         try:
-            exif = img.info['exif']
+            exif = img._getexif()
-            orientation = img._getexif().get(0x0112, 1)  # 0x0112 is the EXIF orientation tag
+            orientation = exif.get(0x0112, 1)  # 0x0112 is the EXIF orientation tag
-            print(f"EXIF orientation: {orientation}, {image_path}")
             if orientation == 3:
                 img = img.rotate(180, expand=True)
             elif orientation == 6:
-                img = img.rotate(0, expand=True)
+                img = img.rotate(270, expand=True)
             elif orientation == 8:
-                img = img.rotate(180, expand=True)
+                img = img.rotate(90, expand=True)
         except (AttributeError, KeyError, IndexError):
             # cases: image don't have getexif
-            exif = b""
+            pass
 
         # Save the thumbnail to a BytesIO object
         thumbnail_io = BytesIO()
         img_format = img.format if img.format in ["JPEG", "JPG", "PNG"] else "JPEG"
-        img.save(thumbnail_io, format=img_format, exif=exif)
+        img.save(thumbnail_io, format=img_format)
         thumbnail_io.seek(0)
 
     return (thumbnail_io.getvalue(), img_format)

src/routes/routes.py

@@ -1,8 +1,9 @@
 from pathlib import Path
 from src.config.config import Configuration
 from src.rendering.renderer import render_page, render_error_page
-from flask import send_file, request
+from flask import send_file
 from src.rendering.image import generate_thumbnail
+from functools import lru_cache
 import os
 
 
@@ -113,15 +114,13 @@ class RouteManager:
         if file_path.exists():
             # Check to see if the file is an image, if it is, render a thumbnail
             if file_path.suffix.lower() in [".jpg", ".jpeg", ".png", ".gif"]:
-                max_width = request.args.get("max_width", default=2048, type=int)
                 thumbnail_bytes, img_format = generate_thumbnail(
-                    str(file_path), 10, 2048, max_width
+                    str(file_path), 10, 2048
                 )
                 return (
                     thumbnail_bytes,
                     200,
-                    {"Content-Type": f"image/{img_format.lower()}",
+                    {"Content-Type": f"image/{img_format.lower()}"},
-                     "cache-control": "public, max-age=31536000"},
                 )
             return send_file(file_path)
         else: