Sync dev changes (#14)

Author: TimilsinaBimal

.env.example

@@ -7,5 +7,9 @@ TOKEN_SALT=replace-with-a-long-random-string
 TOKEN_TTL_SECONDS=0
 ANNOUNCEMENT_HTML=
 HOST_NAME=<your_addon_url>
-RECOMMENDATION_SOURCE_ITEMS_LIMIT=10
-# fetches recent watched/loved 10 movies and series to recommend based on those
+RECOMMENDATION_SOURCE_ITEMS_LIMIT=10 # fetches recent watched/loved 10 movies and series to recommend based on those
+
+# UPDATER
+CATALOG_UPDATE_MODE=cron
+CATALOG_UPDATE_CRON_SCHEDULES=[{"hour": 12, "minute": 0, "id": "catalog_refresh_noon"},{"hour": 0, "minute": 0, "id": "catalog_refresh_midnight"}]
+CATALOG_REFRESH_INTERVAL_SECONDS=6*60*60

app/core/app.py

@@ -37,13 +37,9 @@ async def lifespan(app: FastAPI):
     global catalog_updater
 
     # Startup
-    if settings.AUTO_UPDATE_CATALOGS and settings.CATALOG_REFRESH_INTERVAL_SECONDS > 3600:  # minimum 1 hour
-        catalog_updater = BackgroundCatalogUpdater(interval_seconds=settings.CATALOG_REFRESH_INTERVAL_SECONDS)
+    if settings.AUTO_UPDATE_CATALOGS:
+        catalog_updater = BackgroundCatalogUpdater()
         catalog_updater.start()
-        logger.info(
-            "Background catalog updates enabled (interval=%ss)",
-            settings.CATALOG_REFRESH_INTERVAL_SECONDS,
-        )
     yield
 
     # Shutdown

app/core/config.py

@@ -23,7 +23,12 @@ class Settings(BaseSettings):
     TOKEN_TTL_SECONDS: int = 0  # 0 = never expire
     ANNOUNCEMENT_HTML: str = ""
     AUTO_UPDATE_CATALOGS: bool = True
-    CATALOG_REFRESH_INTERVAL_SECONDS: int = 6 * 60 * 60  # 6 hours
+    CATALOG_UPDATE_MODE: Literal["cron", "interval"] = "cron"  # "cron" for fixed times, "interval" for periodic
+    CATALOG_UPDATE_CRON_SCHEDULES: list[dict] = (
+        {"hour": 12, "minute": 0, "id": "catalog_refresh_noon"},
+        {"hour": 0, "minute": 0, "id": "catalog_refresh_midnight"},
+    )
+    CATALOG_REFRESH_INTERVAL_SECONDS: int = 6 * 60 * 60  # 6 hours (used when CATALOG_UPDATE_MODE="interval")
     APP_ENV: Literal["development", "production"] = "development"
     HOST_NAME: str = "https://1ccea4301587-watchly.baby-beamup.club"
 

app/services/catalog_updater.py

@@ -2,9 +2,11 @@
 from typing import Any
 
 from apscheduler.schedulers.asyncio import AsyncIOScheduler
+from apscheduler.triggers.cron import CronTrigger
 from apscheduler.triggers.interval import IntervalTrigger
 from loguru import logger
 
+from app.core.config import settings
 from app.services.catalog import DynamicCatalogService
 from app.services.stremio_service import StremioService
 from app.services.token_store import token_store
@@ -37,25 +39,49 @@ async def refresh_catalogs_for_credentials(credentials: dict[str, Any], auth_key
 
 
 class BackgroundCatalogUpdater:
-    """Periodic job that refreshes catalogs for every stored credential token."""
+    """Periodic job that refreshes catalogs for every stored credential token.
 
-    def __init__(self, interval_seconds: int) -> None:
-        self.interval_seconds = max(60, interval_seconds)
-        self.scheduler = AsyncIOScheduler()
+    Supports two modes:
+    - "cron": Runs twice daily at 12:00 PM UTC and 00:00 UTC (midnight)
+    - "interval": Runs every CATALOG_REFRESH_INTERVAL_SECONDS
+    """
+
+    def __init__(self) -> None:
+        self.scheduler = AsyncIOScheduler(timezone="UTC")
+        self.update_mode = settings.CATALOG_UPDATE_MODE
 
     def start(self) -> None:
         if self.scheduler.running:
             return
 
-        logger.info(f"Starting background catalog updater. Interval: {self.interval_seconds}s")
-        self.scheduler.add_job(
-            self.refresh_all_tokens,
-            trigger=IntervalTrigger(seconds=self.interval_seconds),
-            id="catalog_refresh",
-            replace_existing=True,
-            max_instances=1,  # Prevent new job from starting if previous one is still running
-            coalesce=True,  # If multiple runs are missed, only run once
-        )
+        if self.update_mode == "cron":
+            logger.info(f"Starting background catalog updater. Schedule: {settings.CATALOG_UPDATE_CRON_SCHEDULES}")
+            job_defaults = {
+                "func": self.refresh_all_tokens,
+                "replace_existing": True,
+                "max_instances": 1,
+                "coalesce": True,
+            }
+            for schedule in settings.CATALOG_UPDATE_CRON_SCHEDULES:
+                self.scheduler.add_job(
+                    trigger=CronTrigger(hour=schedule["hour"], minute=schedule["minute"], timezone="UTC"),
+                    id=schedule["id"],
+                    **job_defaults,
+                )
+        else:  # interval mode
+            interval_seconds = max(3600, settings.CATALOG_REFRESH_INTERVAL_SECONDS)  # minimum 1 hour
+            interval_hours = interval_seconds // 3600
+            logger.info(f"Starting background catalog updater. Interval: {interval_seconds}s ({interval_hours} hours)")
+
+            self.scheduler.add_job(
+                self.refresh_all_tokens,
+                trigger=IntervalTrigger(seconds=interval_seconds),
+                id="catalog_refresh",
+                replace_existing=True,
+                max_instances=1,  # Prevent new job from starting if previous one is still running
+                coalesce=True,  # If multiple runs are missed, only run once
+            )
+
         self.scheduler.start()
 
     async def stop(self) -> None: