Bump version: 0.1.2 → 0.1.3

Reviewed-on: #6

.bumpversion.toml

@@ -1,21 +0,0 @@
-[tool.bumpversion]
-current_version = "0.1.0"
-parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
-serialize = ["{major}.{minor}.{patch}"]
-search = "{current_version}"
-replace = "{new_version}"
-regex = false
-ignore_missing_version = false
-ignore_missing_files = false
-tag = false
-sign_tags = false
-tag_name = "v{new_version}"
-tag_message = "Bump version: {current_version} → {new_version}"
-allow_dirty = false
-commit = false
-message = "Bump version: {current_version} → {new_version}"
-moveable_tags = []
-commit_args = ""
-setup_hooks = []
-pre_commit_hooks = []
-post_commit_hooks = []

.gitea/changelog-config.json

@@ -0,0 +1,46 @@
+{
+    "categories": [
+        {
+            "title": "## 🚀 Features",
+            "labels": ["add","Add", "Kind/Feature"]
+        },
+        {
+            "title": "## 🐛 Fixes",
+            "labels": ["fix","Fix", "Kind/Bug"]
+        },
+        {
+            "title": "## 🧪 Upgrade",
+            "labels": ["upgrade","Upgrade","Clean"]
+        }
+        ,
+        {
+            "title": "## 📝 Documentation",
+            "labels": ["docs","Docs", "Kind/Documentation"]
+        },
+        {
+            "title": "## 🧹 Chore",
+            "labels": ["chore","Chore", "Kind/Chore"]
+        },
+        {
+            "title": "## 🛠️ Maintenance",
+            "labels": ["maintenance","Maintenance", "Kind/Maintenance"]
+        },
+        {
+            "title": "## 🗑️ Deprecation",
+            "labels": ["deprecation","Deprecation", "Kind/Deprecation"]
+        }
+    ],
+    "label_extractor": [
+        {
+            "pattern": "(\\w+) (.+)",
+            "target": "$1",
+            "on_property": "title"
+        }
+    ],
+    "sort": "ASC",
+    "template": "${{CHANGELOG}}",
+    "pr_template": "- ${{TITLE}}\n   - PR: #${{NUMBER}}",
+    "empty_template": "- no changes",
+    "max_pull_requests": 1000,
+    "max_back_track_time_days": 1000
+}

.gitea/workflows/build.yml

@@ -1,10 +1,6 @@
 on:
   workflow_dispatch:
     inputs:
-      release_notes:
-        description: Release notes (use \n for newlines)
-        type: string
-        required: false
       github_release:
         description: 'Create Gitea Release'
         default: true
@@ -25,10 +21,15 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@master
+      with: 
+        fetch-depth: 0
+        fetch-tags: true
     - name: Install uv
       uses: astral-sh/setup-uv@v5
     - name: Set up Python
       run: uv python install
+      with:
+        python-version-file: "pyproject.toml"
     - name: Set Git identity
       run: |
         git config user.name "Gitea CI"
@@ -48,13 +49,15 @@ jobs:
         github_token: ${{ secrets.GITHUB_TOKEN }}
         branch: ${{ github.ref }}
     
-    - name: Create release notes
+    - name: Build Changelog
-      run: |
+      id: build_changelog
-        mkdir release_notes
+      uses: https://github.com/mikepenz/release-changelog-builder-action@v5
-        echo -e "${{ inputs.release_notes }}" >> release_notes/release_notes.md
+      with:
-        echo "Release notes:"
+        platform: "gitea"
-        cat release_notes/release_notes.md
+        baseURL: "http://gitea:3000"
-        echo ""
+        configuration: ".gitea/changelog-config.json"
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITEA_TOKEN }}
     - name: Build package
       run: uv build
     - name: Publish package
@@ -70,7 +73,7 @@ jobs:
       with:
         tag_name: ${{ env.VERSION }}
         release_name: Release ${{ env.VERSION }}
-        body_path: release_notes/release_notes.md
+        body: ${{steps.build_changelog.outputs.changelog}}
         draft: false
         prerelease: false
         make_latest: true

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "komcache"
-version = "0.1.0"
+version = "0.1.3"
 description = "Add your description here"
 readme = "README.md"
 authors = [
@@ -9,6 +9,8 @@ authors = [
 requires-python = ">=3.13"
 dependencies = [
     "komconfig",
+    "pymysql>=1.1.1",
+    "sqlalchemy[asyncio]>=2.0.41",
 ]
 
 [build-system]
@@ -17,3 +19,25 @@ build-backend = "hatchling.build"
 
 [tool.uv.sources]
 komconfig = { workspace = true }
+
+[tool.bumpversion]
+current_version = "0.1.3"
+parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
+serialize = ["{major}.{minor}.{patch}"]
+search = "{current_version}"
+replace = "{new_version}"
+regex = false
+ignore_missing_version = false
+ignore_missing_files = false
+tag = true
+sign_tags = false
+tag_name = "v{new_version}"
+tag_message = "Bump version: {current_version} → {new_version}"
+allow_dirty = true
+commit = true
+message = "Bump version: {current_version} → {new_version}"
+moveable_tags = []
+commit_args = ""
+setup_hooks = []
+pre_commit_hooks = []
+post_commit_hooks = []

src/komcache/__init__.py

@@ -1 +1,2 @@
+__all__ = ["KomCache"]
 from .cache import KomCache

src/komcache/cache.py

@@ -1,138 +1,240 @@
-import sqlite3
+import time
-from komconfig import KomConfig, CONFIG_PATH
+from typing import Any, Tuple, Union
-from pathlib import Path
+
-import os
 import loguru
+from komconfig import KomConfig
+from sqlalchemy import Column, Date, Integer, String, create_engine, text
+from sqlalchemy.exc import OperationalError, SQLAlchemyError
+from sqlalchemy.orm import declarative_base, sessionmaker
+
+from komcache.schemas.mariadb import CREATE_MARIADB_TABLES
+from komcache.schemas.sqlite import CREATE_SQLITE_TABLES
 
 log = loguru.logger
 log.remove()
 log.add("logs/cache.log", level="INFO", rotation="15MB", retention="1 week")
 log.add("logs/cli.log", rotation="15MB", retention="1 week")  # type:ignore
 
+config = KomConfig()
+Base = declarative_base()
+
+
+class KomGrabber(Base):
+    __tablename__ = "komgrabber"
+    id = Column(Integer, primary_key=True)
+    name = Column(String, unique=True, nullable=False)
+    series_id = Column(String, nullable=False)
+    status = Column(String, nullable=False)
+    created_at = Column(Date, nullable=False)
+    updated_at = Column(Date, nullable=False)
+    last_checked = Column(Date, nullable=False)
+    complete = Column(Integer, nullable=False)
+
+
+def protect(url: str) -> str:
+    return "mysql+pymysql://user:pass@host:3306/dbname"
+
 
 class KomCache:
-    def __init__(self, db_path: str = CONFIG_PATH):
+    def __init__(self, db_path: str = ""):  # Default to empty string if not provided
-        self.db_path = Path(db_path, "komcache.db")
+        self.db_path = db_path or config.cache.path
-        if "~" in str(self.db_path):
+        log.debug(f"Cache path: {self.db_path}")
-            self.db_path = os.path.expanduser(str(self.db_path))
+        if config.cache.mode == "local":
-        self.conn = sqlite3.connect(self.db_path)
+            self.db_path = db_path or config.cache.path
-        self.cursor = self.conn.cursor()
+            log.debug(f"Cache path: {self.db_path}")
+            self.engine = create_engine(f"sqlite:///{self.db_path}", pool_pre_ping=True)
+        elif config.cache.mode == "remote":
+            db_url = (
+                config.cache.url
+            )  # e.g., "mysql+pymysql://user:pass@host:3306/dbname"
 
-    def __enter__(self):
+            log.debug(f"Using remote DB URL: {protect(db_url)}")
-        return self
+            self.engine = create_engine(
+                db_url,
+                pool_pre_ping=True,
+                pool_recycle=1800,
+                pool_size=5,
+                max_overflow=10,
+                pool_timeout=30,
+                connect_args={"connect_timeout": 10},
+            )
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.Session = sessionmaker(bind=self.engine, expire_on_commit=False)
-        self.conn.close()
+        # if tables do not exist, create them
-        pass
+        if config.cache.mode == "local":
+            if not self.query(
+                "SELECT name FROM sqlite_master WHERE type='table' AND name='komgrabber'"
+            ):
+                self.create_table()
+        elif config.cache.mode == "remote":
+            if not self.query("SHOW TABLES LIKE 'komgrabber'"):
+                self.create_table()
 
-    def create_table(self, table_query: str) -> None:
+    def _run(self, fn_desc: str, callable_, retries: int = 2, *args, **kwargs):
-        """
+        attempt = 0
-        Create a table in the database.
+        while True:
+            try:
+                return callable_(*args, **kwargs)
+            except OperationalError as e:
+                # MySQL server has gone away (2006) / Lost connection (2013)
+                if attempt < retries and any(
+                    code in str(e.orig) for code in ("2006", "2013")
+                ):
+                    attempt += 1
+                    wait = 1 * attempt
+                    log.warning(
+                        f"{fn_desc} failed due to connection loss (attempt {attempt}/{retries}). Retrying in {wait}s."
+                    )
+                    time.sleep(wait)
+                    continue
+                log.error(f"{fn_desc} failed with OperationalError: {e}")
+                return None
+            except SQLAlchemyError as e:
+                log.error(f"{fn_desc} failed with SQLAlchemyError: {e}")
+                return None
 
-        Parameters
+    def create_table(self):
-        ----------
+        """Ensure all tables are created in the database."""
-        table_query : str
+        if config.cache.mode == "local":
-            the SQL query to create the table.
+            log.debug("Creating SQLite tables")
-        """
+            with self.engine.begin() as connection:
-        self.cursor.execute(table_query)
+                log.debug(f"DB engine URL: {self.engine.url}")
-        self.conn.commit()
+
+                for table_sql in CREATE_SQLITE_TABLES:
+                    connection.execute(text(table_sql))
+        elif config.cache.mode == "remote":
+            log.debug("Creating MariaDB tables")
+            with self.engine.begin() as connection:
+                log.debug(f"DB engine URL: {self.engine.url}")
+
+                for table_sql in CREATE_MARIADB_TABLES:
+                    log.debug(f"Executing table creation SQL: {table_sql}")
+                    try:
+                        connection.execute(text(table_sql))
+                    except Exception as e:
+                        log.exception(
+                            f"Failed to execute table creation SQL:\n{table_sql}"
+                        )
+                        log.exception(f"Error: {e}")
+                # create the KomGrabber table using  SQLAlchemy ORM
+                Base.metadata.create_all(self.engine)
 
     def delete_table(self, table_name: str) -> bool:
         try:
-            self.cursor.execute(f"DROP TABLE IF EXISTS {table_name}")
+            with self.engine.connect() as connection:
-            self.conn.commit()
+                connection.execute(text(f"DROP TABLE IF EXISTS {table_name}"))
             return True
-        except sqlite3.Error as e:
+        except SQLAlchemyError as e:
-            print(f"Error deleting table {table_name}: {e}")
+            log.error(f"Error deleting table {table_name}: {e}")
             return False
 
-    def query_table(self, table: str, query: str) -> list:
+    def query(self, query: str, args: dict[str, Any] = None):
-        try:
+        """Run an arbitrary SQL statement.
-            self.cursor.execute(f"SELECT {query} FROM {table}")
+        For SELECT (or other row‑returning) statements: returns list of rows.
-            return self.cursor.fetchall()
+        For non‑SELECT: executes and commits, returns [].
-        except sqlite3.Error as e:
+        """
-            print(f"Error querying table {table}: {e}")
-            return []
-
-    def query(self, query, args=None):
         if args is None:
-            args = []
+            args = {}
-        try:
+
-            self.cursor.execute(query, args)
+        def _do():
-            data = self.cursor.fetchall()
+            session = self.Session()
-            if data:
+            try:
-                return data
+                result = session.execute(text(query), args)
-            else:
+                # SQLAlchemy 1.4/2.0: result.returns_rows tells us if rows are present
+                if getattr(result, "returns_rows", False):
+                    rows = result.fetchall()
+                    return rows
+                # Non-row statements: commit if they mutate
+                first = query.lstrip().split(None, 1)[0].upper()
+                if first in {
+                    "INSERT",
+                    "UPDATE",
+                    "DELETE",
+                    "REPLACE",
+                    "ALTER",
+                    "CREATE",
+                    "DROP",
+                    "TRUNCATE",
+                }:
+                    session.commit()
+                return []
+            finally:
+                session.close()
+
+        result = self._run("query", _do)
+        return result or []
+
+    def insert(self, query: str, args: dict[str, Any]) -> bool:
+        # (Optionally you can now just call self.query(query, args))
+        def _do():
+            session = self.Session()
+            try:
+                session.execute(text(query), args)
+                session.commit()
+                return True
+            finally:
+                session.close()
+
+        return bool(self._run("insert", _do))
+
+    def update(self, query: str, args: dict[str, Any]) -> bool:
+        def _do():
+            session = self.Session()
+            try:
+                session.execute(text(query), args)
+                session.commit()
+                return True
+            finally:
+                session.close()
+
+        return bool(self._run("update", _do))
+
+    def delete(self, query: str, args: dict[str, Any]) -> bool:
+        def _do():
+            session = self.Session()
+            try:
+                session.execute(text(query), args)
+                session.commit()
+                return True
+            finally:
+                session.close()
+
+        return bool(self._run("delete", _do))
+
+    def fetch_one(self, query: str, args: dict[str, Any] = None) -> Union[Tuple, None]:
+        if args is None:
+            args = {}
+
+        def _do():
+            session = self.Session()
+            try:
+                result = session.execute(text(query), args)
+                if getattr(result, "returns_rows", False):
+                    return result.fetchone()
                 return None
-        except sqlite3.Error as e:
+            finally:
-            print(f"Error executing query: {e}")
+                session.close()
-            return []
 
-    def insert(self, query: str, args=None):
+        return self._run("fetch_one", _do)
+
+    def fetch_all(self, query: str, args: dict[str, Any] | None = None):
         if args is None:
-            args = []
+            args = {}
-        try:
-            self.cursor.execute(query, args)
-            self.conn.commit()
-            return True
-        except sqlite3.Error as e:
-            print(f"Error inserting data: {e}")
-            return False
 
-    def update(self, query, args=None):
+        def _do():
-        if args is None:
+            session = self.Session()
-            args = []
+            try:
-        try:
+                result = session.execute(text(query), args)
-            self.cursor.execute(query, args)
+                if getattr(result, "returns_rows", False):
-            log.debug("Query: {}, Args: {}".format(query, args))
+                    return result.fetchall()
-            self.conn.commit()
+                return []
-            return True
+            finally:
-        except sqlite3.Error as e:
+                session.close()
-            print(f"Error updating data: {e}")
-            return False
 
-    def get_last_update_date(self, series_name: str) -> str:
+        result = self._run("fetch_all", _do)
-        """
+        return result or []
-        Get the last update date for a series.
-
-        Parameters
-        ----------
-        series_name : str
-            The name of the series.
-
-        Returns
-        -------
-        str
-            The last update date.
-        """
-        query = "SELECT last_update_date FROM komgrabber WHERE series_name = ?"
-        result = self.query(query, (series_name,))
-        if result:
-            return result[0][0]
-        return ""
-
-    def fetch_one(self, query: str, args=None):
-        if args is None:
-            args = []
-        try:
-            self.cursor.execute(query, args)
-            return self.cursor.fetchone()
-        except sqlite3.Error as e:
-            print(f"Error fetching one: {e}")
-            return None
-
-    def fetch_all(self, query: str, args=None):
-        if args is None:
-            args = []
-        try:
-            self.cursor.execute(query, args)
-            return self.cursor.fetchall()
-        except sqlite3.Error as e:
-            print(f"Error fetching one: {e}")
-            return None
 
 
 if __name__ == "__main__":
-    # Example usage
+    cache = KomCache()
-    with KomCache() as cache:
+    cache.create_table()
-        cache.delete_table("komgrabber")

src/komcache/schemas/mariadb.py

@@ -0,0 +1,33 @@
+CREATE_MARIADB_TABLES = [
+    """
+CREATE TABLE IF NOT EXISTS manga_requests (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    manga_id INT,
+    grabbed TINYINT(1) DEFAULT 0,
+    image TEXT NOT NULL,
+    title TEXT NOT NULL                         
+);""",
+    """CREATE TABLE IF NOT EXISTS komgrabber (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    name TEXT NOT NULL,
+    series_id TEXT NOT NULL, 
+    status TEXT NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    last_checked TIMESTAMP DEFAULT NULL,
+    completed TINYINT(1) DEFAULT 0
+);""",
+    """CREATE TABLE IF NOT EXISTS komtagger (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    series_id TEXT NOT NULL,
+    title TEXT NOT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    last_checked DATETIME NOT NULL DEFAULT '1970-01-01 00:00:00',
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    UNIQUE KEY unique_series_id (series_id(255)),
+    status TEXT NOT NULL,
+    tag_status TEXT NOT NULL DEFAULT 'untagged',
+    anilist_id INT DEFAULT NULL
+  );
+""",
+]

src/komcache/schemas/sqlite.py

@@ -0,0 +1,20 @@
+CREATE_SQLITE_TABLES = ["""
+CREATE TABLE IF NOT EXISTS manga_requests (
+id INTEGER PRIMARY KEY AUTOINCREMENT,
+manga_id INTEGER,
+grabbed BOOLEAN DEFAULT 0);""","""CREATE TABLE IF NOT EXISTS komgrabber (
+id INTEGER PRIMARY KEY AUTOINCREMENT,
+name TEXT NOT NULL,
+series_id TEXT NOT NULL, 
+status TEXT NOT NULL,
+created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+last_checked TIMESTAMP DEFAULT 0,
+completed BOOLEAN DEFAULT 0);""","""CREATE TABLE IF NOT EXISTS komtagger (
+id INTEGER PRIMARY KEY AUTOINCREMENT,
+series_id TEXT NOT NULL,
+title TEXT NOT NULL,
+updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+last_checked TIMESTAMP DEFAULT 0,
+status TEXT NOT NULL);
+"""]