From 9d2677521368c474e53de1b5a4ecaa50355ff446 Mon Sep 17 00:00:00 2001
From: thespbgamer <thespbgamer@outlook.com>
Date: Wed, 22 Apr 2026 18:49:44 +0100
Subject: [PATCH 1/3] Add logic to split in progress and upcoming

---
 src/app/models.py                             |   6 +-
 src/app/tests/views/test_home.py              |  77 ++++++++
 src/app/views.py                              | 187 +++++++++++++++---
 src/templates/app/components/home_grid.html   |  21 +-
 .../app/components/home_section.html          |  40 ++--
 src/templates/users/preferences.html          |  23 +++
 .../0051_user_home_separate_incoming.py       |  18 ++
 src/users/models.py                           |   4 +
 src/users/tests/views/test_sidebar.py         |   2 +
 src/users/views.py                            |   1 +
 10 files changed, 328 insertions(+), 51 deletions(-)
 create mode 100644 src/users/migrations/0051_user_home_separate_incoming.py

diff --git a/src/app/models.py b/src/app/models.py
index 3189319d3..c02bfca38 100644
--- a/src/app/models.py
+++ b/src/app/models.py
@@ -414,7 +414,7 @@ def get_home_status(
         user,
         status,
         sort_by,
-        items_limit,
+        items_limit=None,
         specific_media_type=None,
     ):
         """Get a home media list for a specific status grouped by media type."""
@@ -442,7 +442,9 @@ def get_home_status(
 
             # Apply pagination
             total_count = len(sorted_list)
-            if specific_media_type:
+            if items_limit is None:
+                paginated_list = sorted_list
+            elif specific_media_type:
                 paginated_list = sorted_list[items_limit:]
             else:
                 paginated_list = sorted_list[:items_limit]
diff --git a/src/app/tests/views/test_home.py b/src/app/tests/views/test_home.py
index e8b75c209..f9e834524 100644
--- a/src/app/tests/views/test_home.py
+++ b/src/app/tests/views/test_home.py
@@ -15,6 +15,7 @@
     Sources,
     Status,
 )
+from events.models import Event
 from users.models import HomeSortChoices
 
 
@@ -142,6 +143,16 @@ def mock_get_media_metadata(
             status=Status.IN_PROGRESS.value,
             progress=10,
         )
+        Event.objects.create(
+            item=anime_item,
+            content_number=16,
+            datetime=timezone.now() - timezone.timedelta(days=1),
+        )
+        Event.objects.create(
+            item=anime_item,
+            content_number=17,
+            datetime=timezone.now() + timezone.timedelta(days=1),
+        )
 
         movie_item = Item.objects.create(
             media_id="10",
@@ -155,6 +166,11 @@ def mock_get_media_metadata(
             user=self.user,
             status=Status.PLANNING.value,
         )
+        Event.objects.create(
+            item=season_item,
+            content_number=6,
+            datetime=timezone.now() + timezone.timedelta(days=1),
+        )
 
     def test_home_view(self):
         """Test the home view displays in-progress and planning media."""
@@ -201,6 +217,67 @@ def test_home_view_with_sort(self):
         self.user.refresh_from_db()
         self.assertEqual(self.user.home_sort, "completion")
 
+    def test_home_view_separates_incoming_when_enabled(self):
+        """Test home view splits incoming media from in-progress."""
+        self.user.home_separate_incoming = True
+        self.user.save(update_fields=["home_separate_incoming"])
+
+        response = self.client.get(reverse("home"))
+
+        self.assertEqual(response.status_code, 200)
+
+        sections_by_key = {
+            section["key"]: section for section in response.context["home_sections"]
+        }
+        self.assertIn("incoming", sections_by_key)
+        self.assertIn(Status.IN_PROGRESS.value, sections_by_key)
+
+        incoming_section = sections_by_key["incoming"]
+        in_progress_section = sections_by_key[Status.IN_PROGRESS.value]
+
+        self.assertEqual(incoming_section["count"], 2)
+        self.assertEqual(in_progress_section["count"], 1)
+        self.assertIn(MediaTypes.SEASON.value, incoming_section["media_types"])
+        self.assertIn(MediaTypes.ANIME.value, incoming_section["media_types"])
+        self.assertIn(MediaTypes.ANIME.value, in_progress_section["media_types"])
+
+    def test_home_view_htmx_load_more_for_incoming(self):
+        """Test HTMX load more for incoming section."""
+        self.user.home_separate_incoming = True
+        self.user.save(update_fields=["home_separate_incoming"])
+
+        for i in range(6, 20):
+            anime_item = Item.objects.create(
+                media_id=f"incoming-{i}",
+                source=Sources.MAL.value,
+                media_type=MediaTypes.ANIME.value,
+                title=f"Incoming Anime {i}",
+                image="http://example.com/image.jpg",
+            )
+            Anime.objects.create(
+                item=anime_item,
+                user=self.user,
+                status=Status.IN_PROGRESS.value,
+                progress=1,
+            )
+            Event.objects.create(
+                item=anime_item,
+                content_number=2,
+                datetime=timezone.now() + timezone.timedelta(days=1),
+            )
+
+        response = self.client.get(
+            reverse("home")
+            + f"?load_status=incoming&load_media_type={MediaTypes.ANIME.value}",
+            headers={"hx-request": "true"},
+        )
+
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "app/components/home_grid.html")
+        self.assertEqual(response.context["home_status"], "incoming")
+        self.assertEqual(len(response.context["media_list"]["items"]), 1)
+        self.assertEqual(response.context["media_list"]["total"], 15)
+
     @patch("app.providers.services.get_media_metadata")
     def test_home_view_htmx_load_more(self, mock_get_media_metadata):
         """Test the HTMX load more functionality."""
