Merge branch 'dev' of github.com:FuzzyGrim/Yamtrack into repeats_refactor

Author: FuzzyGrim

README.md

@@ -25,7 +25,7 @@ You can try the app at [yamtrack.fuzzygrim.com](https://yamtrack.fuzzygrim.com)
 - 🐳 Easy deployment with Docker via docker-compose with SQLite or PostgreSQL.
 - 👥 Multi-users functionality allowing individual accounts with personalized tracking.
 - 🔑 Flexible authentication options including OIDC and 100+ social providers (Google, GitHub, Discord, etc.) via django-allauth.
-- 🦀 Integration with [Jellyfin](https://jellyfin.org/), to automatically track new media watched.
+- 🦀 Integration with [Jellyfin](https://jellyfin.org/) and [Plex](https://plex.tv), to automatically track new media watched.
 - 📥 Import from [Trakt](https://trakt.tv/), [Simkl](https://simkl.com/), [MyAnimeList](https://myanimelist.net/), [AniList](https://anilist.co/) and [Kitsu](https://kitsu.app/) with support for periodic automatic imports.
 - 📊 Export all your tracked media to a CSV file and import it back.
 

src/app/migrations/0044_fix_episode_images.py

@@ -0,0 +1,64 @@
+from django.db import migrations
+from django.conf import settings
+from app.models import MediaTypes
+from app.providers import services
+import logging
+
+logger = logging.getLogger(__name__)
+
+def update_episode_images(apps, schema_editor):
+    Item = apps.get_model('app', 'Item')
+
+    # Get all episode items with default image
+    episode_items = Item.objects.filter(
+        media_type=MediaTypes.EPISODE.value,
+        image=settings.IMG_NONE
+    )
+
+    if not episode_items.exists():
+        return
+    
+    logger.info("Starting episode image update migration")
+    logger.info("Found %s episodes with default images to process", episode_items.count())
+
+    items_to_update = []
+
+    for item in episode_items:
+        try:
+
+            logger.info(
+                "Updating image for %s S%sE%s",
+                item.title,
+                item.season_number,
+                item.episode_number
+            )
+            season_metadata = services.get_media_metadata(
+                MediaTypes.SEASON.value,
+                item.media_id,
+                item.source,
+                [item.season_number]
+            )
+
+            for ep_meta in season_metadata.get('episodes', []):
+                if ep_meta['episode_number'] == int(item.episode_number):
+                    if ep_meta.get('still_path'):
+                        item.image = f"https://image.tmdb.org/t/p/original{ep_meta['still_path']}"
+                    elif 'image' in ep_meta:
+                        item.image = ep_meta['image']
+                    items_to_update.append(item)
+                    break
+
+        except Exception as e:
+            print(f"Failed to update image for episode {item.id}: {str(e)}")
+
+    if items_to_update:
+        Item.objects.bulk_update(items_to_update, ['image'])
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('app', '0043_remove_historicalanime_progress_changed_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(update_episode_images, reverse_code=migrations.RunPython.noop),
+    ]

src/app/migrations/0044_alter_episode_options_and_more.py renamed to src/app/migrations/0045_alter_episode_options_and_more.py

@@ -29,7 +29,7 @@ def convert_repeats_to_instances(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('app', '0043_remove_historicalanime_progress_changed_and_more'),
+        ('app', '0044_fix_episode_images'),
     ]
 
     operations = [

src/app/migrations/0045_alter_anime_options_alter_basicmedia_options_and_more.py renamed to src/app/migrations/0046_alter_anime_options_alter_basicmedia_options_and_more.py

@@ -83,7 +83,7 @@ def convert_media_repeats_to_instances(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('app', '0044_alter_episode_options_and_more'),
+        ('app', '0045_alter_episode_options_and_more'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 

src/app/migrations/0046_remove_anime_repeats_remove_basicmedia_repeats_and_more.py renamed to src/app/migrations/0047_remove_anime_repeats_remove_basicmedia_repeats_and_more.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('app', '0045_alter_anime_options_alter_basicmedia_options_and_more'),
+        ('app', '0046_alter_anime_options_alter_basicmedia_options_and_more'),
     ]
 
     operations = [

src/app/migrations/0047_alter_anime_options_alter_basicmedia_options_and_more.py renamed to src/app/migrations/0048_alter_anime_options_alter_basicmedia_options_and_more.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('app', '0046_remove_anime_repeats_remove_basicmedia_repeats_and_more'),
+        ('app', '0047_remove_anime_repeats_remove_basicmedia_repeats_and_more'),
     ]
 
     operations = [

src/app/models.py

@@ -795,6 +795,13 @@ def process_status(self):
             if max_progress:
                 self.progress = max_progress
 
+            previous_repeating = (
+                self.tracker.previous("status") == self.Status.REPEATING.value
+            )
+            repeat_count_not_updated = self.repeats == self.tracker.previous("repeats")
+            if previous_repeating and repeat_count_not_updated:
+                self.repeats += 1
+
         self.item.fetch_releases(delay=True)
 
     @property

src/app/providers/tmdb.py

@@ -118,7 +118,7 @@ def find(external_id, external_source):
 
         cache.set(cache_key, data)
 
-    return response["tv_episode_results"][0] if response["tv_episode_results"] else None
+    return response
 
 
 def movie(media_id):

src/app/views.py

@@ -512,8 +512,8 @@ def media_delete(request):
 def episode_save(request):
     """Handle the creation, deletion, and updating of episodes for a season."""
     media_id = request.POST["media_id"]
-    season_number = request.POST["season_number"]
-    episode_number = request.POST["episode_number"]
+    season_number = int(request.POST["season_number"])
+    episode_number = int(request.POST["episode_number"])
     source = request.POST["source"]
 
     try:

src/config/settings.py

@@ -7,18 +7,60 @@
 from urllib.parse import urlparse
 
 from celery.schedules import crontab
-from decouple import Csv, config
+from decouple import (
+    Config,
+    Csv,
+    RepositorySecret,
+    Undefined,
+    UndefinedValueError,
+    config,
+    undefined,
+)
 from django.core.cache import CacheKeyWarning
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 
+def secret(key, default=undefined, **kwargs):
+    """Try to read a config value from a secret file.
+
+    If only the filename is given, try to read from /run/secrets/<key>.
+    If an absolute path is specified, try to read from this path.
+    """
+    if isinstance(default, Undefined):
+        default = None
+
+    file = config(key, default, **kwargs)
+
+    if file is None:
+        return undefined
+    if file == default:
+        return default
+
+    path = Path(file)
+    try:
+        if path.is_absolute():
+            return Config(RepositorySecret(path.parent))(path.stem, default, **kwargs)
+        return Config(RepositorySecret())(file, default, **kwargs)
+    except (
+        FileNotFoundError,
+        IsADirectoryError,
+        UndefinedValueError,
+    ) as err:
+        msg = f"File from {key} not found. Please check the path and filename."
+        raise UndefinedValueError(msg) from err
+
+
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/stable/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = config("SECRET", default="secret")
+SECRET_KEY = config(
+    "SECRET",
+    default=secret("SECRET_FILE", default="ifx7bdUWo5EwC2NQNihjRjOrW00Cdv5Y"),
+)
+
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = config("DEBUG", default=False, cast=bool)
@@ -132,9 +174,9 @@
         "default": {
             "ENGINE": "django.db.backends.postgresql",
             "HOST": config("DB_HOST"),
-            "NAME": config("DB_NAME"),
-            "USER": config("DB_USER"),
-            "PASSWORD": config("DB_PASSWORD"),
+            "NAME": config("DB_NAME", default=secret("DB_NAME_FILE")),
+            "USER": config("DB_USER", default=secret("DB_USER_FILE")),
+            "PASSWORD": config("DB_PASSWORD", default=secret("DB_PASSWORD_FILE")),
             "PORT": config("DB_PORT"),
         },
     }
@@ -246,7 +288,7 @@
 # Yamtrack settings
 
 # For CSV imports
-FILE_UPLOAD_MAX_MEMORY_SIZE = 10 * 1024 * 1024 # 10 MB
+FILE_UPLOAD_MAX_MEMORY_SIZE = 10 * 1024 * 1024  # 10 MB
 
 VERSION = config("VERSION", default="dev")
 
@@ -259,41 +301,86 @@
 REQUEST_TIMEOUT = 120  # seconds
 PER_PAGE = 24
 
-TMDB_API = config("TMDB_API", default="61572be02f0a068658828f6396aacf60")
+TMDB_API = config(
+    "TMDB_API",
+    default=secret(
+        "TMDB_API_FILE",
+        "61572be02f0a068658828f6396aacf60",
+    ),
+)
 TMDB_NSFW = config("TMDB_NSFW", default=False, cast=bool)
 TMDB_LANG = config("TMDB_LANG", default="en")
 
-MAL_API = config("MAL_API", default="25b5581dafd15b3e7d583bb79e9a1691")
+MAL_API = config(
+    "MAL_API",
+    default=secret(
+        "MAL_API_FILE",
+        "25b5581dafd15b3e7d583bb79e9a1691",
+    ),
+)
 MAL_NSFW = config("MAL_NSFW", default=False, cast=bool)
 
 MU_NSFW = config("MU_NSFW", default=False, cast=bool)
 
-IGDB_ID = config("IGDB_ID", default="8wqmm7x1n2xxtnz94lb8mthadhtgrt")
-IGDB_SECRET = config("IGDB_SECRET", default="ovbq0hwscv58hu46yxn50hovt4j8kj")
+IGDB_ID = config(
+    "IGDB_ID",
+    default=secret(
+        "IGDB_ID_FILE",
+        "8wqmm7x1n2xxtnz94lb8mthadhtgrt",
+    ),
+)
+IGDB_SECRET = config(
+    "IGDB_SECRET",
+    default=secret(
+        "IGDB_SECRET_FILE",
+        "ovbq0hwscv58hu46yxn50hovt4j8kj",
+    ),
+)
 IGDB_NSFW = config("IGDB_NSFW", default=False, cast=bool)
 
 HARDCOVER_API = config(
     "HARDCOVER_API",
-    default="Bearer eyJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIYXJkY292ZXIiLCJ2ZXJzaW9uIjoiOCIsImp0aSI6ImJhNGNjZmUwLTgwZmQtNGI3NC1hZDdhLTlkNDM5ZTA5YWMzOSIsImFwcGxpY2F0aW9uSWQiOjIsInN1YiI6IjM0OTUxIiwiYXVkIjoiMSIsImlkIjoiMzQ5NTEiLCJsb2dnZWRJbiI6dHJ1ZSwiaWF0IjoxNzQ2OTc3ODc3LCJleHAiOjE3Nzg1MTM4NzcsImh0dHBzOi8vaGFzdXJhLmlvL2p3dC9jbGFpbXMiOnsieC1oYXN1cmEtYWxsb3dlZC1yb2xlcyI6WyJ1c2VyIl0sIngtaGFzdXJhLWRlZmF1bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS1yb2xlIjoidXNlciIsIlgtaGFzdXJhLXVzZXItaWQiOiIzNDk1MSJ9LCJ1c2VyIjp7ImlkIjozNDk1MX19.edcEqLAeO3uH5xxBTFDKtyWwi-B-WfXX_yiLFdOAJ3c",  # noqa: E501
+    default=secret(
+        "HARDCOVER_API_FILE",
+        "Bearer eyJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIYXJkY292ZXIiLCJ2ZXJzaW9uIjoiOCIsImp0"
+        "aSI6ImJhNGNjZmUwLTgwZmQtNGI3NC1hZDdhLTlkNDM5ZTA5YWMzOSIsImFwcGxpY2F0aW9uSWQi"
+        "OjIsInN1YiI6IjM0OTUxIiwiYXVkIjoiMSIsImlkIjoiMzQ5NTEiLCJsb2dnZWRJbiI6dHJ1ZSwi"
+        "aWF0IjoxNzQ2OTc3ODc3LCJleHAiOjE3Nzg1MTM4NzcsImh0dHBzOi8vaGFzdXJhLmlvL2p3dC9j"
+        "bGFpbXMiOnsieC1oYXN1cmEtYWxsb3dlZC1yb2xlcyI6WyJ1c2VyIl0sIngtaGFzdXJhLWRlZmF1"
+        "bHQtcm9sZSI6InVzZXIiLCJ4LWhhc3VyYS1yb2xlIjoidXNlciIsIlgtaGFzdXJhLXVzZXItaWQi"
+        "OiIzNDk1MSJ9LCJ1c2VyIjp7ImlkIjozNDk1MX19.edcEqLAeO3uH5xxBTFDKtyWwi-B-WfXX_yi"
+        "LFdOAJ3c",
+    ),
 )
 
 COMICVINE_API = config(
     "COMICVINE_API",
-    default="cdab0706269e4bca03a096fbc39920dadf7e4992",
+    default=secret(
+        "COMICVINE_API_FILE",
+        "cdab0706269e4bca03a096fbc39920dadf7e4992",
+    ),
 )
 
-
 TRAKT_API = config(
     "TRAKT_API",
-    default="b4d9702b11cfaddf5e863001f68ce9d4394b678926e8a3f64d47bf69a55dd0fe",
+    default=secret(
+        "TRAKT_API_FILE",
+        "b4d9702b11cfaddf5e863001f68ce9d4394b678926e8a3f64d47bf69a55dd0fe",
+    ),
 )
 SIMKL_ID = config(
     "SIMKL_ID",
-    default="f1df351ddbace7e2c52f0010efdeb1fd59d379d9cdfb88e9a847c68af410db0e",
+    default=secret(
+        "SIMKL_ID_FILE",
+        "f1df351ddbace7e2c52f0010efdeb1fd59d379d9cdfb88e9a847c68af410db0e",
+    ),
 )
 SIMKL_SECRET = config(
     "SIMKL_SECRET",
-    default="9bb254894a598894bee14f61eafdcdca47622ab346632f951ed7220a3de289b5",
+    default=secret(
+        "SIMKL_SECRET_FILE",
+        "9bb254894a598894bee14f61eafdcdca47622ab346632f951ed7220a3de289b5",
+    ),
 )
 
 TESTING = False
@@ -407,7 +494,10 @@
 
 SOCIALACCOUNT_PROVIDERS = config(
     "SOCIALACCOUNT_PROVIDERS",
-    default="{}",
+    default=secret(
+        "SOCIALACCOUNT_PROVIDERS_FILE",
+        default="{}",
+    ),
     cast=json.loads,
 )