Merge remote-tracking branch 'origin/dev' into anilist

CrazyTim71 · CrazyTim71 · commit 1a01667893f0 · 2025-08-26T21:46:07.000+02:00
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,4 +1,4 @@
-coverage==7.10.0
+coverage==7.10.5
 djlint==1.36.4
 fakeredis==2.30.1
 pytest-django==4.11.1
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
-aiohttp==3.12.14
+aiohttp==3.12.15
 apprise==1.9.3
-beautifulsoup4==4.13.4
+beautifulsoup4==4.13.5
 celery==5.5.3
 croniter==6.0.0
 Django==5.2.2
-django-allauth[socialaccount]==65.10.0
+django-allauth[socialaccount]==65.11.0
 django-celery-beat==2.8.1
 django-celery-results==2.6.0
 django_debug_toolbar==5.2.0
@@ -20,7 +20,7 @@ icalendar==6.3.1
 Pillow==11.3.0
 psycopg[binary,pool]==3.2.9
 python-decouple==3.8
-redis[hiredis]==6.2.0
-requests==2.32.4
+redis[hiredis]==6.4.0
+requests==2.32.5
 requests-ratelimiter==0.7.0
 unidecode==1.4.0
diff --git a/src/app/models.py b/src/app/models.py
@@ -486,23 +486,26 @@ def _sort_in_progress_media(self, media_list, sort_by):
         """Sort in-progress media based on the sort criteria."""
         # Define primary sort functions based on sort_by
         primary_sort_functions = {
-            "upcoming": lambda x: (
+            users.models.HomeSortChoices.UPCOMING: lambda x: (
                 x.next_event is None,
                 x.next_event.datetime if x.next_event else None,
             ),
-            "title": lambda x: x.item.title.lower(),
-            "completion": lambda x: (
+            users.models.HomeSortChoices.RECENT: lambda x: -timezone.datetime.timestamp(
+                x.progressed_at if x.progressed_at is not None else x.created_at,
+            ),
+            users.models.HomeSortChoices.COMPLETION: lambda x: (
                 x.max_progress is None,
                 -(
                     x.progress / x.max_progress * 100
                     if x.max_progress and x.max_progress > 0
                     else 0
                 ),
             ),
-            "episodes_left": lambda x: (
+            users.models.HomeSortChoices.EPISODES_LEFT: lambda x: (
                 x.max_progress is None,
                 (x.max_progress - x.progress if x.max_progress else 0),
             ),
+            users.models.HomeSortChoices.TITLE: lambda x: x.item.title.lower(),
         }
 
         primary_sort_function = primary_sort_functions[sort_by]
diff --git a/src/app/providers/tmdb.py b/src/app/providers/tmdb.py
@@ -549,6 +549,7 @@ def process_episodes(season_metadata, episodes_in_db):
                 "title": episode["name"],
                 "overview": episode["overview"],
                 "history": tracked_episodes.get(episode_number, []),
+                "runtime": get_readable_duration(episode["runtime"]),
             },
         )
     return episodes_metadata
diff --git a/src/app/tests/test_models.py b/src/app/tests/test_models.py
@@ -716,6 +716,10 @@ def test_sort_in_progress_media(self):
         # Fewer episodes left first
         self.assertEqual(sorted_list, [anime1, anime3, anime2])
 
+        # Test sort by recent
+        sorted_list = manager._sort_in_progress_media(anime_list, sort_by="recent")
+        self.assertEqual(sorted_list, [anime3, anime2, anime1])
+
     def test_annotate_max_progress(self):
         """Test the annotate_max_progress method."""
         manager = MediaManager()
@@ -849,6 +853,7 @@ def test_get_in_progress(self):
         )  # 11 total - 5 offset
         self.assertEqual(in_progress[MediaTypes.ANIME.value]["total"], 11)
 
+
     def test_get_media(self):
         """Test the get_media method."""
         manager = MediaManager()
diff --git a/src/app/tests/test_providers.py b/src/app/tests/test_providers.py
@@ -218,20 +218,23 @@ def test_tmdb_process_episodes(self):
                     "still_path": "/path/to/still1.jpg",
                     "name": "Pilot",
                     "overview": "overview of the episode",