diff --git a/src/app/views.py b/src/app/views.py
index 43f35298d..7151c8c76 100644
--- a/src/app/views.py
+++ b/src/app/views.py
@@ -36,49 +36,180 @@
 
 logger = logging.getLogger(__name__)
 
+HOME_SECTION_INCOMING = "incoming"
+
+
+def _build_home_section(key, media_types):
+    """Build home section payload."""
+    return {
+        "key": key,
+        "id": slugify(key),
+        "media_types": media_types,
+        "count": sum(media_list["total"] for media_list in media_types.values()),
+    }
+
+
+def _filter_home_media_types(media_types, predicate):
+    """Filter home media entries by predicate."""
+    filtered_media_types = {}
+    for media_type, media_list in media_types.items():
+        filtered_items = [media for media in media_list["items"] if predicate(media)]
+        if filtered_items:
+            filtered_media_types[media_type] = {
+                "items": filtered_items,
+                "total": len(filtered_items),
+            }
+    return filtered_media_types
+
+
+def _paginate_home_media_types(media_types, items_limit, page_start=0):
+    """Paginate already-grouped home media entries."""
+    paginated_media_types = {}
+    for media_type, media_list in media_types.items():
+        items = media_list["items"][page_start : page_start + items_limit]
+
+        if items:
+            paginated_media_types[media_type] = {
+                "items": items,
+                "total": media_list["total"],
+            }
+    return paginated_media_types
+
+
+def _is_incoming_media(media):
+    """Return True when media has a real upcoming release."""
+    return bool(media.next_event and not media.next_event.is_max_datetime)
+
+
+def _is_active_in_progress_media(media):
+    """Return True when media still has released backlog."""
+    if not _is_incoming_media(media):
+        return True
+
+    return media.max_progress is not None and media.progress < media.max_progress
+
+
+def _get_split_in_progress_media_types(request, sort_by, items_limit, page_start=0):
+    """Return incoming and in-progress media types split by upcoming event."""
+    all_in_progress_media_types = BasicMedia.objects.get_home_status(
+        user=request.user,
+        status=Status.IN_PROGRESS.value,
+        sort_by=sort_by,
+        items_limit=None,
+    )
+    incoming_media_types = _filter_home_media_types(
+        all_in_progress_media_types,
+        _is_incoming_media,
+    )
+    active_media_types = _filter_home_media_types(
+        all_in_progress_media_types,
+        _is_active_in_progress_media,
+    )
+
+    return {
+        HOME_SECTION_INCOMING: _paginate_home_media_types(
+            incoming_media_types,
+            items_limit,
+            page_start=page_start,
+        ),
+        Status.IN_PROGRESS.value: _paginate_home_media_types(
+            active_media_types,
+            items_limit,
+            page_start=page_start,
+        ),
+    }
+
+
+def _uses_split_home_sections(user, section_key):
+    """Return True when section uses split in-progress home data."""
+    return user.home_separate_incoming and section_key in (
+        HOME_SECTION_INCOMING,
+        Status.IN_PROGRESS.value,
+    )
+
+
+def _get_home_section_media_types(request, sort_by, section_key, items_limit):
+    """Return media types for home section, including virtual incoming section."""
+    if _uses_split_home_sections(request.user, section_key):
+        return _get_split_in_progress_media_types(request, sort_by, items_limit)[
+            section_key
+        ]
+
+    return BasicMedia.objects.get_home_status(
+        user=request.user,
+        status=section_key,
+        sort_by=sort_by,
+        items_limit=items_limit,
+    )
+
+
+def _get_home_load_more_media_types(
+    request,
+    sort_by,
+    section_key,
+    items_limit,
+    media_type_to_load,
+):
+    """Return load-more payload for a specific home section/media type."""
+    if _uses_split_home_sections(request.user, section_key):
+        return _get_split_in_progress_media_types(
+            request,
+            sort_by,
+            items_limit,
+            page_start=items_limit,
+        )[section_key]
+
+    return BasicMedia.objects.get_home_status(
+        user=request.user,
+        status=section_key,
+        sort_by=sort_by,
+        items_limit=items_limit,
+        specific_media_type=media_type_to_load,
+    )
+
+
+def _get_home_section_keys(user):
+    """Return ordered home section keys for current user."""
+    if user.home_separate_incoming:
+        return [Status.IN_PROGRESS.value, HOME_SECTION_INCOMING, Status.PLANNING.value]
+
+    return [Status.IN_PROGRESS.value, Status.PLANNING.value]
+
 
 @require_GET
 def home(request):
     """Home page with media items in progress and planning."""
     sort_by = request.user.update_preference("home_sort", request.GET.get("sort"))
     media_type_to_load = request.GET.get("load_media_type")