+                    "runtime": 23,
                 },
                 {
                     "episode_number": 2,
                     "air_date": "2008-01-27",
                     "still_path": "/path/to/still2.jpg",
                     "name": "Cat's in the Bag...",
                     "overview": "overview of the episode",
+                    "runtime": 23,
                 },
                 {
                     "episode_number": 3,
                     "air_date": "2008-02-10",
                     "still_path": "/path/to/still3.jpg",
                     "name": "...And the Bag's in the River",
                     "overview": "overview of the episode",
+                    "runtime": 23,
                 },
             ],
         }
@@ -413,15 +416,10 @@ def test_hardcover_book(self):
         response = hardcover.book("377193")
         self.assertEqual(response["title"], "The Great Gatsby")
         self.assertEqual(response["details"]["author"], "F. Scott Fitzgerald")
-        self.assertEqual(response["details"]["publisher"], "Penguin UK")
-        self.assertEqual(response["details"]["publish_date"], "1920-06-01")
-        self.assertEqual(response["details"]["number_of_pages"], 217)
-        self.assertEqual(response["details"]["format"], "Paperback")
         # Testing that we have some of the expected genres
         self.assertIn("Fiction", response["genres"])
         self.assertIn("Young Adult", response["genres"])
         self.assertIn("Classics", response["genres"])
-        # Rating is approximately 4.21 * 2 = 8.42
         self.assertAlmostEqual(response["score"], 7.4, delta=0.1)
 
     def test_hardcover_book_unknown(self):
diff --git a/src/integrations/imports/imdb.py b/src/integrations/imports/imdb.py
@@ -232,7 +232,7 @@ def _lookup_in_tmdb(self, imdb_id, title_type):
 
         media_type = IMDB_TYPE_MAPPING.get(title_type, "")
 
-        if media_type == MediaTypes.MOVIE.value and "movie_results" in response:
+        if media_type == MediaTypes.MOVIE.value and response.get("movie_results"):
             movie = response["movie_results"][0]
             return {
                 "media_id": movie["id"],
@@ -241,7 +241,7 @@ def _lookup_in_tmdb(self, imdb_id, title_type):
                 "media_type": MediaTypes.MOVIE.value,
             }
 
-        if media_type == MediaTypes.TV.value and "tv_results" in response:
+        if media_type == MediaTypes.TV.value and response.get("tv_results"):
             tv_show = response["tv_results"][0]
             return {
                 "media_id": tv_show["id"],
diff --git a/src/templates/app/media_details.html b/src/templates/app/media_details.html
@@ -669,7 +669,7 @@ <h2 class="text-xl font-bold mb-4">Episodes</h2>
                       <div>
                         <h2 class="text-xl font-semibold mb-1 line-clamp-1">{{ episode.title }}</h2>
                         <p class="text-sm text-gray-400">
-                          Episode {{ episode.episode_number }} • {{ episode.air_date|default_if_none:"Unknown air date" }}
+                          Episode {{ episode.episode_number }} • {{ episode.air_date|default_if_none:"Unknown air date" }}{% if episode.runtime %} • {{ episode.runtime }}{% endif %}
                         </p>
                       </div>
                       <div class="flex space-x-2">
diff --git a/src/templates/users/about.html b/src/templates/users/about.html
@@ -4,7 +4,7 @@
 {% load static %}
 
 {% block title %}
-  Account - Yamtrack
+  About - Yamtrack
 {% endblock title %}
 
 {% block settings_content %}
diff --git a/src/templates/users/advanced.html b/src/templates/users/advanced.html
@@ -0,0 +1,87 @@
+{% extends "users/base.html" %}
+
+{% load socialaccount %}
+{% load static %}
+
+{% block title %}
+    Advanced - Yamtrack
+{% endblock title %}
+
+{% block settings_content %}
+
+    <div class="space-y-6">
+        <div class="bg-[#2a2f35] rounded-lg p-6">
+            <div class="flex items-center mb-5">
+                <svg xmlns="http://www.w3.org/2000/svg"
+                     width="24"
+                     height="24"
+                     viewBox="0 0 24 24"
+                     fill="none"
+                     stroke="currentColor"
+                     stroke-width="2"
+                     stroke-linecap="round"
+                     stroke-linejoin="round"
+                     class="w-6 h-6 text-indigo-400 mr-3">
+                    <line x1="4" x2="4" y1="21" y2="14" /><line x1="4" x2="4" y1="10" y2="3" /><line x1="12" x2="12" y1="21" y2="12" /><line x1="12" x2="12" y1="8" y2="3" /><line x1="20" x2="20" y1="21" y2="16" /><line x1="20" x2="20" y1="12" y2="3" /><line x1="2" x2="6" y1="14" y2="14" /><line x1="10" x2="14" y1="8" y2="8" /><line x1="18" x2="22" y1="16" y2="16" />
+                </svg>
+                <h2 class="text-xl font-semibold">Advanced</h2>
+            </div>
+
+            <div class="bg-[#39404b] p-5 rounded-lg mb-6">
+                <div class="flex items-center mb-3">
+                    <svg xmlns="http://www.w3.org/2000/svg"
+                         width="24"
+                         height="24"
+                         viewBox="0 0 24 24"
+                         fill="none"
+                         stroke="currentColor"
+                         stroke-width="2"
+                         stroke-linecap="round"
+                         stroke-linejoin="round"
+                         class="w-5 h-5 text-indigo-400 mr-2">
+                        <path d="M10 11v6" />
+                        <path d="M14 11v6" />
+                        <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6" />
+                        <path d="M3 6h18" />
+                        <path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" />
+                    </svg>
+                    <h3 class="text-base font-medium">Clear Search Cache</h3>
+                </div>
+                <p class="text-gray-400 mb-4 text-sm">
+                    Yamtrack stores your search results in a cache to speed up performance and reduce API calls.
+                    <br>
+                    Normally, these cached results expire automatically after 24 hours.
+                    If your search results appear outdated, you can clear the cache manually.
+                    <br>
+                    Your next search may be slightly slower as fresh data is retrieved.
+                </p>
+                <div class="flex space-x-3">
+                    <form method="post" action="{% url 'clear_search_cache' %}">
+                        {% csrf_token %}
+                        <button type="submit"
+                                class="flex items-center px-4 py-2 bg-red-600 text-white rounded-md hover:bg-red-700 transition-colors text-sm cursor-pointer">
+                            <svg xmlns="http://www.w3.org/2000/svg"
+                                 width="24"
+                                 height="24"
+                                 viewBox="0 0 24 24"
+                                 fill="none"
+                                 stroke="currentColor"
+                                 stroke-width="2"
+                                 stroke-linecap="round"
+                                 stroke-linejoin="round"
+                                 class="w-4 h-4 mr-2">
+                                <path d="M10 11v6" />
+                                <path d="M14 11v6" />
+                                <path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6" />
+                                <path d="M3 6h18" />
+                                <path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2" />
+                            </svg>
+                            Clear Search Cache
+                        </button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock settings_content %}
diff --git a/src/templates/users/base.html b/src/templates/users/base.html
@@ -133,6 +133,24 @@ <h1 class="text-3xl font-bold">Settings</h1>
               <span>Export Data</span>
             </a>
 
+            {% url 'advanced' as advanced_url %}
+            <a href="{{ advanced_url }}"
+               class="w-full flex items-center space-x-3 px-2 py-2 rounded-md transition-colors text-left border-l-2 cursor-pointer text-sm {% if request.path == advanced_url %}bg-[#39404b] text-white border-indigo-500{% else %}text-gray-400 border-transparent hover:bg-[#313842] hover:text-white{% endif %}">
+              <svg xmlns="http://www.w3.org/2000/svg"
+                   width="24"
+                   height="24"
+                   viewBox="0 0 24 24"
+                   fill="none"
+                   stroke="currentColor"
+                   stroke-width="2"
+                   stroke-linecap="round"
+                   stroke-linejoin="round"
+                   class="w-5 h-5">
+                <line x1="4" x2="4" y1="21" y2="14" /><line x1="4" x2="4" y1="10" y2="3" /><line x1="12" x2="12" y1="21" y2="12" /><line x1="12" x2="12" y1="8" y2="3" /><line x1="20" x2="20" y1="21" y2="16" /><line x1="20" x2="20" y1="12" y2="3" /><line x1="2" x2="6" y1="14" y2="14" /><line x1="10" x2="14" y1="8" y2="8" /><line x1="18" x2="22" y1="16" y2="16" />
+              </svg>
+              <span>Advanced</span>
+            </a>
+
             {% url 'about' as about_url %}
             <a href="{{ about_url }}"
                class="w-full flex items-center space-x-3 px-2 py-2 rounded-md transition-colors text-left border-l-2 cursor-pointer text-sm {% if request.path == about_url %}bg-[#39404b] text-white border-indigo-500{% else %}text-gray-400 border-transparent hover:bg-[#313842] hover:text-white{% endif %}">