-    status_to_load = request.GET.get("load_status", Status.IN_PROGRESS.value)
+    section_to_load = request.GET.get("load_status", Status.IN_PROGRESS.value)
     items_limit = 14
 
     # If this is an HTMX request to load more items for a specific media type
     if request.headers.get("HX-Request") and media_type_to_load:
-        list_by_type = BasicMedia.objects.get_home_status(
-            user=request.user,
-            status=status_to_load,
-            sort_by=sort_by,
-            items_limit=items_limit,
-            specific_media_type=media_type_to_load,
+        list_by_type = _get_home_load_more_media_types(
+            request,
+            sort_by,
+            section_to_load,
+            items_limit,
+            media_type_to_load,
         )
-        context = {
-            "media_list": list_by_type.get(media_type_to_load, []),
-            "home_status": status_to_load,
-        }
-        return render(request, "app/components/home_grid.html", context)
-
-    home_sections = []
-    for status in (Status.IN_PROGRESS.value, Status.PLANNING.value):
-        media_types = BasicMedia.objects.get_home_status(
-            user=request.user,
-            status=status,
-            sort_by=sort_by,
-            items_limit=items_limit,
-        )
-        home_sections.append(
+        return render(
+            request,
+            "app/components/home_grid.html",
             {
-                "key": status,
-                "id": slugify(status),
-                "media_types": media_types,
-                "count": sum(
-                    media_list["total"] for media_list in media_types.values()
-                ),
+                "media_list": list_by_type.get(media_type_to_load, []),
+                "home_status": section_to_load,
             },
         )
 
+    home_sections = [
+        _build_home_section(
+            section_key,
+            _get_home_section_media_types(request, sort_by, section_key, items_limit),
+        )
+        for section_key in _get_home_section_keys(request.user)
+    ]
+
     context = {
         "home_sections": home_sections,
         "current_sort": sort_by,
diff --git a/src/templates/app/components/home_grid.html b/src/templates/app/components/home_grid.html
index 983fa29f7..eb3c9218a 100644
--- a/src/templates/app/components/home_grid.html
+++ b/src/templates/app/components/home_grid.html
@@ -1,6 +1,9 @@
 {% load app_tags %}
 
 {% for media in media_list.items %}
+  {% component_id 'track' media.item media.id as track_component_id %}
+  {% component_id 'lists' media.item as lists_component_id %}
+  {% component_id 'history' media.item as history_component_id %}
   <div class="bg-[#2a2f35] rounded-lg overflow-hidden shadow-lg transition-all duration-300"
        x-data="{ trackOpen: false, listsOpen: false, historyOpen: false }">
     <div class="relative">
@@ -28,14 +31,14 @@
       {% endif %}
 
       <div class="absolute inset-0 flex items-center justify-center bg-black/50 opacity-0 hover-tap:opacity-100{% if user.clickable_media_cards %} pointer-coarse:hidden{% endif %}">
-        <a href="{{ media.item|media_url }}" class="absolute inset-0"></a>
+        <a href="{{ media.item|media_url }}" class="absolute inset-0 z-0"></a>
 
-        <div class="relative flex items-center justify-center space-x-2.5">
+        <div class="relative z-10 flex items-center justify-center space-x-2.5">
           <button class="cursor-pointer rounded-full bg-indigo-600 p-2.5 text-white transition-all duration-200 hover:scale-110 hover:bg-indigo-500 hover:shadow-[0_0_15px_rgba(99,102,241,0.5)]"
                   title="Add to tracker"
                   hx-get="{% media_view_url 'track_modal' media.item %}"
                   hx-vals='{"return_url": "{{ request.get_full_path|urlencode }}", "instance_id": "{{ media.id }}"}'
-                  hx-target="#{% component_id 'track' media.item media.id %}"
+                  hx-target="#{{ track_component_id }}{% if home_status == 'incoming' %}-incoming{% endif %}"
                   hx-trigger="click once"
                   @click="trackOpen = true">{% include "app/icons/edit.svg" with classes="w-4 h-4" %}</button>
 
@@ -43,7 +46,7 @@
                   title="Add to custom lists"
                   hx-get="{% media_view_url 'lists_modal' media.item %}"
                   hx-vals='{"return_url": "{{ request.get_full_path|urlencode }}"}'
-                  hx-target="#{% component_id 'lists' media.item %}"
+                  hx-target="#{{ lists_component_id }}{% if home_status == 'incoming' %}-incoming{% endif %}"
                   hx-trigger="click once"
                   @click="listsOpen = true">{% include "app/icons/list-add.svg" with classes="w-4 h-4" %}</button>
 
@@ -51,7 +54,7 @@
                   title="View your activity history"
                   hx-get="{% media_view_url 'history_modal' media.item %}"
                   hx-vals='{"return_url": "{{ request.get_full_path|urlencode }}"}'
-                  hx-target="#{% component_id 'history' media.item %}"
+                  hx-target="#{{ history_component_id }}{% if home_status == 'incoming' %}-incoming{% endif %}"
                   hx-trigger="click once"
                   @click="historyOpen = true">{% include "app/icons/history.svg" with classes="w-4 h-4" %}</button>
         </div>
@@ -64,7 +67,7 @@
          title="{{ media }}">{{ media }}</a>
     </div>
 
-    {% if home_status == Status.PLANNING.value %}
+    {% if home_status == Status.PLANNING.value or home_status == 'incoming' %}
       {% if user.progress_bar %}<div class="h-[5px] {{ Status.PLANNING.value|status_background_color }}"></div>{% endif %}
     {% else %}
       <div id="progress-{{ media.item.media_type }}-{{ media.id }}">
@@ -77,7 +80,7 @@
          class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
       <div class="relative z-60 max-h-[90vh] w-152 px-4 md:px-0"
            @click.outside="trackOpen = false">
-        <div id="{% component_id 'track' media.item media.id %}"></div>
+        <div id="{{ track_component_id }}{% if home_status == 'incoming' %}-incoming{% endif %}"></div>
       </div>
     </div>
 
@@ -86,7 +89,7 @@
          class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
       <div class="relative z-60 max-h-[90vh] w-96 px-4 md:px-0"
            @click.outside="listsOpen = false">
-        <div id="{% component_id 'lists' media.item %}"></div>
+        <div id="{{ lists_component_id }}{% if home_status == 'incoming' %}-incoming{% endif %}"></div>
       </div>
     </div>
 
@@ -95,7 +98,7 @@
          class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
       <div class="relative z-60 max-h-[90vh] w-96 px-4 md:px-0"
            @click.outside="historyOpen = false">
-        <div id="{% component_id 'history' media.item %}"></div>
+        <div id="{{ history_component_id }}{% if home_status == 'incoming' %}-incoming{% endif %}"></div>
       </div>
     </div>
   </div>
diff --git a/src/templates/app/components/home_section.html b/src/templates/app/components/home_section.html
index 68d440a80..d7b8b459a 100644
--- a/src/templates/app/components/home_section.html
+++ b/src/templates/app/components/home_section.html
@@ -4,19 +4,29 @@
   <div class="space-y-4">
     <div class="flex items-center justify-between gap-4">
       <div class="flex items-center gap-3">
-        <div class="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-[#39404b] {% if section.key == Status.IN_PROGRESS.value %}{{ Status.IN_PROGRESS.value|status_color }}{% else %}{{ Status.PLANNING.value|status_color }}{% endif %}">
-          {% if section.key == Status.IN_PROGRESS.value %}
+        <div class="flex h-10 w-10 shrink-0 items-center justify-center rounded-lg bg-[#39404b] {% if section.key == 'incoming' or section.key == Status.IN_PROGRESS.value %}{{ Status.IN_PROGRESS.value|status_color }}{% else %}{{ Status.PLANNING.value|status_color }}{% endif %}">
+          {% if section.key == 'incoming' %}
+            {% include "app/icons/clock-reversing.svg" with classes="h-5 w-5" %}
+          {% elif section.key == Status.IN_PROGRESS.value %}
             {% include "app/icons/states/in-progress.svg" with classes="h-5 w-5" %}
           {% else %}
             {% include "app/icons/states/planning.svg" with classes="h-5 w-5" %}
           {% endif %}
         </div>
         <div>
-          <h2 class="text-2xl font-semibold text-white">{{ section.key|media_status_readable|title }}</h2>
+          <h2 class="text-2xl font-semibold text-white">
+            {% if section.key == 'incoming' %}
+              Incoming
+            {% else %}
+              {{ section.key|media_status_readable|title }}
+            {% endif %}
+          </h2>
         </div>
       </div>
       <span class="inline-flex items-center gap-2 rounded-full border border-gray-700 bg-[#39404b] px-3 py-1 text-sm text-gray-300">
-        {% if section.key == Status.IN_PROGRESS.value %}
+        {% if section.key == 'incoming' %}
+          {% include "app/icons/clock.svg" with classes="h-4 w-4 text-indigo-400" %}
+        {% elif section.key == Status.IN_PROGRESS.value %}
           {% include "app/icons/pulse.svg" with classes="h-4 w-4 text-indigo-400" %}
         {% else %}
           {% include "app/icons/leaf.svg" with classes="h-4 w-4 text-sky-400" %}
@@ -25,9 +35,9 @@ <h2 class="text-2xl font-semibold text-white">{{ section.key|media_status_readab
       </span>
     </div>
     <div class="relative h-px overflow-hidden rounded-full bg-gray-700/80">
-      <div class="absolute inset-y-0 left-0 w-full bg-linear-to-r {% if section.key == Status.IN_PROGRESS.value %}from-indigo-400 via-indigo-400/45 to-indigo-400/8{% else %}from-sky-400 via-sky-400/45 to-sky-400/8{% endif %}">
+      <div class="absolute inset-y-0 left-0 w-full bg-linear-to-r {% if section.key == 'incoming' or section.key == Status.IN_PROGRESS.value %}from-indigo-400 via-indigo-400/45 to-indigo-400/8{% else %}from-sky-400 via-sky-400/45 to-sky-400/8{% endif %}">
       </div>
-      <div class="absolute top-1/2 left-0 h-1.5 w-1.5 -translate-y-1/2 rounded-full {% if section.key == Status.IN_PROGRESS.value %}bg-indigo-400{% else %}bg-sky-400{% endif %}">
+      <div class="absolute top-1/2 left-0 h-1.5 w-1.5 -translate-y-1/2 rounded-full {% if section.key == 'incoming' or section.key == Status.IN_PROGRESS.value %}bg-indigo-400{% else %}bg-sky-400{% endif %}">
       </div>
     </div>
   </div>
@@ -59,7 +69,7 @@ <h3 class="text-lg font-semibold text-white">{{ media_type|media_type_readable_p
               <div id="loading-indicator-{{ section.id }}-{{ media_type }}"
                    class="htmx-indicator hidden text-center">
                 <div class="inline-flex items-center justify-center">
-                  <div class="h-8 w-8 animate-spin rounded-full border-b-2 {% if section.key == Status.IN_PROGRESS.value %}border-indigo-400{% else %}border-sky-400{% endif %}">
+                  <div class="h-8 w-8 animate-spin rounded-full border-b-2 {% if section.key == 'incoming' or section.key == Status.IN_PROGRESS.value %}border-indigo-400{% else %}border-sky-400{% endif %}">
                   </div>
                 </div>
               </div>
@@ -71,29 +81,35 @@ <h3 class="text-lg font-semibold text-white">{{ media_type|media_type_readable_p
   {% else %}
     <div class="flex flex-col items-center justify-center rounded-lg border border-dashed border-gray-700 bg-[#2a2f35] px-6 py-16 text-center">
       <div class="mb-4 flex h-16 w-16 items-center justify-center rounded-full bg-[#39404b]">
-        {% if section.key == Status.IN_PROGRESS.value %}
+        {% if section.key == 'incoming' %}
+          {% include "app/icons/clock.svg" with classes="h-8 w-8 text-indigo-300" %}
+        {% elif section.key == Status.IN_PROGRESS.value %}
           {% include "app/icons/pulse.svg" with classes="h-8 w-8 text-indigo-300" %}
         {% else %}
           {% include "app/icons/leaf.svg" with classes="h-8 w-8 text-sky-400" %}
         {% endif %}
       </div>
       <h3 class="text-xl font-semibold text-white">
-        {% if section.key == Status.IN_PROGRESS.value %}
+        {% if section.key == 'incoming' %}
+          No incoming releases yet
+        {% elif section.key == Status.IN_PROGRESS.value %}
           Nothing is actively moving right now
         {% else %}
           Your planning shelf is still empty
         {% endif %}
       </h3>
       <p class="mt-2 max-w-md text-sm text-gray-400">
-        {% if section.key == Status.IN_PROGRESS.value %}
+        {% if section.key == 'incoming' %}
+          Titles with upcoming episodes, chapters, or releases will show up here.
+        {% elif section.key == Status.IN_PROGRESS.value %}
           Start a title and mark it as in progress to see quick updates and release reminders here.
         {% else %}
           Add a few titles to planning to see them here.
         {% endif %}
       </p>
       <div class="mt-6">
-        <a href="{% if section.key == Status.IN_PROGRESS.value %}{{ MediaTypes.TV.value|sample_search }}{% else %}{{ MediaTypes.MOVIE.value|sample_search }}{% endif %}"
-           class="inline-flex items-center gap-2 rounded-md {% if section.key == Status.IN_PROGRESS.value %}bg-indigo-600 hover:bg-indigo-700{% else %}bg-sky-600 hover:bg-sky-700{% endif %} px-4 py-2 text-sm font-medium text-white transition-colors">
+        <a href="{% if section.key == Status.PLANNING.value %}{{ MediaTypes.MOVIE.value|sample_search }}{% else %}{{ MediaTypes.TV.value|sample_search }}{% endif %}"
+           class="inline-flex items-center gap-2 rounded-md {% if section.key == Status.PLANNING.value %}bg-sky-600 hover:bg-sky-700{% else %}bg-indigo-600 hover:bg-indigo-700{% endif %} px-4 py-2 text-sm font-medium text-white transition-colors">
           {% include "app/icons/magnifying-glass.svg" with classes="h-4 w-4" %}
           Browse media
         </a>
diff --git a/src/templates/users/preferences.html b/src/templates/users/preferences.html
index 82fe1ded6..ab8b4ee53 100644
--- a/src/templates/users/preferences.html
+++ b/src/templates/users/preferences.html
@@ -40,6 +40,29 @@ <h2 class="text-xl font-semibold">Preferences</h2>
         </div>
       </div>
 
+      {# Home Incoming Section #}
+      <div class="mb-5">
+        <div class="flex items-center justify-between p-3 bg-[#39404b] rounded-md">
+          <div class="flex-1">
+            <div class="flex items-center text-gray-200 mb-1">
+              {% include "app/icons/clock-reversing.svg" with classes="w-5 h-5 mr-2" %}
+              <span class="text-sm font-medium">Separate incoming on home page</span>
+            </div>
+            <p class="text-xs text-gray-400 ml-7">
+              Split home page in-progress titles into separate Incoming and In Progress sections based on upcoming releases.
+            </p>
+          </div>
+          <label class="relative inline-flex items-center cursor-pointer ml-4">
+            <input class="sr-only peer"
+                   type="checkbox"
+                   name="home_separate_incoming"
+                   {% if user.home_separate_incoming %}checked{% endif %}>
+            <div class="w-9 h-5 bg-gray-600 rounded-full peer peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-px after:left-0.5 after:bg-white after:border-gray-300 after:border after:rounded-full after:h-4.5 after:w-4.5 after:transition-all peer-checked:bg-indigo-600">
+            </div>
+          </label>
+        </div>
+      </div>
+
       {# Quick Watch Date #}
       <div class="mb-5">
         <div class="flex items-center justify-between p-3 bg-[#39404b] rounded-md">
diff --git a/src/users/migrations/0051_user_home_separate_incoming.py b/src/users/migrations/0051_user_home_separate_incoming.py
new file mode 100644
index 000000000..0b119a837
--- /dev/null
+++ b/src/users/migrations/0051_user_home_separate_incoming.py
@@ -0,0 +1,18 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0050_user_watch_provider_region"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="home_separate_incoming",
+            field=models.BooleanField(
+                default=False,
+                help_text="Separate incoming media from in-progress on home page",
+            ),
+        ),
+    ]
diff --git a/src/users/models.py b/src/users/models.py
index cd18e007b..c21402cee 100644
--- a/src/users/models.py
+++ b/src/users/models.py
@@ -290,6 +290,10 @@ class User(AbstractUser):
         default=False,
         help_text="Hide hover overlay on touch devices",
     )
+    home_separate_incoming = models.BooleanField(
+        default=False,
+        help_text="Separate incoming media from in-progress on home page",
+    )
 
     # Tracking settings
     quick_watch_date = models.CharField(
diff --git a/src/users/tests/views/test_sidebar.py b/src/users/tests/views/test_sidebar.py
index d4e869873..0d3cddd08 100644
--- a/src/users/tests/views/test_sidebar.py
+++ b/src/users/tests/views/test_sidebar.py
@@ -36,12 +36,14 @@ def test_sidebar_post_update_preferences(self):
         response = self.client.post(
             reverse("preferences"),
             {
+                "home_separate_incoming": "on",
                 "media_types_checkboxes": [MediaTypes.TV.value, MediaTypes.ANIME.value],
             },
         )
         self.assertRedirects(response, reverse("preferences"))
 
         self.user.refresh_from_db()
+        self.assertTrue(self.user.home_separate_incoming)
         self.assertTrue(self.user.tv_enabled)
         self.assertFalse(self.user.movie_enabled)
         self.assertTrue(self.user.anime_enabled)
diff --git a/src/users/views.py b/src/users/views.py
index c3e45805b..5b9316b58 100644
--- a/src/users/views.py
+++ b/src/users/views.py
@@ -236,6 +236,7 @@ def preferences(request):
 
     # Process form submission
     request.user.clickable_media_cards = "clickable_media_cards" in request.POST
+    request.user.home_separate_incoming = "home_separate_incoming" in request.POST
     request.user.quick_watch_date = request.POST.get(
         "quick_watch_date",
         QuickWatchDateChoices.CURRENT_DATE,

From 961dd3e0fb7748ff46ba40586b97026851bacd5a Mon Sep 17 00:00:00 2001
From: thespbgamer <thespbgamer@outlook.com>
Date: Wed, 22 Apr 2026 19:09:00 +0100
Subject: [PATCH 2/3] Fix pagination issue

---
 src/app/tests/views/test_home.py | 6 +++---
 src/app/views.py                 | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/app/tests/views/test_home.py b/src/app/tests/views/test_home.py
index f9e834524..a7465d484 100644
--- a/src/app/tests/views/test_home.py
+++ b/src/app/tests/views/test_home.py
@@ -246,7 +246,7 @@ def test_home_view_htmx_load_more_for_incoming(self):
         self.user.home_separate_incoming = True
         self.user.save(update_fields=["home_separate_incoming"])
 
-        for i in range(6, 20):
+        for i in range(6, 36):
             anime_item = Item.objects.create(
                 media_id=f"incoming-{i}",
                 source=Sources.MAL.value,
@@ -275,8 +275,8 @@ def test_home_view_htmx_load_more_for_incoming(self):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "app/components/home_grid.html")
         self.assertEqual(response.context["home_status"], "incoming")
-        self.assertEqual(len(response.context["media_list"]["items"]), 1)
-        self.assertEqual(response.context["media_list"]["total"], 15)
+        self.assertEqual(len(response.context["media_list"]["items"]), 17)
+        self.assertEqual(response.context["media_list"]["total"], 31)
 
     @patch("app.providers.services.get_media_metadata")
     def test_home_view_htmx_load_more(self, mock_get_media_metadata):
diff --git a/src/app/views.py b/src/app/views.py
index 7151c8c76..b565abafc 100644
--- a/src/app/views.py
+++ b/src/app/views.py
@@ -66,7 +66,8 @@ def _paginate_home_media_types(media_types, items_limit, page_start=0):
     """Paginate already-grouped home media entries."""
     paginated_media_types = {}
     for media_type, media_list in media_types.items():
-        items = media_list["items"][page_start : page_start + items_limit]
+        page_end = None if items_limit is None else page_start + items_limit
+        items = media_list["items"][page_start:page_end]
 
         if items:
             paginated_media_types[media_type] = {
@@ -155,7 +156,7 @@ def _get_home_load_more_media_types(
         return _get_split_in_progress_media_types(
             request,
             sort_by,
-            items_limit,
+            None,
             page_start=items_limit,
         )[section_key]
 

From 81e4cfc1a25b9b27272b6b210b11515e4c193296 Mon Sep 17 00:00:00 2001
From: thespbgamer <thespbgamer@outlook.com>
Date: Wed, 22 Apr 2026 19:13:43 +0100
Subject: [PATCH 3/3] Fix performance issue

---
 src/app/views.py | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/app/views.py b/src/app/views.py
index b565abafc..9657b2519 100644
--- a/src/app/views.py
+++ b/src/app/views.py
@@ -129,12 +129,22 @@ def _uses_split_home_sections(user, section_key):
     )
 
 
-def _get_home_section_media_types(request, sort_by, section_key, items_limit):
+def _get_home_section_media_types(
+    request,
+    sort_by,
+    section_key,
+    items_limit,
+    split_media_types=None,
+):
     """Return media types for home section, including virtual incoming section."""
     if _uses_split_home_sections(request.user, section_key):
-        return _get_split_in_progress_media_types(request, sort_by, items_limit)[
-            section_key
-        ]
+        if split_media_types is None:
+            split_media_types = _get_split_in_progress_media_types(
+                request,
+                sort_by,
+                items_limit,
+            )
+        return split_media_types[section_key]
 
     return BasicMedia.objects.get_home_status(
         user=request.user,
@@ -203,10 +213,24 @@ def home(request):
             },
         )
 
+    split_media_types = None
+    if request.user.home_separate_incoming:
+        split_media_types = _get_split_in_progress_media_types(
+            request,
+            sort_by,
+            items_limit,
+        )
+
     home_sections = [
         _build_home_section(
             section_key,
-            _get_home_section_media_types(request, sort_by, section_key, items_limit),
+            _get_home_section_media_types(
+                request,
+                sort_by,
+                section_key,
+                items_limit,
+                split_media_types=split_media_types,
+            ),
         )
         for section_key in _get_home_section_keys(request.user)
     ]