diff --git a/src/users/migrations/0037_remove_user_home_sort_valid_alter_user_home_sort.py b/src/users/migrations/0037_remove_user_home_sort_valid_alter_user_home_sort.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.2.2 on 2025-08-06 11:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0036_update_repeating_status'),
+    ]
+
+    operations = [
+        migrations.RemoveConstraint(
+            model_name='user',
+            name='home_sort_valid',
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='home_sort',
+            field=models.CharField(choices=[('recent', 'Recent'), ('upcoming', 'Upcoming'), ('completion', 'Completion'), ('episodes_left', 'Episodes Left'), ('title', 'Title')], default='upcoming', max_length=20),
+        ),
+    ]
diff --git a/src/users/models.py b/src/users/models.py
@@ -24,6 +24,7 @@ class HomeSortChoices(models.TextChoices):
     """Choices for home page sort options."""
 
     UPCOMING = "upcoming", "Upcoming"
+    RECENT = "recent", "Recent"
     COMPLETION = "completion", "Completion"
     EPISODES_LEFT = "episodes_left", "Episodes Left"
     TITLE = "title", "Title"
diff --git a/src/users/urls.py b/src/users/urls.py
@@ -21,13 +21,15 @@
     path("settings/integrations", views.integrations, name="integrations"),
     path("settings/import", views.import_data, name="import_data"),
     path("settings/export", views.export_data, name="export_data"),
+    path("settings/advanced", views.advanced, name="advanced"),
     path("settings/about", views.about, name="about"),
     path(
         "delete_import_schedule",
         views.delete_import_schedule,
         name="delete_import_schedule",
     ),
     path("regenerate_token", views.regenerate_token, name="regenerate_token"),
+    path("clear_search_cache", views.clear_search_cache, name="clear_search_cache"),
     path(
         "update_plex_usernames",
         views.update_plex_usernames,
diff --git a/src/users/views.py b/src/users/views.py
@@ -4,18 +4,16 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import update_session_auth_hash
+from django.core.cache import cache
 from django.db import IntegrityError
 from django.db.models import Q
 from django.shortcuts import get_object_or_404, redirect, render
+from django.template.defaultfilters import pluralize
 from django.views.decorators.http import require_GET, require_http_methods, require_POST
 from django_celery_beat.models import PeriodicTask
 
 from app.models import Item, MediaTypes
-from users.forms import (
-    NotificationSettingsForm,
-    PasswordChangeForm,
-    UserUpdateForm,
-)
+from users.forms import NotificationSettingsForm, PasswordChangeForm, UserUpdateForm
 
 logger = logging.getLogger(__name__)
 
@@ -260,6 +258,10 @@ def export_data(request):
     """Render the export data settings page."""
     return render(request, "users/export_data.html")
 
+@require_GET
+def advanced(request):
+    """Render the advanced settings page."""
+    return render(request, "users/advanced.html")
 
 @require_GET
 def about(request):
@@ -317,3 +319,19 @@ def update_plex_usernames(request):
         messages.success(request, "Plex usernames updated successfully")
 
     return redirect("integrations")
+
+@require_POST
+def clear_search_cache(request):
+    """Clear all cached search entries."""
+    deleted = cache.delete_pattern("search_*")
+
+    messages.success(
+        request,
+        f"Successfully cleared {deleted} search entr{pluralize(deleted, 'y,ies')}",
+    )
+    logger.info(
+        "Successfully cleared %s search entries",
+        deleted,
+    )
+
+    return redirect("advanced")

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-coverage==7.10.0`
	`1`	`+coverage==7.10.5`
`2`	`2`	`djlint==1.36.4`
`3`	`3`	`fakeredis==2.30.1`
`4`	`4`	`pytest-django==4.11.1`
Original file line number	Diff line number	Diff line change
`@@ -549,6 +549,7 @@ def process_episodes(season_metadata, episodes_in_db):`
`549`	`549`	`"title": episode["name"],`
`550`	`550`	`"overview": episode["overview"],`
`551`	`551`	`"history": tracked_episodes.get(episode_number, []),`
	`552`	`+ "runtime": get_readable_duration(episode["runtime"]),`
`552`	`553`	`},`
`553`	`554`	`)`
`554`	`555`	`return episodes_metadata`