Add Filmpalast plugin search flow and bump to 0.1.50

.gitignore

@@ -6,3 +6,8 @@
 
 # Build outputs
 /dist/
+
+# Local tests (not committed)
+/tests/
+/.pytest_cache/
+/pytest.ini

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

README.md

@@ -20,5 +20,10 @@ ViewIT ist ein Kodi‑Addon zum Durchsuchen und Abspielen von Inhalten der unter
 - Plugins: `addon/plugins/*_plugin.py`
 - Einstellungen: `addon/resources/settings.xml`
 
+## Tests mit Abdeckung
+- Dev-Abhängigkeiten installieren: `./.venv/bin/pip install -r requirements-dev.txt`
+- Tests + Coverage starten: `./.venv/bin/pytest`
+- Optional (XML-Report): `./.venv/bin/pytest --cov-report=xml`
+
 ## Dokumentation
 Siehe `docs/`.

addon/addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.viewit" name="ViewIt" version="0.1.47" provider-name="ViewIt">
+<addon id="plugin.video.viewit" name="ViewIt" version="0.1.50" provider-name="ViewIt">
   <requires>
     <import addon="xbmc.python" version="3.0.0" />
     <import addon="script.module.requests" />

addon/default.py

@@ -147,6 +147,45 @@ def _busy_dialog():
         _busy_close()
 
 
+@contextmanager
+def _progress_dialog(heading: str, message: str = ""):
+    """Zeigt einen Fortschrittsdialog in Kodi und liefert eine Update-Funktion."""
+    dialog = None
+    try:  # pragma: no cover - Kodi runtime
+        if xbmcgui is not None and hasattr(xbmcgui, "DialogProgress"):
+            dialog = xbmcgui.DialogProgress()
+            dialog.create(heading, message)
+    except Exception:
+        dialog = None
+
+    def _update(percent: int, text: str = "") -> bool:
+        if dialog is None:
+            return False
+        percent = max(0, min(100, int(percent)))
+        try:  # Kodi Matrix/Nexus
+            dialog.update(percent, text)
+        except TypeError:
+            try:  # Kodi Leia fallback
+                dialog.update(percent, text, "", "")
+            except Exception:
+                pass
+        except Exception:
+            pass
+        try:
+            return bool(dialog.iscanceled())
+        except Exception:
+            return False
+
+    try:
+        yield _update
+    finally:
+        if dialog is not None:
+            try:
+                dialog.close()
+            except Exception:
+                pass
+
+
 def _get_handle() -> int:
     return int(sys.argv[1]) if len(sys.argv) > 1 else -1
 
@@ -919,21 +958,27 @@ def _show_plugin_search_results(plugin_name: str, query: str) -> None:
     _set_content(handle, "movies" if plugin_name.casefold() == "einschalten" else "tvshows")
     _log(f"Suche nach Titeln (Plugin={plugin_name}): {query}")
 
+    list_items: list[dict[str, object]] = []
+    canceled = False
     try:
+        with _progress_dialog("Suche läuft", f"{plugin_name} (1/1) starte…") as progress:
+            canceled = progress(5, f"{plugin_name} (1/1) Suche…")
             results = _run_async(plugin.search_titles(query))
-    except Exception as exc:
-        _log(f"Suche fehlgeschlagen ({plugin_name}): {exc}", xbmc.LOGWARNING)
-        xbmcgui.Dialog().notification("Suche", "Suche fehlgeschlagen.", xbmcgui.NOTIFICATION_INFO, 3000)
-        xbmcplugin.endOfDirectory(handle)
-        return
-
             results = [str(t).strip() for t in (results or []) if t and str(t).strip()]
             results.sort(key=lambda value: value.casefold())
+
             tmdb_prefetched: dict[str, tuple[dict[str, str], dict[str, str], list[TmdbCastMember]]] = {}
-    if results:
-        with _busy_dialog():
+            if results and not canceled:
+                canceled = progress(35, f"{plugin_name} (1/1) Metadaten…")
                 tmdb_prefetched = _tmdb_labels_and_art_bulk(list(results))
-    for title in results:
+
+            total_results = max(1, len(results))
+            for index, title in enumerate(results, start=1):
+                if canceled:
+                    break
+                if index == 1 or index == total_results or (index % 10 == 0):
+                    pct = 35 + int((index / float(total_results)) * 60)
+                    canceled = progress(pct, f"{plugin_name} (1/1) aufbereiten {index}/{total_results}")
                 info_labels, art, cast = tmdb_prefetched.get(title, _tmdb_labels_and_art(title))
                 info_labels = dict(info_labels or {})
                 info_labels.setdefault("mediatype", "tvshow")
@@ -944,15 +989,38 @@ def _show_plugin_search_results(plugin_name: str, query: str) -> None:
                 display_label = _label_with_duration(title, info_labels)
                 display_label = _label_with_playstate(display_label, playstate)
                 direct_play = bool(plugin_name.casefold() == "einschalten" and _get_setting_bool("einschalten_enable_playback", default=False))
+                extra_params = _series_url_params(plugin, title)
+                list_items.append(
+                    {
+                        "label": display_label,
+                        "action": "play_movie" if direct_play else "seasons",
+                        "params": {"plugin": plugin_name, "title": title, **extra_params},
+                        "is_folder": (not direct_play),
+                        "info_labels": merged_info,
+                        "art": art,
+                        "cast": cast,
+                    }
+                )
+    except Exception as exc:
+        _log(f"Suche fehlgeschlagen ({plugin_name}): {exc}", xbmc.LOGWARNING)
+        xbmcgui.Dialog().notification("Suche", "Suche fehlgeschlagen.", xbmcgui.NOTIFICATION_INFO, 3000)
+        xbmcplugin.endOfDirectory(handle)
+        return
+    if canceled and not list_items:
+        xbmcgui.Dialog().notification("Suche", "Suche abgebrochen.", xbmcgui.NOTIFICATION_INFO, 2500)
+        xbmcplugin.endOfDirectory(handle)
+        return
+
+    for item in list_items:
         _add_directory_item(
             handle,
-            display_label,
-            "play_movie" if direct_play else "seasons",
-            {"plugin": plugin_name, "title": title},
-            is_folder=not direct_play,
-            info_labels=merged_info,
-            art=art,
-            cast=cast,
+            str(item["label"]),
+            str(item["action"]),
+            dict(item["params"]),
+            is_folder=bool(item["is_folder"]),
+            info_labels=item["info_labels"],
+            art=item["art"],
+            cast=item["cast"],
         )
     xbmcplugin.endOfDirectory(handle)
 
@@ -1025,6 +1093,17 @@ def _run_async(coro):
     return asyncio.run(coro)
 
 
+def _series_url_params(plugin: BasisPlugin, title: str) -> dict[str, str]:
+    getter = getattr(plugin, "series_url_for_title", None)
+    if not callable(getter):
+        return {}
+    try:
+        series_url = str(getter(title) or "").strip()
+    except Exception:
+        return {}
+    return {"series_url": series_url} if series_url else {}
+
+
 def _show_search() -> None:
     _log("Suche gestartet.")
     dialog = xbmcgui.Dialog()
@@ -1046,18 +1125,42 @@ def _show_search_results(query: str) -> None:
         xbmcgui.Dialog().notification("Suche", "Keine Plugins gefunden.", xbmcgui.NOTIFICATION_INFO, 3000)
         xbmcplugin.endOfDirectory(handle)
         return
-    for plugin_name, plugin in plugins.items():
+    list_items: list[dict[str, object]] = []
+    canceled = False
+    plugin_entries = list(plugins.items())
+    total_plugins = max(1, len(plugin_entries))
+    with _progress_dialog("Suche läuft", "Suche gestartet…") as progress:
+        for plugin_index, (plugin_name, plugin) in enumerate(plugin_entries, start=1):
+            range_start = int(((plugin_index - 1) / float(total_plugins)) * 100)
+            range_end = int((plugin_index / float(total_plugins)) * 100)
+            canceled = progress(range_start, f"{plugin_name} ({plugin_index}/{total_plugins}) Suche…")
+            if canceled:
+                break
             try:
                 results = _run_async(plugin.search_titles(query))
             except Exception as exc:
                 _log(f"Suche fehlgeschlagen ({plugin_name}): {exc}", xbmc.LOGWARNING)
                 continue
+            results = [str(t).strip() for t in (results or []) if t and str(t).strip()]
             _log(f"Treffer ({plugin_name}): {len(results)}", xbmc.LOGDEBUG)
             tmdb_prefetched: dict[str, tuple[dict[str, str], dict[str, str], list[TmdbCastMember]]] = {}
             if results:
-            with _busy_dialog():
+                canceled = progress(
+                    range_start + int((range_end - range_start) * 0.35),
+                    f"{plugin_name} ({plugin_index}/{total_plugins}) Metadaten…",
+                )
+                if canceled:
+                    break
                 tmdb_prefetched = _tmdb_labels_and_art_bulk(list(results))
-        for title in results:
+            total_results = max(1, len(results))
+            for title_index, title in enumerate(results, start=1):
+                if title_index == 1 or title_index == total_results or (title_index % 10 == 0):
+                    canceled = progress(
+                        range_start + int((range_end - range_start) * (0.35 + 0.65 * (title_index / float(total_results)))),
+                        f"{plugin_name} ({plugin_index}/{total_plugins}) aufbereiten {title_index}/{total_results}",
+                    )
+                    if canceled:
+                        break
                 info_labels, art, cast = tmdb_prefetched.get(title, _tmdb_labels_and_art(title))
                 info_labels = dict(info_labels or {})
                 info_labels.setdefault("mediatype", "tvshow")
@@ -1071,20 +1174,42 @@ def _show_search_results(query: str) -> None:
                 direct_play = bool(
                     plugin_name.casefold() == "einschalten" and _get_setting_bool("einschalten_enable_playback", default=False)
                 )
+                extra_params = _series_url_params(plugin, title)
+                list_items.append(
+                    {
+                        "label": label,
+                        "action": "play_movie" if direct_play else "seasons",
+                        "params": {"plugin": plugin_name, "title": title, **extra_params},
+                        "is_folder": (not direct_play),
+                        "info_labels": merged_info,
+                        "art": art,
+                        "cast": cast,
+                    }
+                )
+            if canceled:
+                break
+        if not canceled:
+            progress(100, "Suche abgeschlossen")
+    if canceled and not list_items:
+        xbmcgui.Dialog().notification("Suche", "Suche abgebrochen.", xbmcgui.NOTIFICATION_INFO, 2500)
+        xbmcplugin.endOfDirectory(handle)
+        return
+
+    for item in list_items:
         _add_directory_item(
             handle,
-                label,
-                "play_movie" if direct_play else "seasons",
-                {"plugin": plugin_name, "title": title},
-                is_folder=not direct_play,
-                info_labels=merged_info,
-                art=art,
-                cast=cast,
+            str(item["label"]),
+            str(item["action"]),
+            dict(item["params"]),
+            is_folder=bool(item["is_folder"]),
+            info_labels=item["info_labels"],
+            art=item["art"],
+            cast=item["cast"],
         )
     xbmcplugin.endOfDirectory(handle)
 
 
-def _show_seasons(plugin_name: str, title: str) -> None:
+def _show_seasons(plugin_name: str, title: str, series_url: str = "") -> None:
     handle = _get_handle()
     _log(f"Staffeln laden: {plugin_name} / {title}")
     plugin = _discover_plugins().get(plugin_name)
@@ -1092,6 +1217,13 @@ def _show_seasons(plugin_name: str, title: str) -> None:
         xbmcgui.Dialog().notification("Staffeln", "Plugin nicht gefunden.", xbmcgui.NOTIFICATION_INFO, 3000)
         xbmcplugin.endOfDirectory(handle)
         return
+    if series_url:
+        remember_series_url = getattr(plugin, "remember_series_url", None)
+        if callable(remember_series_url):
+            try:
+                remember_series_url(title, series_url)
+            except Exception:
+                pass
 
     # Einschalten liefert Filme. Für Playback soll nach dem Öffnen des Titels direkt ein
     # einzelnes abspielbares Item angezeigt werden: <Titel> -> (<Titel> abspielbar).
@@ -1103,11 +1235,14 @@ def _show_seasons(plugin_name: str, title: str) -> None:
         info_labels: dict[str, object] = {"title": title, "mediatype": "movie"}
         info_labels = _apply_playstate_to_info(info_labels, playstate)
         display_label = _label_with_playstate(title, playstate)
+        movie_params = {"plugin": plugin_name, "title": title}
+        if series_url:
+            movie_params["series_url"] = series_url
         _add_directory_item(
             handle,
             display_label,
             "play_movie",
-            {"plugin": plugin_name, "title": title},
+            movie_params,
             is_folder=False,
             info_labels=info_labels,
         )
@@ -1126,11 +1261,16 @@ def _show_seasons(plugin_name: str, title: str) -> None:
                 info_labels: dict[str, object] = {"title": title, "mediatype": "movie"}
                 info_labels = _apply_playstate_to_info(info_labels, playstate)
                 display_label = _label_with_playstate(title, playstate)
+                movie_params = {"plugin": plugin_name, "title": title}
+                if series_url:
+                    movie_params["series_url"] = series_url
+                else:
+                    movie_params.update(_series_url_params(plugin, title))
                 _add_directory_item(
                     handle,
                     display_label,
                     "play_movie",
-                    {"plugin": plugin_name, "title": title},
+                    movie_params,
                     is_folder=False,
                     info_labels=info_labels,
                 )
@@ -1227,7 +1367,7 @@ def _show_seasons(plugin_name: str, title: str) -> None:
             handle,
             _label_with_playstate(season, season_state),
             "episodes",
-            {"plugin": plugin_name, "title": title, "season": season},
+            {"plugin": plugin_name, "title": title, "season": season, "series_url": series_url},
             is_folder=True,
             info_labels=merged_labels or None,
             art=merged_art,
@@ -1236,7 +1376,7 @@ def _show_seasons(plugin_name: str, title: str) -> None:
     xbmcplugin.endOfDirectory(handle)
 
 
-def _show_episodes(plugin_name: str, title: str, season: str) -> None:
+def _show_episodes(plugin_name: str, title: str, season: str, series_url: str = "") -> None:
     handle = _get_handle()
     _log(f"Episoden laden: {plugin_name} / {title} / {season}")
     plugin = _discover_plugins().get(plugin_name)
@@ -1244,6 +1384,13 @@ def _show_episodes(plugin_name: str, title: str, season: str) -> None:
         xbmcgui.Dialog().notification("Episoden", "Plugin nicht gefunden.", xbmcgui.NOTIFICATION_INFO, 3000)
         xbmcplugin.endOfDirectory(handle)
         return
+    if series_url:
+        remember_series_url = getattr(plugin, "remember_series_url", None)
+        if callable(remember_series_url):
+            try:
+                remember_series_url(title, series_url)
+            except Exception:
+                pass
     season_number = _extract_first_int(season)
     if season_number is not None:
         xbmcplugin.setPluginCategory(handle, f"{title} - Staffel {season_number}")
@@ -1439,7 +1586,7 @@ def _show_genre_titles_page(plugin_name: str, genre: str, page: int = 1) -> None
                         handle,
                         display_label,
                         "play_movie" if direct_play else "seasons",
-                        {"plugin": plugin_name, "title": title},
+                        {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
                         is_folder=not direct_play,
                         info_labels=info_labels,
                         art=art,
@@ -1456,7 +1603,7 @@ def _show_genre_titles_page(plugin_name: str, genre: str, page: int = 1) -> None
                     handle,
                     _label_with_playstate(title, playstate),
                     "play_movie" if direct_play else "seasons",
-                    {"plugin": plugin_name, "title": title},
+                    {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
                     is_folder=not direct_play,
                     info_labels=_apply_playstate_to_info({"title": title}, playstate),
                 )
@@ -1672,7 +1819,7 @@ def _show_popular(plugin_name: str | None = None, page: int = 1) -> None:
                             handle,
                             display_label,
                             "seasons",
-                            {"plugin": plugin_name, "title": title},
+                            {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
                             is_folder=True,
                             info_labels=info_labels,
                             art=art,
@@ -1685,7 +1832,7 @@ def _show_popular(plugin_name: str | None = None, page: int = 1) -> None:
                         handle,
                         _label_with_playstate(title, playstate),
                         "seasons",
-                        {"plugin": plugin_name, "title": title},
+                        {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
                         is_folder=True,
                         info_labels=_apply_playstate_to_info({"title": title}, playstate),
                     )
@@ -1817,7 +1964,7 @@ def _show_new_titles(plugin_name: str, page: int = 1) -> None:
                         handle,
                         display_label,
                         "play_movie" if direct_play else "seasons",
-                        {"plugin": plugin_name, "title": title},
+                        {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
                         is_folder=not direct_play,
                         info_labels=info_labels,
                         art=art,
@@ -1834,7 +1981,7 @@ def _show_new_titles(plugin_name: str, page: int = 1) -> None:
                     handle,
                     _label_with_playstate(title, playstate),
                     "play_movie" if direct_play else "seasons",
-                    {"plugin": plugin_name, "title": title},
+                    {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
                     is_folder=not direct_play,
                     info_labels=_apply_playstate_to_info({"title": title}, playstate),
                 )
@@ -1939,6 +2086,86 @@ def _show_genre_series_group(plugin_name: str, genre: str, group_code: str, page
     handle = _get_handle()
     page_size = 10
     page = max(1, int(page or 1))
+    plugin = _discover_plugins().get(plugin_name)
+    if plugin is None:
+        xbmcgui.Dialog().notification("Genres", "Plugin nicht gefunden.", xbmcgui.NOTIFICATION_INFO, 3000)
+        xbmcplugin.endOfDirectory(handle)
+        return
+
+    grouped_paging = getattr(plugin, "titles_for_genre_group_page", None)
+    grouped_has_more = getattr(plugin, "genre_group_has_more", None)
+    if callable(grouped_paging):
+        try:
+            page_items = [str(t).strip() for t in list(grouped_paging(genre, group_code, page, page_size) or []) if t and str(t).strip()]
+        except Exception as exc:
+            _log(f"Genre-Serien konnten nicht geladen werden ({plugin_name}/{genre}/{group_code} p{page}): {exc}", xbmc.LOGWARNING)
+            xbmcgui.Dialog().notification("Genres", "Serien konnten nicht geladen werden.", xbmcgui.NOTIFICATION_INFO, 3000)
+            xbmcplugin.endOfDirectory(handle)
+            return
+
+        xbmcplugin.setPluginCategory(handle, f"{genre} [{group_code}] ({page})")
+        show_tmdb = _get_setting_bool("tmdb_genre_metadata", default=False)
+        if page > 1:
+            _add_directory_item(
+                handle,
+                "Vorherige Seite",
+                "genre_series_group",
+                {"plugin": plugin_name, "genre": genre, "group": group_code, "page": str(page - 1)},
+                is_folder=True,
+            )
+        if page_items:
+            if show_tmdb:
+                with _busy_dialog():
+                    tmdb_prefetched = _tmdb_labels_and_art_bulk(page_items)
+                    for title in page_items:
+                        info_labels, art, cast = tmdb_prefetched.get(title, _tmdb_labels_and_art(title))
+                        info_labels = dict(info_labels or {})
+                        info_labels.setdefault("mediatype", "tvshow")
+                        if (info_labels.get("mediatype") or "").strip().casefold() == "tvshow":
+                            info_labels.setdefault("tvshowtitle", title)
+                        playstate = _title_playstate(plugin_name, title)
+                        info_labels = _apply_playstate_to_info(dict(info_labels), playstate)
+                        display_label = _label_with_duration(title, info_labels)
+                        display_label = _label_with_playstate(display_label, playstate)
+                        _add_directory_item(
+                            handle,
+                            display_label,
+                            "seasons",
+                            {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
+                            is_folder=True,
+                            info_labels=info_labels,
+                            art=art,
+                            cast=cast,
+                        )
+            else:
+                for title in page_items:
+                    playstate = _title_playstate(plugin_name, title)
+                    _add_directory_item(
+                        handle,
+                        _label_with_playstate(title, playstate),
+                        "seasons",
+                        {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
+                        is_folder=True,
+                        info_labels=_apply_playstate_to_info({"title": title}, playstate),
+                    )
+        show_next = False
+        if callable(grouped_has_more):
+            try:
+                show_next = bool(grouped_has_more(genre, group_code, page, page_size))
+            except Exception:
+                show_next = False
+        elif len(page_items) >= page_size:
+            show_next = True
+        if show_next:
+            _add_directory_item(
+                handle,
+                "Nächste Seite",
+                "genre_series_group",
+                {"plugin": plugin_name, "genre": genre, "group": group_code, "page": str(page + 1)},
+                is_folder=True,
+            )
+        xbmcplugin.endOfDirectory(handle)
+        return
 
     try:
         titles = _get_genre_titles(plugin_name, genre)
@@ -1986,7 +2213,7 @@ def _show_genre_series_group(plugin_name: str, genre: str, group_code: str, page
                         handle,
                         display_label,
                         "seasons",
-                        {"plugin": plugin_name, "title": title},
+                        {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
                         is_folder=True,
                         info_labels=info_labels,
                         art=art,
@@ -1999,7 +2226,7 @@ def _show_genre_series_group(plugin_name: str, genre: str, group_code: str, page
                     handle,
                     _label_with_playstate(title, playstate),
                     "seasons",
-                    {"plugin": plugin_name, "title": title},
+                    {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
                     is_folder=True,
                     info_labels=_apply_playstate_to_info({"title": title}, playstate),
                 )
@@ -2373,12 +2600,13 @@ def run() -> None:
     elif action == "settings":
         _open_settings()
     elif action == "seasons":
-        _show_seasons(params.get("plugin", ""), params.get("title", ""))
+        _show_seasons(params.get("plugin", ""), params.get("title", ""), params.get("series_url", ""))
     elif action == "episodes":
         _show_episodes(
             params.get("plugin", ""),
             params.get("title", ""),
             params.get("season", ""),
+            params.get("series_url", ""),
         )
     elif action == "play_episode":
         _play_episode(
@@ -2391,6 +2619,15 @@ def run() -> None:
     elif action == "play_movie":
         plugin_name = params.get("plugin", "")
         title = params.get("title", "")
+        series_url = params.get("series_url", "")
+        if series_url:
+            plugin = _discover_plugins().get(plugin_name)
+            remember_series_url = getattr(plugin, "remember_series_url", None) if plugin is not None else None
+            if callable(remember_series_url):
+                try:
+                    remember_series_url(title, series_url)
+                except Exception:
+                    pass
         # Einschalten liefert Filme (keine Staffeln/Episoden). Für Playback nutzen wir:
         # <Titel> -> Stream -> <Titel>.
         if (plugin_name or "").casefold() == "einschalten":

addon/plugins/aniworld_plugin.py

@@ -8,7 +8,11 @@ Dieses Plugin ist weitgehend kompatibel zur Serienstream-Integration:
 from __future__ import annotations
 
 from dataclasses import dataclass
+from html import unescape
+import hashlib
+import json
 import re
+import time
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, TypeAlias
 
 try:  # pragma: no cover - optional dependency
@@ -25,8 +29,10 @@ else:
 
 try:  # pragma: no cover - optional Kodi helpers
     import xbmcaddon  # type: ignore[import-not-found]
+    import xbmcgui  # type: ignore[import-not-found]
 except ImportError:  # pragma: no cover - allow running outside Kodi
     xbmcaddon = None
+    xbmcgui = None
 
 from plugin_interface import BasisPlugin
 from plugin_helpers import dump_response_html, get_setting_bool, get_setting_string, log_error, log_url, notify_url
@@ -60,6 +66,9 @@ HEADERS = {
     "Accept-Language": "de-DE,de;q=0.9,en;q=0.8",
     "Connection": "keep-alive",
 }
+SESSION_CACHE_TTL_SECONDS = 300
+SESSION_CACHE_PREFIX = "viewit.aniworld"
+SESSION_CACHE_MAX_TITLE_URLS = 800
 
 
 @dataclass
@@ -128,6 +137,67 @@ def _absolute_url(href: str) -> str:
     return f"{_get_base_url()}{href}" if href.startswith("/") else href
 
 
+def _session_window() -> Any:
+    if xbmcgui is None:
+        return None
+    try:
+        return xbmcgui.Window(10000)
+    except Exception:
+        return None
+
+
+def _session_cache_key(name: str) -> str:
+    base_hash = hashlib.sha1(_get_base_url().encode("utf-8")).hexdigest()[:12]
+    return f"{SESSION_CACHE_PREFIX}.{base_hash}.{name}"
+
+
+def _session_cache_get(name: str) -> Any:
+    window = _session_window()
+    if window is None:
+        return None
+    raw = ""
+    try:
+        raw = window.getProperty(_session_cache_key(name)) or ""
+    except Exception:
+        return None
+    if not raw:
+        return None
+    try:
+        payload = json.loads(raw)
+    except Exception:
+        return None
+    if not isinstance(payload, dict):
+        return None
+    expires_at = payload.get("expires_at")
+    data = payload.get("data")
+    try:
+        if float(expires_at or 0) <= time.time():
+            return None
+    except Exception:
+        return None
+    return data
+
+
+def _session_cache_set(name: str, data: Any, *, ttl_seconds: int = SESSION_CACHE_TTL_SECONDS) -> None:
+    window = _session_window()
+    if window is None:
+        return
+    payload = {
+        "expires_at": float(time.time() + max(1, int(ttl_seconds))),
+        "data": data,
+    }
+    try:
+        raw = json.dumps(payload, ensure_ascii=False, separators=(",", ":"))
+    except Exception:
+        return
+    if len(raw) > 240_000:
+        return
+    try:
+        window.setProperty(_session_cache_key(name), raw)
+    except Exception:
+        return
+
+
 def _log_url(url: str, *, kind: str = "VISIT") -> None:
     log_url(
         ADDON_ID,
@@ -192,10 +262,8 @@ def _matches_query(query: str, *, title: str) -> bool:
     normalized_query = _normalize_search_text(query)
     if not normalized_query:
         return False
-    haystack = _normalize_search_text(title)
-    if not haystack:
-        return False
-    return normalized_query in haystack
+    haystack = f" {_normalize_search_text(title)} "
+    return f" {normalized_query} " in haystack
 
 
 def _ensure_requests() -> None:
@@ -235,7 +303,7 @@ def _get_soup(url: str, *, session: Optional[RequestsSession] = None) -> Beautif
     return BeautifulSoup(response.text, "html.parser")
 
 
-def _get_soup_simple(url: str) -> BeautifulSoupT:
+def _get_html_simple(url: str) -> str:
     _ensure_requests()
     _log_visit(url)
     sess = get_requests_session("aniworld", headers=HEADERS)
@@ -247,10 +315,36 @@ def _get_soup_simple(url: str) -> BeautifulSoupT:
         raise
     if response.url and response.url != url:
         _log_url(response.url, kind="REDIRECT")
-    _log_response_html(url, response.text)
-    if _looks_like_cloudflare_challenge(response.text):
+    body = response.text
+    _log_response_html(url, body)
+    if _looks_like_cloudflare_challenge(body):
         raise RuntimeError("Cloudflare-Schutz erkannt. requests reicht ggf. nicht aus.")
-    return BeautifulSoup(response.text, "html.parser")
+    return body
+
+
+def _get_soup_simple(url: str) -> BeautifulSoupT:
+    body = _get_html_simple(url)
+    return BeautifulSoup(body, "html.parser")
+
+
+def _extract_genre_names_from_html(body: str) -> List[str]:
+    names: List[str] = []
+    seen: set[str] = set()
+    pattern = re.compile(
+        r"<div[^>]*class=[\"'][^\"']*seriesGenreList[^\"']*[\"'][^>]*>.*?<h3[^>]*>(.*?)</h3>",
+        re.IGNORECASE | re.DOTALL,
+    )
+    for match in pattern.finditer(body or ""):
+        text = re.sub(r"<[^>]+>", " ", match.group(1) or "")
+        text = unescape(re.sub(r"\s+", " ", text)).strip()
+        if not text:
+            continue
+        key = text.casefold()
+        if key in seen:
+            continue
+        seen.add(key)
+        names.append(text)
+    return names
 
 
 def _post_json(url: str, *, payload: Dict[str, str], session: Optional[RequestsSession] = None) -> Any:
@@ -417,15 +511,16 @@ def _extract_latest_episodes(soup: BeautifulSoupT) -> List[LatestEpisode]:
     return episodes
 
 
-def scrape_anime_detail(anime_identifier: str, max_seasons: Optional[int] = None) -> List[SeasonInfo]:
+def scrape_anime_detail(
+    anime_identifier: str,
+    max_seasons: Optional[int] = None,
+    *,
+    load_episodes: bool = True,
+) -> List[SeasonInfo]:
     _ensure_requests()
     anime_url = _series_root_url(_absolute_url(anime_identifier))
     _log_url(anime_url, kind="ANIME")
     session = get_requests_session("aniworld", headers=HEADERS)
-    try:
-        _get_soup(_get_base_url(), session=session)
-    except Exception:
-        pass
     soup = _get_soup(anime_url, session=session)
 
     base_anime_url = _series_root_url(_extract_canonical_url(soup, anime_url))
@@ -445,6 +540,8 @@ def scrape_anime_detail(anime_identifier: str, max_seasons: Optional[int] = None
 
     seasons: List[SeasonInfo] = []
     for number, url in season_links:
+        episodes: List[EpisodeInfo] = []
+        if load_episodes:
             season_soup = _get_soup(url, session=session)
             episodes = _extract_episodes(season_soup)
         seasons.append(SeasonInfo(number=number, url=url, episodes=episodes))
@@ -597,7 +694,10 @@ class AniworldPlugin(BasisPlugin):
 
     def __init__(self) -> None:
         self._anime_results: Dict[str, SeriesResult] = {}
+        self._title_url_cache: Dict[str, str] = self._load_title_url_cache()
+        self._genre_names_cache: Optional[List[str]] = None
         self._season_cache: Dict[str, List[SeasonInfo]] = {}
+        self._season_links_cache: Dict[str, List[SeasonInfo]] = {}
         self._episode_label_cache: Dict[Tuple[str, str], Dict[str, EpisodeInfo]] = {}
         self._popular_cache: Optional[List[SeriesResult]] = None
         self._genre_cache: Optional[Dict[str, List[SeriesResult]]] = None
@@ -615,6 +715,132 @@ class AniworldPlugin(BasisPlugin):
             if REQUESTS_IMPORT_ERROR:
                 print(f"AniworldPlugin Importfehler: {REQUESTS_IMPORT_ERROR}")
 
+    def _load_title_url_cache(self) -> Dict[str, str]:
+        raw = _session_cache_get("title_urls")
+        if not isinstance(raw, dict):
+            return {}
+        result: Dict[str, str] = {}
+        for key, value in raw.items():
+            key_text = str(key or "").strip().casefold()
+            url_text = str(value or "").strip()
+            if not key_text or not url_text:
+                continue
+            result[key_text] = url_text
+        return result
+
+    def _save_title_url_cache(self) -> None:
+        if not self._title_url_cache:
+            return
+        while len(self._title_url_cache) > SESSION_CACHE_MAX_TITLE_URLS:
+            self._title_url_cache.pop(next(iter(self._title_url_cache)))
+        _session_cache_set("title_urls", self._title_url_cache)
+
+    def _remember_anime_result(
+        self,
+        title: str,
+        url: str,
+        description: str = "",
+        *,
+        persist: bool = True,
+    ) -> bool:
+        title = (title or "").strip()
+        url = (url or "").strip()
+        if not title:
+            return False
+        changed = False
+        current = self._anime_results.get(title)
+        if current is None or (url and current.url != url) or (description and current.description != description):
+            self._anime_results[title] = SeriesResult(title=title, description=description, url=url)
+            changed = True
+        if url:
+            key = title.casefold()
+            if self._title_url_cache.get(key) != url:
+                self._title_url_cache[key] = url
+                changed = True
+        if changed and persist:
+            self._save_title_url_cache()
+        return changed
+
+    @staticmethod
+    def _season_links_cache_name(series_url: str) -> str:
+        digest = hashlib.sha1((series_url or "").encode("utf-8")).hexdigest()[:20]
+        return f"season_links.{digest}"
+
+    @staticmethod
+    def _season_episodes_cache_name(season_url: str) -> str:
+        digest = hashlib.sha1((season_url or "").encode("utf-8")).hexdigest()[:20]
+        return f"season_episodes.{digest}"
+
+    def _load_session_season_links(self, series_url: str) -> Optional[List[SeasonInfo]]:
+        raw = _session_cache_get(self._season_links_cache_name(series_url))
+        if not isinstance(raw, list):
+            return None
+        seasons: List[SeasonInfo] = []
+        for item in raw:
+            if not isinstance(item, dict):
+                continue
+            try:
+                number = int(item.get("number"))
+            except Exception:
+                continue
+            url = str(item.get("url") or "").strip()
+            if number <= 0 or not url:
+                continue
+            seasons.append(SeasonInfo(number=number, url=url, episodes=[]))
+        if not seasons:
+            return None
+        seasons.sort(key=lambda s: s.number)
+        return seasons
+
+    def _save_session_season_links(self, series_url: str, seasons: List[SeasonInfo]) -> None:
+        payload = [{"number": int(season.number), "url": season.url} for season in seasons if season.url]
+        if payload:
+            _session_cache_set(self._season_links_cache_name(series_url), payload)
+
+    def _load_session_season_episodes(self, season_url: str) -> Optional[List[EpisodeInfo]]:
+        raw = _session_cache_get(self._season_episodes_cache_name(season_url))
+        if not isinstance(raw, list):
+            return None
+        episodes: List[EpisodeInfo] = []
+        for item in raw:
+            if not isinstance(item, dict):
+                continue
+            try:
+                number = int(item.get("number"))
+            except Exception:
+                continue
+            title = str(item.get("title") or "").strip()
+            original_title = str(item.get("original_title") or "").strip()
+            url = str(item.get("url") or "").strip()
+            if number <= 0:
+                continue
+            episodes.append(
+                EpisodeInfo(
+                    number=number,
+                    title=title or f"Episode {number}",
+                    original_title=original_title,
+                    url=url,
+                )
+            )
+        if not episodes:
+            return None
+        episodes.sort(key=lambda item: item.number)
+        return episodes
+
+    def _save_session_season_episodes(self, season_url: str, episodes: List[EpisodeInfo]) -> None:
+        payload = []
+        for item in episodes:
+            payload.append(
+                {
+                    "number": int(item.number),
+                    "title": item.title,
+                    "original_title": item.original_title,
+                    "url": item.url,
+                }
+            )
+        if payload:
+            _session_cache_set(self._season_episodes_cache_name(season_url), payload)
+
     def capabilities(self) -> set[str]:
         return {"popular_series", "genres", "latest_episodes"}
 
@@ -629,6 +855,12 @@ class AniworldPlugin(BasisPlugin):
 
         wanted = title.casefold().strip()
 
+        cached_url = self._title_url_cache.get(wanted, "")
+        if cached_url:
+            result = SeriesResult(title=title, description="", url=cached_url)
+            self._anime_results[title] = result
+            return result
+
         for candidate in self._anime_results.values():
             if candidate.title and candidate.title.casefold().strip() == wanted:
                 return candidate
@@ -636,7 +868,7 @@ class AniworldPlugin(BasisPlugin):
         try:
             for entry in self._ensure_popular():
                 if entry.title and entry.title.casefold().strip() == wanted:
-                    self._anime_results[entry.title] = entry
+                    self._remember_anime_result(entry.title, entry.url, entry.description)
                     return entry
         except Exception:
             pass
@@ -645,7 +877,7 @@ class AniworldPlugin(BasisPlugin):
             for entries in self._ensure_genres().values():
                 for entry in entries:
                     if entry.title and entry.title.casefold().strip() == wanted:
-                        self._anime_results[entry.title] = entry
+                        self._remember_anime_result(entry.title, entry.url, entry.description)
                         return entry
         except Exception:
             pass
@@ -653,7 +885,7 @@ class AniworldPlugin(BasisPlugin):
         try:
             for entry in search_animes(title):
                 if entry.title and entry.title.casefold().strip() == wanted:
-                    self._anime_results[entry.title] = entry
+                    self._remember_anime_result(entry.title, entry.url, entry.description)
                     return entry
         except Exception:
             pass
@@ -665,6 +897,7 @@ class AniworldPlugin(BasisPlugin):
             return list(self._popular_cache)
         soup = _get_soup_simple(_popular_animes_url())
         results: List[SeriesResult] = []
+        cache_dirty = False
         seen: set[str] = set()
         for anchor in soup.select("div.seriesListContainer a[href^='/anime/stream/']"):
             href = (anchor.get("href") or "").strip()
@@ -686,6 +919,9 @@ class AniworldPlugin(BasisPlugin):
                 continue
             seen.add(key)
             results.append(SeriesResult(title=title, description=description, url=url))
+            cache_dirty = self._remember_anime_result(title, url, description, persist=False) or cache_dirty
+        if cache_dirty:
+            self._save_title_url_cache()
         self._popular_cache = list(results)
         return list(results)
 
@@ -693,7 +929,11 @@ class AniworldPlugin(BasisPlugin):
         if not self._requests_available:
             return []
         entries = self._ensure_popular()
-        self._anime_results.update({entry.title: entry for entry in entries if entry.title})
+        cache_dirty = False
+        for entry in entries:
+            cache_dirty = self._remember_anime_result(entry.title, entry.url, entry.description, persist=False) or cache_dirty
+        if cache_dirty:
+            self._save_title_url_cache()
         return [entry.title for entry in entries if entry.title]
 
     def latest_episodes(self, page: int = 1) -> List[LatestEpisode]:
@@ -723,6 +963,7 @@ class AniworldPlugin(BasisPlugin):
             return {key: list(value) for key, value in self._genre_cache.items()}
         soup = _get_soup_simple(_genres_url())
         results: Dict[str, List[SeriesResult]] = {}
+        cache_dirty = False
         genre_blocks = soup.select("#seriesContainer div.genre")
         if not genre_blocks:
             genre_blocks = soup.select("div.genre")
@@ -748,9 +989,14 @@ class AniworldPlugin(BasisPlugin):
                     continue
                 seen.add(key)
                 entries.append(SeriesResult(title=title, description="", url=url))
+                cache_dirty = self._remember_anime_result(title, url, persist=False) or cache_dirty
             if entries:
                 results[genre_name] = entries
+        if cache_dirty:
+            self._save_title_url_cache()
         self._genre_cache = {key: list(value) for key, value in results.items()}
+        self._genre_names_cache = sorted(self._genre_cache.keys(), key=str.casefold)
+        _session_cache_set("genres", self._genre_names_cache)
         # Für spätere Auflösung (Seasons/Episoden) die Titel->URL Zuordnung auffüllen.
         for entries in results.values():
             for entry in entries:
@@ -760,11 +1006,31 @@ class AniworldPlugin(BasisPlugin):
                     self._anime_results[entry.title] = entry
         return {key: list(value) for key, value in results.items()}
 
+    def _ensure_genre_names(self) -> List[str]:
+        if self._genre_names_cache is not None:
+            return list(self._genre_names_cache)
+        cached = _session_cache_get("genres")
+        if isinstance(cached, list):
+            names = [str(value).strip() for value in cached if str(value).strip()]
+            if names:
+                self._genre_names_cache = sorted(set(names), key=str.casefold)
+                return list(self._genre_names_cache)
+        try:
+            body = _get_html_simple(_genres_url())
+            names = _extract_genre_names_from_html(body)
+        except Exception:
+            names = []
+        if not names:
+            mapping = self._ensure_genres()
+            names = list(mapping.keys())
+        self._genre_names_cache = sorted({name for name in names if name}, key=str.casefold)
+        _session_cache_set("genres", self._genre_names_cache)
+        return list(self._genre_names_cache)
+
     def genres(self) -> List[str]:
         if not self._requests_available:
             return []
-        genres = list(self._ensure_genres().keys())
-        return [g for g in genres if g]
+        return self._ensure_genre_names()
 
     def titles_for_genre(self, genre: str) -> List[str]:
         genre = (genre or "").strip()
@@ -781,7 +1047,11 @@ class AniworldPlugin(BasisPlugin):
         if not entries:
             return []
         # Zusätzlich sicherstellen, dass die Titel im Cache sind.
-        self._anime_results.update({entry.title: entry for entry in entries if entry.title and entry.title not in self._anime_results})
+        cache_dirty = False
+        for entry in entries:
+            cache_dirty = self._remember_anime_result(entry.title, entry.url, entry.description, persist=False) or cache_dirty
+        if cache_dirty:
+            self._save_title_url_cache()
         return [entry.title for entry in entries if entry.title]
 
     def _season_label(self, number: int) -> str:
@@ -801,17 +1071,81 @@ class AniworldPlugin(BasisPlugin):
         cache_key = (title, season_label)
         self._episode_label_cache[cache_key] = {self._episode_label(info): info for info in season_info.episodes}
 
+    def remember_series_url(self, title: str, series_url: str) -> None:
+        title = (title or "").strip()
+        series_url = (series_url or "").strip()
+        if not title or not series_url:
+            return
+        self._remember_anime_result(title, series_url)
+
+    def series_url_for_title(self, title: str) -> str:
+        title = (title or "").strip()
+        if not title:
+            return ""
+        direct = self._anime_results.get(title)
+        if direct and direct.url:
+            return direct.url
+        wanted = title.casefold().strip()
+        cached_url = self._title_url_cache.get(wanted, "")
+        if cached_url:
+            return cached_url
+        for candidate in self._anime_results.values():
+            if candidate.title and candidate.title.casefold().strip() == wanted and candidate.url:
+                return candidate.url
+        return ""
+
+    def _ensure_season_links(self, title: str) -> List[SeasonInfo]:
+        cached = self._season_links_cache.get(title)
+        if cached is not None:
+            return list(cached)
+        anime = self._find_series_by_title(title)
+        if not anime:
+            return []
+        session_links = self._load_session_season_links(anime.url)
+        if session_links:
+            self._season_links_cache[title] = list(session_links)
+            return list(session_links)
+        seasons = scrape_anime_detail(anime.url, load_episodes=False)
+        self._season_links_cache[title] = list(seasons)
+        self._save_session_season_links(anime.url, seasons)
+        return list(seasons)
+
+    def _ensure_season_episodes(self, title: str, season_number: int) -> Optional[SeasonInfo]:
+        seasons = self._season_cache.get(title) or []
+        for season in seasons:
+            if season.number == season_number and season.episodes:
+                return season
+        links = self._ensure_season_links(title)
+        target = next((season for season in links if season.number == season_number), None)
+        if not target:
+            return None
+        cached_episodes = self._load_session_season_episodes(target.url)
+        if cached_episodes:
+            season_info = SeasonInfo(number=target.number, url=target.url, episodes=list(cached_episodes))
+            updated = [season for season in seasons if season.number != season_number]
+            updated.append(season_info)
+            updated.sort(key=lambda item: item.number)
+            self._season_cache[title] = updated
+            return season_info
+        season_soup = _get_soup(target.url, session=get_requests_session("aniworld", headers=HEADERS))
+        season_info = SeasonInfo(number=target.number, url=target.url, episodes=_extract_episodes(season_soup))
+        updated = [season for season in seasons if season.number != season_number]
+        updated.append(season_info)
+        updated.sort(key=lambda item: item.number)
+        self._season_cache[title] = updated
+        self._save_session_season_episodes(target.url, season_info.episodes)
+        return season_info
+
     def _lookup_episode(self, title: str, season_label: str, episode_label: str) -> Optional[EpisodeInfo]:
         cache_key = (title, season_label)
         cached = self._episode_label_cache.get(cache_key)
         if cached:
             return cached.get(episode_label)
-        seasons = self._ensure_seasons(title)
         number = self._parse_season_number(season_label)
         if number is None:
             return None
-        for season_info in seasons:
-            if season_info.number == number:
+        season_info = self._ensure_season_episodes(title, number)
+        if season_info:
             self._cache_episode_labels(title, season_label, season_info)
             return self._episode_label_cache.get(cache_key, {}).get(episode_label)
         return None
@@ -821,6 +1155,7 @@ class AniworldPlugin(BasisPlugin):
         if not query:
             self._anime_results.clear()
             self._season_cache.clear()
+            self._season_links_cache.clear()
             self._episode_label_cache.clear()
             self._popular_cache = None
             return []
@@ -833,32 +1168,34 @@ class AniworldPlugin(BasisPlugin):
             self._season_cache.clear()
             self._episode_label_cache.clear()
             raise RuntimeError(f"AniWorld-Suche fehlgeschlagen: {exc}") from exc
-        self._anime_results = {result.title: result for result in results}
+        self._anime_results = {}
+        cache_dirty = False
+        for result in results:
+            cache_dirty = self._remember_anime_result(result.title, result.url, result.description, persist=False) or cache_dirty
+        if cache_dirty:
+            self._save_title_url_cache()
         self._season_cache.clear()
+        self._season_links_cache.clear()
         self._episode_label_cache.clear()
         return [result.title for result in results]
 
     def _ensure_seasons(self, title: str) -> List[SeasonInfo]:
         if title in self._season_cache:
             return self._season_cache[title]
-        anime = self._find_series_by_title(title)
-        if not anime:
-            return []
-        seasons = scrape_anime_detail(anime.url)
+        seasons = self._ensure_season_links(title)
         self._season_cache[title] = list(seasons)
         return list(seasons)
 
     def seasons_for(self, title: str) -> List[str]:
         seasons = self._ensure_seasons(title)
-        return [self._season_label(season.number) for season in seasons if season.episodes]
+        return [self._season_label(season.number) for season in seasons]
 
     def episodes_for(self, title: str, season: str) -> List[str]:
-        seasons = self._ensure_seasons(title)
         number = self._parse_season_number(season)
         if number is None:
             return []
-        for season_info in seasons:
-            if season_info.number == number:
+        season_info = self._ensure_season_episodes(title, number)
+        if season_info:
             labels = [self._episode_label(info) for info in season_info.episodes]
             self._cache_episode_labels(title, season, season_info)
             return labels

addon/plugins/filmpalast_plugin.py

@@ -0,0 +1,668 @@
+"""Filmpalast Integration (movie-style provider).
+
+Hinweis:
+- Der Parser ist bewusst defensiv und arbeitet mit mehreren Fallback-Selektoren,
+  da Filmpalast-Layouts je Domain variieren koennen.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+import re
+from urllib.parse import quote, urlencode
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, TypeAlias
+
+try:  # pragma: no cover - optional dependency
+    import requests
+    from bs4 import BeautifulSoup  # type: ignore[import-not-found]
+except ImportError as exc:  # pragma: no cover - optional dependency
+    requests = None
+    BeautifulSoup = None
+    REQUESTS_AVAILABLE = False
+    REQUESTS_IMPORT_ERROR = exc
+else:
+    REQUESTS_AVAILABLE = True
+    REQUESTS_IMPORT_ERROR = None
+
+from plugin_interface import BasisPlugin
+from plugin_helpers import dump_response_html, get_setting_bool, get_setting_string, log_error, log_url, notify_url
+from http_session_pool import get_requests_session
+
+if TYPE_CHECKING:  # pragma: no cover
+    from requests import Session as RequestsSession
+    from bs4 import BeautifulSoup as BeautifulSoupT  # type: ignore[import-not-found]
+else:  # pragma: no cover
+    RequestsSession: TypeAlias = Any
+    BeautifulSoupT: TypeAlias = Any
+
+
+ADDON_ID = "plugin.video.viewit"
+SETTING_BASE_URL = "filmpalast_base_url"
+DEFAULT_BASE_URL = "https://filmpalast.to"
+DEFAULT_TIMEOUT = 20
+DEFAULT_PREFERRED_HOSTERS = ["voe", "vidoza", "streamtape", "doodstream", "mixdrop"]
+SERIES_HINT_PREFIX = "series://filmpalast/"
+SEASON_EPISODE_RE = re.compile(r"\bS\s*(\d{1,2})\s*E\s*(\d{1,3})\b", re.IGNORECASE)
+GLOBAL_SETTING_LOG_URLS = "debug_log_urls"
+GLOBAL_SETTING_DUMP_HTML = "debug_dump_html"
+GLOBAL_SETTING_SHOW_URL_INFO = "debug_show_url_info"
+GLOBAL_SETTING_LOG_ERRORS = "debug_log_errors"
+SETTING_LOG_URLS = "log_urls_filmpalast"
+SETTING_DUMP_HTML = "dump_html_filmpalast"
+SETTING_SHOW_URL_INFO = "show_url_info_filmpalast"
+SETTING_LOG_ERRORS = "log_errors_filmpalast"
+HEADERS = {
+    "User-Agent": "Mozilla/5.0 (Kodi; ViewIt) AppleWebKit/537.36 (KHTML, like Gecko)",
+    "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+    "Accept-Language": "de-DE,de;q=0.9,en;q=0.8",
+    "Connection": "keep-alive",
+}
+
+
+@dataclass(frozen=True)
+class SearchHit:
+    title: str
+    url: str
+
+
+@dataclass(frozen=True)
+class EpisodeEntry:
+    season: int
+    episode: int
+    suffix: str
+    url: str
+
+
+def _get_base_url() -> str:
+    base = get_setting_string(ADDON_ID, SETTING_BASE_URL, default=DEFAULT_BASE_URL).strip()
+    if not base:
+        base = DEFAULT_BASE_URL
+    return base.rstrip("/")
+
+
+def _absolute_url(url: str) -> str:
+    url = (url or "").strip()
+    if not url:
+        return ""
+    if url.startswith("http://") or url.startswith("https://"):
+        return url
+    if url.startswith("//"):
+        return f"https:{url}"
+    if url.startswith("/"):
+        return f"{_get_base_url()}{url}"
+    return f"{_get_base_url()}/{url.lstrip('/')}"
+
+
+def _normalize_search_text(value: str) -> str:
+    value = (value or "").casefold()
+    value = re.sub(r"[^a-z0-9]+", " ", value)
+    value = re.sub(r"\s+", " ", value).strip()
+    return value
+
+
+def _matches_query(query: str, *, title: str) -> bool:
+    normalized_query = _normalize_search_text(query)
+    if not normalized_query:
+        return False
+    haystack = f" {_normalize_search_text(title)} "
+    return f" {normalized_query} " in haystack
+
+
+def _is_probably_content_url(url: str) -> bool:
+    lower = (url or "").casefold()
+    if not lower:
+        return False
+    block_markers = (
+        "/genre/",
+        "/kategorie/",
+        "/category/",
+        "/tag/",
+        "/login",
+        "/register",
+        "/kontakt",
+        "/impressum",
+        "/datenschutz",
+        "/dmca",
+        "/agb",
+        "javascript:",
+        "#",
+    )
+    if any(marker in lower for marker in block_markers):
+        return False
+    allow_markers = ("/stream/", "/film/", "/movie/", "/serien/", "/serie/", "/title/")
+    return any(marker in lower for marker in allow_markers)
+
+
+def _log_url_event(url: str, *, kind: str = "VISIT") -> None:
+    log_url(
+        ADDON_ID,
+        enabled_setting_id=GLOBAL_SETTING_LOG_URLS,
+        plugin_setting_id=SETTING_LOG_URLS,
+        log_filename="filmpalast_urls.log",
+        url=url,
+        kind=kind,
+    )
+
+
+def _log_visit(url: str) -> None:
+    _log_url_event(url, kind="VISIT")
+    notify_url(
+        ADDON_ID,
+        heading="Filmpalast",
+        url=url,
+        enabled_setting_id=GLOBAL_SETTING_SHOW_URL_INFO,
+        plugin_setting_id=SETTING_SHOW_URL_INFO,
+    )
+
+
+def _log_response_html(url: str, body: str) -> None:
+    dump_response_html(
+        ADDON_ID,
+        enabled_setting_id=GLOBAL_SETTING_DUMP_HTML,
+        plugin_setting_id=SETTING_DUMP_HTML,
+        url=url,
+        body=body,
+        filename_prefix="filmpalast_response",
+    )
+
+
+def _log_error_message(message: str) -> None:
+    log_error(
+        ADDON_ID,
+        enabled_setting_id=GLOBAL_SETTING_LOG_ERRORS,
+        plugin_setting_id=SETTING_LOG_ERRORS,
+        log_filename="filmpalast_errors.log",
+        message=message,
+    )
+
+
+def _is_series_hint_url(value: str) -> bool:
+    return (value or "").startswith(SERIES_HINT_PREFIX)
+
+
+def _series_hint_value(title: str) -> str:
+    safe_title = quote((title or "").strip(), safe="")
+    return f"{SERIES_HINT_PREFIX}{safe_title}" if safe_title else SERIES_HINT_PREFIX
+
+
+def _extract_number(value: str) -> Optional[int]:
+    match = re.search(r"(\d+)", value or "")
+    if not match:
+        return None
+    try:
+        return int(match.group(1))
+    except Exception:
+        return None
+
+
+def _strip_series_alias(title: str) -> str:
+    return re.sub(r"\s*\(serie\)\s*$", "", title or "", flags=re.IGNORECASE).strip()
+
+
+def _get_soup(url: str, *, session: Optional[RequestsSession] = None) -> BeautifulSoupT:
+    if requests is None or BeautifulSoup is None:
+        raise RuntimeError("requests/bs4 sind nicht verfuegbar.")
+    _log_visit(url)
+    sess = session or get_requests_session("filmpalast", headers=HEADERS)
+    try:
+        response = sess.get(url, headers=HEADERS, timeout=DEFAULT_TIMEOUT)
+        response.raise_for_status()
+    except Exception as exc:
+        _log_error_message(f"GET {url} failed: {exc}")
+        raise
+    if response.url and response.url != url:
+        _log_url_event(response.url, kind="REDIRECT")
+    _log_response_html(url, response.text)
+    return BeautifulSoup(response.text, "html.parser")
+
+
+class FilmpalastPlugin(BasisPlugin):
+    name = "Filmpalast"
+
+    def __init__(self) -> None:
+        self._title_to_url: Dict[str, str] = {}
+        self._series_entries: Dict[str, Dict[int, Dict[int, EpisodeEntry]]] = {}
+        self._hoster_cache: Dict[str, Dict[str, str]] = {}
+        self._requests_available = REQUESTS_AVAILABLE
+        self._default_preferred_hosters: List[str] = list(DEFAULT_PREFERRED_HOSTERS)
+        self._preferred_hosters: List[str] = list(self._default_preferred_hosters)
+        self.is_available = True
+        self.unavailable_reason: Optional[str] = None
+        if not self._requests_available:  # pragma: no cover - optional dependency
+            self.is_available = False
+            self.unavailable_reason = (
+                "requests/bs4 fehlen. Installiere 'requests' und 'beautifulsoup4'."
+            )
+            if REQUESTS_IMPORT_ERROR:
+                print(f"FilmpalastPlugin Importfehler: {REQUESTS_IMPORT_ERROR}")
+
+    def _lookup_title_url(self, title: str) -> str:
+        title = (title or "").strip()
+        if not title:
+            return ""
+        direct = self._title_to_url.get(title)
+        if direct:
+            return direct
+        wanted = title.casefold()
+        for key, value in self._title_to_url.items():
+            if key.casefold() == wanted and value:
+                return value
+        return ""
+
+    def _series_key_for_title(self, title: str) -> str:
+        title = (title or "").strip()
+        if not title:
+            return ""
+        if title in self._series_entries:
+            return title
+        wanted = title.casefold()
+        for key in self._series_entries.keys():
+            if key.casefold() == wanted:
+                return key
+        return ""
+
+    def _has_series_entries(self, title: str) -> bool:
+        return bool(self._series_key_for_title(title))
+
+    def _episode_entry_from_hit(self, hit: SearchHit) -> Optional[Tuple[str, EpisodeEntry]]:
+        title = (hit.title or "").strip()
+        if not title:
+            return None
+        marker = SEASON_EPISODE_RE.search(title)
+        if not marker:
+            return None
+        try:
+            season_number = int(marker.group(1))
+            episode_number = int(marker.group(2))
+        except Exception:
+            return None
+        series_title = re.sub(r"\s+", " ", title[: marker.start()] or "").strip(" -|:;,_")
+        if not series_title:
+            return None
+        suffix = re.sub(r"\s+", " ", title[marker.end() :] or "").strip(" -|:;,_")
+        entry = EpisodeEntry(season=season_number, episode=episode_number, suffix=suffix, url=hit.url)
+        return (series_title, entry)
+
+    def _add_series_entry(self, series_title: str, entry: EpisodeEntry) -> None:
+        if not series_title or not entry.url:
+            return
+        seasons = self._series_entries.setdefault(series_title, {})
+        episodes = seasons.setdefault(entry.season, {})
+        if entry.episode not in episodes:
+            episodes[entry.episode] = entry
+
+    def _ensure_series_entries_for_title(self, title: str) -> str:
+        series_key = self._series_key_for_title(title)
+        if series_key:
+            return series_key
+        original_title = (title or "").strip()
+        lookup_title = _strip_series_alias(original_title)
+        if not lookup_title:
+            return ""
+        if not self._requests_available:
+            return ""
+        wanted = _normalize_search_text(lookup_title)
+        hits = self._search_hits(lookup_title)
+        for hit in hits:
+            parsed = self._episode_entry_from_hit(hit)
+            if not parsed:
+                continue
+            series_title, entry = parsed
+            if wanted and _normalize_search_text(series_title) != wanted:
+                continue
+            self._add_series_entry(series_title, entry)
+            self._title_to_url.setdefault(series_title, _series_hint_value(series_title))
+        resolved = self._series_key_for_title(original_title) or self._series_key_for_title(lookup_title)
+        if resolved and original_title and original_title != resolved:
+            self._series_entries[original_title] = self._series_entries[resolved]
+            self._title_to_url.setdefault(original_title, _series_hint_value(resolved))
+            return original_title
+        return resolved
+
+    def _detail_url_for_selection(self, title: str, season: str, episode: str) -> str:
+        series_key = self._series_key_for_title(title) or self._ensure_series_entries_for_title(title)
+        if series_key:
+            season_number = _extract_number(season)
+            episode_number = _extract_number(episode)
+            if season_number is None or episode_number is None:
+                return ""
+            entry = self._series_entries.get(series_key, {}).get(season_number, {}).get(episode_number)
+            return entry.url if entry else ""
+        return self._ensure_title_url(title)
+
+    def _search_hits(self, query: str) -> List[SearchHit]:
+        query = (query or "").strip()
+        if not query:
+            return []
+        if not self._requests_available or requests is None:
+            return []
+
+        session = get_requests_session("filmpalast", headers=HEADERS)
+        search_requests = [(_absolute_url(f"/search/title/{quote(query)}"), None)]
+
+        hits: List[SearchHit] = []
+        seen_titles: set[str] = set()
+        seen_urls: set[str] = set()
+        for base_url, params in search_requests:
+            try:
+                request_url = base_url if not params else f"{base_url}?{urlencode(params)}"
+                _log_url_event(request_url, kind="GET")
+                _log_visit(request_url)
+                response = session.get(base_url, params=params, headers=HEADERS, timeout=DEFAULT_TIMEOUT)
+                response.raise_for_status()
+                if response.url and response.url != request_url:
+                    _log_url_event(response.url, kind="REDIRECT")
+                _log_response_html(request_url, response.text)
+                soup = BeautifulSoup(response.text, "html.parser")
+            except Exception as exc:
+                _log_error_message(f"search request failed ({base_url}): {exc}")
+                continue
+
+            anchors = soup.select("article.liste h2 a[href], article.liste h3 a[href]")
+            if not anchors:
+                anchors = soup.select("a[href*='/stream/'][title], a[href*='/stream/']")
+            for anchor in anchors:
+                href = (anchor.get("href") or "").strip()
+                if not href:
+                    continue
+                url = _absolute_url(href).split("#", 1)[0].split("?", 1)[0].rstrip("/")
+                if not _is_probably_content_url(url):
+                    continue
+
+                title = (anchor.get("title") or anchor.get_text(" ", strip=True)).strip()
+                title = (title or "").strip()
+                if not title:
+                    continue
+                if title.casefold() in {"details/play", "play", "details"}:
+                    continue
+                if not _matches_query(query, title=title):
+                    continue
+                title_key = title.casefold()
+                url_key = url.casefold()
+                if title_key in seen_titles or url_key in seen_urls:
+                    continue
+                seen_titles.add(title_key)
+                seen_urls.add(url_key)
+                _log_url_event(url, kind="PARSE")
+                hits.append(SearchHit(title=title, url=url))
+
+            if hits:
+                break
+
+        return hits
+
+    async def search_titles(self, query: str) -> List[str]:
+        hits = self._search_hits(query)
+        self._title_to_url = {}
+        self._series_entries = {}
+        self._hoster_cache.clear()
+        movie_titles: List[str] = []
+        series_titles_seen: set[str] = set()
+        for hit in hits:
+            parsed = self._episode_entry_from_hit(hit)
+            if parsed:
+                series_title, entry = parsed
+                self._add_series_entry(series_title, entry)
+                if series_title.casefold() not in series_titles_seen:
+                    self._title_to_url[series_title] = _series_hint_value(series_title)
+                    series_titles_seen.add(series_title.casefold())
+                continue
+            title = (hit.title or "").strip()
+            if not title:
+                continue
+            movie_titles.append(title)
+            self._title_to_url[title] = hit.url
+        titles: List[str] = list(movie_titles)
+        movie_keys = {entry.casefold() for entry in movie_titles}
+        for series_title in sorted(self._series_entries.keys(), key=lambda value: value.casefold()):
+            if series_title.casefold() in movie_keys:
+                alias = f"{series_title} (Serie)"
+                self._title_to_url[alias] = self._title_to_url.get(series_title, _series_hint_value(series_title))
+                self._series_entries[alias] = self._series_entries[series_title]
+                titles.append(alias)
+            else:
+                titles.append(series_title)
+        titles.sort(key=lambda value: value.casefold())
+        return titles
+
+    def _ensure_title_url(self, title: str) -> str:
+        title = (title or "").strip()
+        if not title:
+            return ""
+        direct = self._lookup_title_url(title)
+        if direct and _is_series_hint_url(direct):
+            return ""
+        if direct:
+            self._title_to_url[title] = direct
+            return direct
+        if self._has_series_entries(title) or self._ensure_series_entries_for_title(title):
+            self._title_to_url[title] = _series_hint_value(title)
+            return ""
+        wanted = title.casefold()
+        hits = self._search_hits(title)
+        for hit in hits:
+            if self._episode_entry_from_hit(hit):
+                continue
+            if hit.title.casefold() == wanted and hit.url:
+                self._title_to_url[title] = hit.url
+                return hit.url
+        return ""
+
+    def remember_series_url(self, title: str, series_url: str) -> None:
+        title = (title or "").strip()
+        series_url = (series_url or "").strip()
+        if not title or not series_url:
+            return
+        self._title_to_url[title] = series_url
+        self._hoster_cache.clear()
+
+    def series_url_for_title(self, title: str) -> str:
+        title = (title or "").strip()
+        if not title:
+            return ""
+        direct = self._lookup_title_url(title)
+        if direct:
+            return direct
+        series_key = self._series_key_for_title(title)
+        if series_key:
+            return _series_hint_value(series_key)
+        return ""
+
+    def is_movie(self, title: str) -> bool:
+        title = (title or "").strip()
+        if not title:
+            return False
+        direct = self._lookup_title_url(title)
+        if direct:
+            return not _is_series_hint_url(direct)
+        if SEASON_EPISODE_RE.search(title):
+            return False
+        if self._has_series_entries(title):
+            return False
+        if self._ensure_series_entries_for_title(title):
+            return False
+        return True
+
+    @staticmethod
+    def _normalize_hoster_name(name: str) -> str:
+        name = (name or "").strip()
+        if not name:
+            return ""
+        name = re.sub(r"\s+", " ", name)
+        return name
+
+    def _extract_hoster_links(self, soup: BeautifulSoupT) -> Dict[str, str]:
+        hosters: Dict[str, str] = {}
+        if not soup:
+            return hosters
+
+        # Primäres Layout: jeder Hoster in eigener UL mit hostName + Play-Link.
+        for block in soup.select("ul.currentStreamLinks"):
+            host_name_node = block.select_one("li.hostBg .hostName")
+            host_name = self._normalize_hoster_name(host_name_node.get_text(" ", strip=True) if host_name_node else "")
+            play_anchor = block.select_one("li.streamPlayBtn a[href], a.button.iconPlay[href]")
+            href = (play_anchor.get("href") if play_anchor else "") or ""
+            play_url = _absolute_url(href).strip()
+            if not play_url:
+                continue
+            if not host_name:
+                host_name = self._normalize_hoster_name(play_anchor.get_text(" ", strip=True) if play_anchor else "")
+            if not host_name:
+                host_name = "Unbekannt"
+            if host_name not in hosters:
+                hosters[host_name] = play_url
+
+        # Fallback: direkte Play-Buttons im Stream-Bereich.
+        if not hosters:
+            for anchor in soup.select("#grap-stream-list a.button.iconPlay[href], .streamLinksWrapper a.button.iconPlay[href]"):
+                href = (anchor.get("href") or "").strip()
+                play_url = _absolute_url(href).strip()
+                if not play_url:
+                    continue
+                text_name = self._normalize_hoster_name(anchor.get_text(" ", strip=True))
+                host_name = text_name if text_name and text_name.casefold() not in {"play", "details play"} else "Unbekannt"
+                if host_name in hosters:
+                    host_name = f"{host_name} #{len(hosters) + 1}"
+                hosters[host_name] = play_url
+
+        return hosters
+
+    def _hosters_for_detail_url(self, detail_url: str) -> Dict[str, str]:
+        detail_url = (detail_url or "").strip()
+        if not detail_url:
+            return {}
+        cached = self._hoster_cache.get(detail_url)
+        if cached is not None:
+            return dict(cached)
+        if not self._requests_available:
+            return {}
+        try:
+            soup = _get_soup(detail_url, session=get_requests_session("filmpalast", headers=HEADERS))
+        except Exception:
+            return {}
+        hosters = self._extract_hoster_links(soup)
+        for url in hosters.values():
+            _log_url_event(url, kind="PARSE")
+        self._hoster_cache[detail_url] = dict(hosters)
+        return dict(hosters)
+
+    def seasons_for(self, title: str) -> List[str]:
+        title = (title or "").strip()
+        if not title:
+            return []
+        series_key = self._series_key_for_title(title) or self._ensure_series_entries_for_title(title)
+        if series_key:
+            seasons = sorted(self._series_entries.get(series_key, {}).keys())
+            return [f"Staffel {number}" for number in seasons]
+        detail_url = self._ensure_title_url(title)
+        return ["Film"] if detail_url else []
+
+    def episodes_for(self, title: str, season: str) -> List[str]:
+        title = (title or "").strip()
+        series_key = self._series_key_for_title(title) or self._ensure_series_entries_for_title(title)
+        if series_key:
+            season_number = _extract_number(season)
+            if season_number is None:
+                return []
+            episodes = self._series_entries.get(series_key, {}).get(season_number, {})
+            labels: List[str] = []
+            for episode_number in sorted(episodes.keys()):
+                entry = episodes[episode_number]
+                label = f"Episode {episode_number}"
+                if entry.suffix:
+                    label = f"{label} - {entry.suffix}"
+                labels.append(label)
+            return labels
+        return ["Stream"] if self._ensure_title_url(title) else []
+
+    def available_hosters_for(self, title: str, season: str, episode: str) -> List[str]:
+        detail_url = self._detail_url_for_selection(title, season, episode)
+        hosters = self._hosters_for_detail_url(detail_url)
+        return list(hosters.keys())
+
+    def stream_link_for(self, title: str, season: str, episode: str) -> Optional[str]:
+        detail_url = self._detail_url_for_selection(title, season, episode)
+        if not detail_url:
+            return None
+        hosters = self._hosters_for_detail_url(detail_url)
+        if hosters:
+            for preferred in self._preferred_hosters:
+                preferred_key = (preferred or "").strip().casefold()
+                if not preferred_key:
+                    continue
+                for host_name, host_url in hosters.items():
+                    if preferred_key in host_name.casefold() or preferred_key in host_url.casefold():
+                        _log_url_event(host_url, kind="FOUND")
+                        return host_url
+            first = next(iter(hosters.values()))
+            _log_url_event(first, kind="FOUND")
+            return first
+        if not self._requests_available:
+            return detail_url
+
+        try:
+            soup = _get_soup(detail_url, session=get_requests_session("filmpalast", headers=HEADERS))
+        except Exception:
+            return detail_url
+
+        candidates: List[str] = []
+        for iframe in soup.select("iframe[src]"):
+            src = (iframe.get("src") or "").strip()
+            if src:
+                candidates.append(_absolute_url(src))
+        for anchor in soup.select("a[href]"):
+            href = (anchor.get("href") or "").strip()
+            if not href:
+                continue
+            lower = href.casefold()
+            if "watch" in lower or "stream" in lower or "player" in lower:
+                candidates.append(_absolute_url(href))
+
+        deduped: List[str] = []
+        seen: set[str] = set()
+        for candidate in candidates:
+            key = candidate.casefold()
+            if key in seen:
+                continue
+            seen.add(key)
+            deduped.append(candidate)
+
+        if deduped:
+            _log_url_event(deduped[0], kind="FOUND")
+            return deduped[0]
+        return detail_url
+
+    def set_preferred_hosters(self, hosters: List[str]) -> None:
+        normalized = [str(hoster).strip().lower() for hoster in hosters if str(hoster).strip()]
+        if normalized:
+            self._preferred_hosters = normalized
+
+    def reset_preferred_hosters(self) -> None:
+        self._preferred_hosters = list(self._default_preferred_hosters)
+
+    def resolve_stream_link(self, link: str) -> Optional[str]:
+        if not link:
+            return None
+        resolved = link
+        if self._requests_available:
+            try:
+                session = get_requests_session("filmpalast", headers=HEADERS)
+                response = session.get(link, headers=HEADERS, timeout=DEFAULT_TIMEOUT, allow_redirects=True)
+                response.raise_for_status()
+                resolved = (response.url or link).strip() or link
+            except Exception:
+                resolved = link
+        try:
+            from resolveurl_backend import resolve as resolve_with_resolveurl
+        except Exception:
+            resolve_with_resolveurl = None
+        if callable(resolve_with_resolveurl):
+            resolved_by_resolveurl = resolve_with_resolveurl(resolved)
+            if resolved_by_resolveurl:
+                _log_url_event("ResolveURL", kind="HOSTER_RESOLVER")
+                _log_url_event(resolved_by_resolveurl, kind="MEDIA")
+                return resolved_by_resolveurl
+        if resolved:
+            _log_url_event(resolved, kind="FINAL")
+            return resolved
+        return None

addon/plugins/serienstream_plugin.py

@@ -10,9 +10,13 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from datetime import datetime
+from html import unescape
+import json
 import hashlib
 import os
 import re
+import time
+import unicodedata
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, TypeAlias
 
 try:  # pragma: no cover - optional dependency
@@ -68,6 +72,9 @@ HEADERS = {
     "Accept-Language": "de-DE,de;q=0.9,en;q=0.8",
     "Connection": "keep-alive",
 }
+SESSION_CACHE_TTL_SECONDS = 300
+SESSION_CACHE_PREFIX = "viewit.serienstream"
+SESSION_CACHE_MAX_TITLE_URLS = 800
 
 
 @dataclass
@@ -127,6 +134,68 @@ def _absolute_url(href: str) -> str:
     return f"{_get_base_url()}{href}" if href.startswith("/") else href
 
 
+def _session_window() -> Any:
+    if xbmcgui is None:
+        return None
+    try:
+        return xbmcgui.Window(10000)
+    except Exception:
+        return None
+
+
+def _session_cache_key(name: str) -> str:
+    base_hash = hashlib.sha1(_get_base_url().encode("utf-8")).hexdigest()[:12]
+    return f"{SESSION_CACHE_PREFIX}.{base_hash}.{name}"
+
+
+def _session_cache_get(name: str) -> Any:
+    window = _session_window()
+    if window is None:
+        return None
+    raw = ""
+    try:
+        raw = window.getProperty(_session_cache_key(name)) or ""
+    except Exception:
+        return None
+    if not raw:
+        return None
+    try:
+        payload = json.loads(raw)
+    except Exception:
+        return None
+    if not isinstance(payload, dict):
+        return None
+    expires_at = payload.get("expires_at")
+    data = payload.get("data")
+    try:
+        if float(expires_at or 0) <= time.time():
+            return None
+    except Exception:
+        return None
+    return data
+
+
+def _session_cache_set(name: str, data: Any, *, ttl_seconds: int = SESSION_CACHE_TTL_SECONDS) -> None:
+    window = _session_window()
+    if window is None:
+        return
+    payload = {
+        "expires_at": float(time.time() + max(1, int(ttl_seconds))),
+        "data": data,
+    }
+    try:
+        raw = json.dumps(payload, ensure_ascii=False, separators=(",", ":"))
+    except Exception:
+        return
+    # Kodi-Properties sind kein Dauer-Storage; begrenzen, damit UI stabil bleibt.
+    if len(raw) > 240_000:
+        return
+    try:
+        window.setProperty(_session_cache_key(name), raw)
+    except Exception:
+        return
+
+
 def _normalize_series_url(identifier: str) -> str:
     if identifier.startswith("http://") or identifier.startswith("https://"):
         return identifier.rstrip("/")
@@ -169,6 +238,14 @@ def _normalize_search_text(value: str) -> str:
     return value
 
 
+def _matches_query(query: str, *, title: str) -> bool:
+    normalized_query = _normalize_search_text(query)
+    if not normalized_query:
+        return False
+    haystack = f" {_normalize_search_text(title)} "
+    return f" {normalized_query} " in haystack
+
+
 def _is_episode_tba(title: str, original_title: str) -> bool:
     combined = f"{title} {original_title}".casefold()
     markers = ("tba", "demnächst", "demnaechst", "coming soon", "to be announced")
@@ -279,7 +356,7 @@ def _get_soup(url: str, *, session: Optional[RequestsSession] = None) -> Beautif
     return BeautifulSoup(response.text, "html.parser")
 
 
-def _get_soup_simple(url: str) -> BeautifulSoupT:
+def _get_html_simple(url: str) -> str:
     _ensure_requests()
     _log_visit(url)
     sess = get_requests_session("serienstream", headers=HEADERS)
@@ -291,17 +368,42 @@ def _get_soup_simple(url: str) -> BeautifulSoupT:
         raise
     if response.url and response.url != url:
         _log_url(response.url, kind="REDIRECT")
-    _log_response_html(url, response.text)
-    if _looks_like_cloudflare_challenge(response.text):
+    body = response.text
+    _log_response_html(url, body)
+    if _looks_like_cloudflare_challenge(body):
         raise RuntimeError("Cloudflare-Schutz erkannt. requests reicht ggf. nicht aus.")
-    return BeautifulSoup(response.text, "html.parser")
+    return body
+
+
+def _get_soup_simple(url: str) -> BeautifulSoupT:
+    body = _get_html_simple(url)
+    return BeautifulSoup(body, "html.parser")
+
+
+def _extract_genre_names_from_html(body: str) -> List[str]:
+    names: List[str] = []
+    seen: set[str] = set()
+    pattern = re.compile(
+        r"<div[^>]*class=[\"'][^\"']*background-1[^\"']*[\"'][^>]*>.*?<h3[^>]*>(.*?)</h3>",
+        re.IGNORECASE | re.DOTALL,
+    )
+    for match in pattern.finditer(body or ""):
+        text = re.sub(r"<[^>]+>", " ", match.group(1) or "")
+        text = unescape(re.sub(r"\s+", " ", text)).strip()
+        if not text:
+            continue
+        key = text.casefold()
+        if key in seen:
+            continue
+        seen.add(key)
+        names.append(text)
+    return names
 
 
 def search_series(query: str) -> List[SeriesResult]:
     """Sucht Serien im (/serien)-Katalog (Genre-liste) nach Titel/Alt-Titel."""
     _ensure_requests()
-    normalized_query = _normalize_search_text(query)
-    if not normalized_query:
+    if not _normalize_search_text(query):
         return []
     # Direkter Abruf wie in fetch_serien.py.
     catalog_url = f"{_get_base_url()}/serien?by=genre"
@@ -309,8 +411,7 @@ def search_series(query: str) -> List[SeriesResult]:
     results: List[SeriesResult] = []
     for series in parse_series_catalog(soup).values():
         for entry in series:
-            haystack = _normalize_search_text(entry.title)
-            if entry.title and normalized_query in haystack:
+            if entry.title and _matches_query(query, title=entry.title):
                 results.append(entry)
     return results
 
@@ -584,10 +685,10 @@ def _extract_latest_episodes(soup: BeautifulSoupT) -> List[LatestEpisode]:
         episode_text = (anchor.select_one(".ep-episode").get_text(strip=True) if anchor.select_one(".ep-episode") else "").strip()
         season_number: Optional[int] = None
         episode_number: Optional[int] = None
-        match = re.search(r"S\\s*(\\d+)", season_text, re.IGNORECASE)
+        match = re.search(r"S\s*(\d+)", season_text, re.IGNORECASE)
         if match:
             season_number = int(match.group(1))
-        match = re.search(r"E\\s*(\\d+)", episode_text, re.IGNORECASE)
+        match = re.search(r"E\s*(\d+)", episode_text, re.IGNORECASE)
         if match:
             episode_number = int(match.group(1))
         if season_number is None or episode_number is None:
@@ -644,17 +745,14 @@ def resolve_redirect(target_url: str) -> Optional[str]:
 def scrape_series_detail(
     series_identifier: str,
     max_seasons: Optional[int] = None,
+    *,
+    load_episodes: bool = True,
 ) -> List[SeasonInfo]:
     _ensure_requests()
     series_url = _series_root_url(_normalize_series_url(series_identifier))
     _log_url(series_url, kind="SERIES")
     _notify_url(series_url)
     session = get_requests_session("serienstream", headers=HEADERS)
-    # Preflight ist optional; manche Umgebungen/Provider leiten die Startseite um.
-    try:
-        _get_soup(_get_base_url(), session=session)
-    except Exception:
-        pass
     soup = _get_soup(series_url, session=session)
 
     base_series_url = _series_root_url(_extract_canonical_url(soup, series_url))
@@ -673,6 +771,8 @@ def scrape_series_detail(
         season_links = season_links[:max_seasons]
     seasons: List[SeasonInfo] = []
     for number, url in season_links:
+        episodes: List[EpisodeInfo] = []
+        if load_episodes:
             season_soup = _get_soup(url, session=session)
             episodes = _extract_episodes(season_soup)
         seasons.append(SeasonInfo(number=number, url=url, episodes=episodes))
@@ -688,9 +788,15 @@ class SerienstreamPlugin(BasisPlugin):
 
     def __init__(self) -> None:
         self._series_results: Dict[str, SeriesResult] = {}
+        self._title_url_cache: Dict[str, str] = self._load_title_url_cache()
+        self._genre_names_cache: Optional[List[str]] = None
         self._season_cache: Dict[str, List[SeasonInfo]] = {}
+        self._season_links_cache: Dict[str, List[SeasonInfo]] = {}
         self._episode_label_cache: Dict[Tuple[str, str], Dict[str, EpisodeInfo]] = {}
         self._catalog_cache: Optional[Dict[str, List[SeriesResult]]] = None
+        self._genre_group_cache: Dict[str, Dict[str, List[str]]] = {}
+        self._genre_page_titles_cache: Dict[Tuple[str, int], List[str]] = {}
+        self._genre_page_count_cache: Dict[str, int] = {}
         self._popular_cache: Optional[List[SeriesResult]] = None
         self._requests_available = REQUESTS_AVAILABLE
         self._default_preferred_hosters: List[str] = list(DEFAULT_PREFERRED_HOSTERS)
@@ -713,6 +819,132 @@ class SerienstreamPlugin(BasisPlugin):
                 print(f"Importfehler: {REQUESTS_IMPORT_ERROR}")
             return
 
+    def _load_title_url_cache(self) -> Dict[str, str]:
+        raw = _session_cache_get("title_urls")
+        if not isinstance(raw, dict):
+            return {}
+        result: Dict[str, str] = {}
+        for key, value in raw.items():
+            key_text = str(key or "").strip().casefold()
+            url_text = str(value or "").strip()
+            if not key_text or not url_text:
+                continue
+            result[key_text] = url_text
+        return result
+
+    def _save_title_url_cache(self) -> None:
+        if not self._title_url_cache:
+            return
+        # Begrenzt die Session-Daten auf die jüngsten Einträge.
+        while len(self._title_url_cache) > SESSION_CACHE_MAX_TITLE_URLS:
+            self._title_url_cache.pop(next(iter(self._title_url_cache)))
+        _session_cache_set("title_urls", self._title_url_cache)
+
+    def _remember_series_result(self, title: str, url: str, description: str = "") -> None:
+        title = (title or "").strip()
+        url = (url or "").strip()
+        if not title:
+            return
+        if url:
+            self._series_results[title] = SeriesResult(title=title, description=description, url=url)
+            cache_key = title.casefold()
+            if self._title_url_cache.get(cache_key) != url:
+                self._title_url_cache[cache_key] = url
+                self._save_title_url_cache()
+            return
+        current = self._series_results.get(title)
+        if current is None:
+            self._series_results[title] = SeriesResult(title=title, description=description, url="")
+
+    @staticmethod
+    def _season_links_cache_name(series_url: str) -> str:
+        digest = hashlib.sha1((series_url or "").encode("utf-8")).hexdigest()[:20]
+        return f"season_links.{digest}"
+
+    @staticmethod
+    def _season_episodes_cache_name(season_url: str) -> str:
+        digest = hashlib.sha1((season_url or "").encode("utf-8")).hexdigest()[:20]
+        return f"season_episodes.{digest}"
+
+    def _load_session_season_links(self, series_url: str) -> Optional[List[SeasonInfo]]:
+        raw = _session_cache_get(self._season_links_cache_name(series_url))
+        if not isinstance(raw, list):
+            return None
+        seasons: List[SeasonInfo] = []
+        for item in raw:
+            if not isinstance(item, dict):
+                continue
+            try:
+                number = int(item.get("number"))
+            except Exception:
+                continue
+            url = str(item.get("url") or "").strip()
+            if number <= 0 or not url:
+                continue
+            seasons.append(SeasonInfo(number=number, url=url, episodes=[]))
+        if not seasons:
+            return None
+        seasons.sort(key=lambda s: s.number)
+        return seasons
+
+    def _save_session_season_links(self, series_url: str, seasons: List[SeasonInfo]) -> None:
+        payload = [{"number": int(season.number), "url": season.url} for season in seasons if season.url]
+        if payload:
+            _session_cache_set(self._season_links_cache_name(series_url), payload)
+
+    def _load_session_season_episodes(self, season_url: str) -> Optional[List[EpisodeInfo]]:
+        raw = _session_cache_get(self._season_episodes_cache_name(season_url))
+        if not isinstance(raw, list):
+            return None
+        episodes: List[EpisodeInfo] = []
+        for item in raw:
+            if not isinstance(item, dict):
+                continue
+            try:
+                number = int(item.get("number"))
+            except Exception:
+                continue
+            title = str(item.get("title") or "").strip()
+            original_title = str(item.get("original_title") or "").strip()
+            url = str(item.get("url") or "").strip()
+            season_label = str(item.get("season_label") or "").strip()
+            languages = [str(lang).strip() for lang in list(item.get("languages") or []) if str(lang).strip()]
+            hosters = [str(host).strip() for host in list(item.get("hosters") or []) if str(host).strip()]
+            if number <= 0:
+                continue
+            episodes.append(
+                EpisodeInfo(
+                    number=number,
+                    title=title or f"Episode {number}",
+                    original_title=original_title,
+                    url=url,
+                    season_label=season_label,
+                    languages=languages,
+                    hosters=hosters,
+                )
+            )
+        if not episodes:
+            return None
+        episodes.sort(key=lambda item: item.number)
+        return episodes
+
+    def _save_session_season_episodes(self, season_url: str, episodes: List[EpisodeInfo]) -> None:
+        payload = []
+        for item in episodes:
+            payload.append(
+                {
+                    "number": int(item.number),
+                    "title": item.title,
+                    "original_title": item.original_title,
+                    "url": item.url,
+                    "season_label": item.season_label,
+                    "languages": list(item.languages or []),
+                    "hosters": list(item.hosters or []),
+                }
+            )
+        if payload:
+            _session_cache_set(self._season_episodes_cache_name(season_url), payload)
+
     def _ensure_catalog(self) -> Dict[str, List[SeriesResult]]:
         if self._catalog_cache is not None:
             return self._catalog_cache
@@ -720,14 +952,38 @@ class SerienstreamPlugin(BasisPlugin):
         catalog_url = f"{_get_base_url()}/serien?by=genre"
         soup = _get_soup_simple(catalog_url)
         self._catalog_cache = parse_series_catalog(soup)
+        _session_cache_set("genres", sorted(self._catalog_cache.keys(), key=str.casefold))
         return self._catalog_cache
 
+    def _ensure_genre_names(self) -> List[str]:
+        if self._genre_names_cache is not None:
+            return list(self._genre_names_cache)
+        cached = _session_cache_get("genres")
+        if isinstance(cached, list):
+            genres = [str(value).strip() for value in cached if str(value).strip()]
+            if genres:
+                self._genre_names_cache = sorted(set(genres), key=str.casefold)
+                return list(self._genre_names_cache)
+        catalog_url = f"{_get_base_url()}/serien?by=genre"
+        try:
+            body = _get_html_simple(catalog_url)
+            genres = _extract_genre_names_from_html(body)
+        except Exception:
+            genres = []
+        if not genres:
+            catalog = self._ensure_catalog()
+            genres = sorted(catalog.keys(), key=str.casefold)
+        else:
+            genres = sorted(set(genres), key=str.casefold)
+        self._genre_names_cache = list(genres)
+        _session_cache_set("genres", self._genre_names_cache)
+        return list(self._genre_names_cache)
+
     def genres(self) -> List[str]:
         """Optional: Liefert alle Genres aus dem Serien-Katalog."""
         if not self._requests_available:
             return []
-        catalog = self._ensure_catalog()
-        return sorted(catalog.keys(), key=str.casefold)
+        return self._ensure_genre_names()
 
     def capabilities(self) -> set[str]:
         """Meldet unterstützte Features für Router-Menüs."""
@@ -738,7 +994,8 @@ class SerienstreamPlugin(BasisPlugin):
         if not self._requests_available:
             return []
         entries = self._ensure_popular()
-        self._series_results.update({entry.title: entry for entry in entries if entry.title})
+        for entry in entries:
+            self._remember_series_result(entry.title, entry.url, entry.description)
         return [entry.title for entry in entries if entry.title]
 
     def titles_for_genre(self, genre: str) -> List[str]:
@@ -752,9 +1009,167 @@ class SerienstreamPlugin(BasisPlugin):
             return self.popular_series()
         catalog = self._ensure_catalog()
         entries = catalog.get(genre, [])
-        self._series_results.update({entry.title: entry for entry in entries if entry.title})
+        for entry in entries:
+            self._remember_series_result(entry.title, entry.url, entry.description)
         return [entry.title for entry in entries if entry.title]
 
+    @staticmethod
+    def _title_group_key(title: str) -> str:
+        raw = (title or "").strip()
+        if not raw:
+            return "#"
+        for char in raw:
+            if char.isdigit():
+                return "0-9"
+            if char.isalpha():
+                normalized = char.casefold()
+                if normalized == "ä":
+                    normalized = "a"
+                elif normalized == "ö":
+                    normalized = "o"
+                elif normalized == "ü":
+                    normalized = "u"
+                elif normalized == "ß":
+                    normalized = "s"
+                return normalized.upper()
+        return "#"
+
+    @classmethod
+    def _group_matches(cls, group_code: str, title: str) -> bool:
+        key = cls._title_group_key(title)
+        if group_code == "0-9":
+            return key == "0-9"
+        if key == "0-9" or key == "#":
+            return False
+        if group_code == "A-E":
+            return "A" <= key <= "E"
+        if group_code == "F-J":
+            return "F" <= key <= "J"
+        if group_code == "K-O":
+            return "K" <= key <= "O"
+        if group_code == "P-T":
+            return "P" <= key <= "T"
+        if group_code == "U-Z":
+            return "U" <= key <= "Z"
+        return False
+
+    def _ensure_genre_group_cache(self, genre: str) -> Dict[str, List[str]]:
+        cached = self._genre_group_cache.get(genre)
+        if cached is not None:
+            return cached
+        titles = self.titles_for_genre(genre)
+        grouped: Dict[str, List[str]] = {}
+        for title in titles:
+            for code in ("A-E", "F-J", "K-O", "P-T", "U-Z", "0-9"):
+                if self._group_matches(code, title):
+                    grouped.setdefault(code, []).append(title)
+                    break
+        for code in grouped:
+            grouped[code].sort(key=str.casefold)
+        self._genre_group_cache[genre] = grouped
+        return grouped
+
+    @staticmethod
+    def _genre_slug(genre: str) -> str:
+        value = (genre or "").strip().casefold()
+        value = value.replace("&", " und ")
+        value = unicodedata.normalize("NFKD", value)
+        value = "".join(ch for ch in value if not unicodedata.combining(ch))
+        value = re.sub(r"[^a-z0-9]+", "-", value).strip("-")
+        return value
+
+    def _fetch_genre_page_titles(self, genre: str, page: int) -> Tuple[List[str], int]:
+        slug = self._genre_slug(genre)
+        if not slug:
+            return [], 1
+        cache_key = (slug, page)
+        cached = self._genre_page_titles_cache.get(cache_key)
+        cached_pages = self._genre_page_count_cache.get(slug)
+        if cached is not None and cached_pages is not None:
+            return list(cached), int(cached_pages)
+        url = f"{_get_base_url()}/genre/{slug}"
+        if page > 1:
+            url = f"{url}?page={int(page)}"
+        soup = _get_soup_simple(url)
+        titles: List[str] = []
+        seen: set[str] = set()
+        for anchor in soup.select("a.show-card[href]"):
+            href = (anchor.get("href") or "").strip()
+            series_url = _absolute_url(href).split("#", 1)[0].split("?", 1)[0].rstrip("/")
+            if "/serie/" not in series_url:
+                continue
+            img = anchor.select_one("img[alt]")
+            title = ((img.get("alt") if img else "") or "").strip()
+            if not title:
+                continue
+            key = title.casefold()
+            if key in seen:
+                continue
+            seen.add(key)
+            self._remember_series_result(title, series_url)
+            titles.append(title)
+        max_page = 1
+        for anchor in soup.select("a[href*='?page=']"):
+            href = (anchor.get("href") or "").strip()
+            match = re.search(r"[?&]page=(\d+)", href)
+            if not match:
+                continue
+            try:
+                max_page = max(max_page, int(match.group(1)))
+            except Exception:
+                continue
+        self._genre_page_titles_cache[cache_key] = list(titles)
+        self._genre_page_count_cache[slug] = max_page
+        return list(titles), max_page
+
+    def titles_for_genre_group_page(self, genre: str, group_code: str, page: int = 1, page_size: int = 10) -> List[str]:
+        genre = (genre or "").strip()
+        group_code = (group_code or "").strip()
+        page = max(1, int(page or 1))
+        page_size = max(1, int(page_size or 10))
+        needed = page * page_size + 1
+        matched: List[str] = []
+        try:
+            _, max_pages = self._fetch_genre_page_titles(genre, 1)
+            for page_index in range(1, max_pages + 1):
+                page_titles, _ = self._fetch_genre_page_titles(genre, page_index)
+                for title in page_titles:
+                    if self._group_matches(group_code, title):
+                        matched.append(title)
+                if len(matched) >= needed:
+                    break
+            start = (page - 1) * page_size
+            end = start + page_size
+            return list(matched[start:end])
+        except Exception:
+            grouped = self._ensure_genre_group_cache(genre)
+            titles = grouped.get(group_code, [])
+            start = (page - 1) * page_size
+            end = start + page_size
+            return list(titles[start:end])
+
+    def genre_group_has_more(self, genre: str, group_code: str, page: int = 1, page_size: int = 10) -> bool:
+        genre = (genre or "").strip()
+        group_code = (group_code or "").strip()
+        page = max(1, int(page or 1))
+        page_size = max(1, int(page_size or 10))
+        needed = page * page_size + 1
+        count = 0
+        try:
+            _, max_pages = self._fetch_genre_page_titles(genre, 1)
+            for page_index in range(1, max_pages + 1):
+                page_titles, _ = self._fetch_genre_page_titles(genre, page_index)
+                for title in page_titles:
+                    if self._group_matches(group_code, title):
+                        count += 1
+                        if count >= needed:
+                            return True
+            return False
+        except Exception:
+            grouped = self._ensure_genre_group_cache(genre)
+            titles = grouped.get(group_code, [])
+            return len(titles) > (page * page_size)
+
     def _ensure_popular(self) -> List[SeriesResult]:
         """Laedt und cached die Liste der beliebten Serien aus `/beliebte-serien`."""
         if self._popular_cache is not None:
@@ -784,7 +1199,7 @@ class SerienstreamPlugin(BasisPlugin):
             if not title or title in seen:
                 continue
             url = _absolute_url(href).split("#", 1)[0].split("?", 1)[0].rstrip("/")
-            url = re.sub(r"/staffel-\\d+(?:/.*)?$", "", url).rstrip("/")
+            url = re.sub(r"/staffel-\d+(?:/.*)?$", "", url).rstrip("/")
             if not url:
                 continue
             _log_parsed_url(url)
@@ -830,19 +1245,104 @@ class SerienstreamPlugin(BasisPlugin):
             self._episode_label(info): info for info in season_info.episodes
         }
 
+    def _ensure_season_links(self, title: str) -> List[SeasonInfo]:
+        cached = self._season_links_cache.get(title)
+        if cached is not None:
+            return list(cached)
+        series = self._series_results.get(title)
+        if not series:
+            cached_url = self._title_url_cache.get(title.casefold().strip(), "")
+            if cached_url:
+                series = SeriesResult(title=title, description="", url=cached_url)
+                self._series_results[title] = series
+        if not series:
+            catalog = self._ensure_catalog()
+            lookup_key = title.casefold().strip()
+            for entries in catalog.values():
+                for entry in entries:
+                    if entry.title.casefold().strip() == lookup_key:
+                        series = entry
+                        self._remember_series_result(entry.title, entry.url, entry.description)
+                        break
+                if series:
+                    break
+        if not series:
+            return []
+        session_links = self._load_session_season_links(series.url)
+        if session_links:
+            self._season_links_cache[title] = list(session_links)
+            return list(session_links)
+        try:
+            seasons = scrape_series_detail(series.url, load_episodes=False)
+        except Exception as exc:  # pragma: no cover - defensive logging
+            raise RuntimeError(f"Serienstream-Staffeln konnten nicht geladen werden: {exc}") from exc
+        self._season_links_cache[title] = list(seasons)
+        self._save_session_season_links(series.url, seasons)
+        return list(seasons)
+
+    def remember_series_url(self, title: str, series_url: str) -> None:
+        title = (title or "").strip()
+        series_url = (series_url or "").strip()
+        if not title or not series_url:
+            return
+        self._remember_series_result(title, series_url)
+
+    def series_url_for_title(self, title: str) -> str:
+        title = (title or "").strip()
+        if not title:
+            return ""
+        direct = self._series_results.get(title)
+        if direct and direct.url:
+            return direct.url
+        cached_url = self._title_url_cache.get(title.casefold().strip(), "")
+        if cached_url:
+            return cached_url
+        lookup_key = title.casefold().strip()
+        for entry in self._series_results.values():
+            if entry.title.casefold().strip() == lookup_key and entry.url:
+                return entry.url
+        return ""
+
+    def _ensure_season_episodes(self, title: str, season_number: int) -> Optional[SeasonInfo]:
+        seasons = self._season_cache.get(title) or []
+        for season in seasons:
+            if season.number == season_number and season.episodes:
+                return season
+        links = self._ensure_season_links(title)
+        target = next((season for season in links if season.number == season_number), None)
+        if not target:
+            return None
+        cached_episodes = self._load_session_season_episodes(target.url)
+        if cached_episodes:
+            season_info = SeasonInfo(number=target.number, url=target.url, episodes=list(cached_episodes))
+            updated = [season for season in seasons if season.number != season_number]
+            updated.append(season_info)
+            updated.sort(key=lambda item: item.number)
+            self._season_cache[title] = updated
+            return season_info
+        try:
+            season_soup = _get_soup(target.url, session=get_requests_session("serienstream", headers=HEADERS))
+            season_info = SeasonInfo(number=target.number, url=target.url, episodes=_extract_episodes(season_soup))
+        except Exception as exc:  # pragma: no cover - defensive logging
+            raise RuntimeError(f"Serienstream-Episoden konnten nicht geladen werden: {exc}") from exc
+
+        updated = [season for season in seasons if season.number != season_number]
+        updated.append(season_info)
+        updated.sort(key=lambda item: item.number)
+        self._season_cache[title] = updated
+        self._save_session_season_episodes(target.url, season_info.episodes)
+        return season_info
+
     def _lookup_episode(self, title: str, season_label: str, episode_label: str) -> Optional[EpisodeInfo]:
         cache_key = (title, season_label)
         cached = self._episode_label_cache.get(cache_key)
         if cached:
             return cached.get(episode_label)
-
-        seasons = self._ensure_seasons(title)
         number = self._parse_season_number(season_label)
         if number is None:
             return None
-
-        for season_info in seasons:
-            if season_info.number == number:
+        season_info = self._ensure_season_episodes(title, number)
+        if season_info:
             self._cache_episode_labels(title, season_label, season_info)
             return self._episode_label_cache.get(cache_key, {}).get(episode_label)
         return None
@@ -852,6 +1352,7 @@ class SerienstreamPlugin(BasisPlugin):
         if not query:
             self._series_results.clear()
             self._season_cache.clear()
+            self._season_links_cache.clear()
             self._episode_label_cache.clear()
             self._catalog_cache = None
             return []
@@ -867,8 +1368,11 @@ class SerienstreamPlugin(BasisPlugin):
             self._episode_label_cache.clear()
             self._catalog_cache = None
             raise RuntimeError(f"Serienstream-Suche fehlgeschlagen: {exc}") from exc
-        self._series_results = {result.title: result for result in results}
+        self._series_results = {}
+        for result in results:
+            self._remember_series_result(result.title, result.url, result.description)
         self._season_cache.clear()
+        self._season_links_cache.clear()
         self._episode_label_cache.clear()
         return [result.title for result in results]
 
@@ -895,33 +1399,27 @@ class SerienstreamPlugin(BasisPlugin):
                 for entry in entries:
                     if entry.title.casefold().strip() == lookup_key:
                         series = entry
-                        self._series_results[entry.title] = entry
+                        self._remember_series_result(entry.title, entry.url, entry.description)
                         break
                 if series:
                     break
         if not series:
             return []
-        try:
-            seasons = scrape_series_detail(series.url)
-        except Exception as exc:  # pragma: no cover - defensive logging
-            raise RuntimeError(f"Serienstream-Staffeln konnten nicht geladen werden: {exc}") from exc
+        seasons = self._ensure_season_links(title)
         self._clear_episode_cache_for_title(title)
-        self._season_cache[title] = seasons
-        return seasons
+        self._season_cache[title] = list(seasons)
+        return list(seasons)
 
     def seasons_for(self, title: str) -> List[str]:
         seasons = self._ensure_seasons(title)
-        # Serienstream liefert gelegentlich Staffeln ohne Episoden (z.B. Parsing-/Layoutwechsel).
-        # Diese sollen im UI nicht als auswählbarer Menüpunkt erscheinen.
-        return [self._season_label(season.number) for season in seasons if season.episodes]
+        return [self._season_label(season.number) for season in seasons]
 
     def episodes_for(self, title: str, season: str) -> List[str]:
-        seasons = self._ensure_seasons(title)
         number = self._parse_season_number(season)
         if number is None:
             return []
-        for season_info in seasons:
-            if season_info.number == number:
+        season_info = self._ensure_season_episodes(title, number)
+        if season_info:
             labels = [self._episode_label(info) for info in season_info.episodes]
             self._cache_episode_labels(title, season, season_info)
             return labels

addon/plugins/topstreamfilm_plugin.py

@@ -106,10 +106,8 @@ def _matches_query(query: str, *, title: str, description: str) -> bool:
     normalized_query = _normalize_search_text(query)
     if not normalized_query:
         return False
-    haystack = _normalize_search_text(title)
-    if not haystack:
-        return False
-    return normalized_query in haystack
+    haystack = f" {_normalize_search_text(title)} "
+    return f" {normalized_query} " in haystack
 
 
 def _strip_der_film_suffix(title: str) -> str:

addon/resources/settings.xml

@@ -24,6 +24,10 @@
     <setting id="dump_html_einschalten" type="bool" label="Einschalten: HTML-Dumps" default="false" />
     <setting id="show_url_info_einschalten" type="bool" label="Einschalten: URL-Info anzeigen" default="false" />
     <setting id="log_errors_einschalten" type="bool" label="Einschalten: Fehler loggen" default="false" />
+    <setting id="log_urls_filmpalast" type="bool" label="Filmpalast: URL-Logging" default="false" />
+    <setting id="dump_html_filmpalast" type="bool" label="Filmpalast: HTML-Dumps" default="false" />
+    <setting id="show_url_info_filmpalast" type="bool" label="Filmpalast: URL-Info anzeigen" default="false" />
+    <setting id="log_errors_filmpalast" type="bool" label="Filmpalast: Fehler loggen" default="false" />
   </category>
   <category label="TopStream">
     <setting id="topstream_base_url" type="text" label="Domain (BASE_URL)" default="https://topstreamfilm.live" />
@@ -38,6 +42,9 @@
   <category label="Einschalten">
     <setting id="einschalten_base_url" type="text" label="Domain (BASE_URL)" default="https://einschalten.in" />
   </category>
+  <category label="Filmpalast">
+    <setting id="filmpalast_base_url" type="text" label="Domain (BASE_URL)" default="https://filmpalast.to" />
+  </category>
   <category label="TMDB">
     <setting id="tmdb_enabled" type="bool" label="TMDB aktivieren" default="true" />
     <setting id="tmdb_api_key" type="text" label="TMDB API Key" default="" />

docs/PLUGIN_DEVELOPMENT.md

@@ -13,6 +13,23 @@ Jedes Plugin muss diese Methoden implementieren:
 - `seasons_for(title: str) -> list[str]`
 - `episodes_for(title: str, season: str) -> list[str]`
 
+## Vertrag Plugin ↔ Hauptlogik (`default.py`)
+Die Hauptlogik ruft Plugin-Methoden auf und verarbeitet ausschließlich deren Rückgaben.
+
+Wesentliche Rückgaben an die Hauptlogik:
+- `search_titles(...)` → Liste von Titel-Strings für die Trefferliste
+- `seasons_for(...)` → Liste von Staffel-Labels
+- `episodes_for(...)` → Liste von Episoden-Labels
+- `stream_link_for(...)` → Hoster-/Player-Link (nicht zwingend finale Media-URL)
+- `resolve_stream_link(...)` → finale/spielbare URL nach Redirect/Resolver
+- Optional `available_hosters_for(...)` → auswählbare Hoster-Namen im Dialog
+- Optional `series_url_for_title(...)` → stabile Detail-URL pro Titel für Folgeaufrufe
+- Optional `remember_series_url(...)` → Übernahme einer bereits bekannten Detail-URL
+
+Standard für Film-Provider (ohne echte Staffeln):
+- `seasons_for(title)` gibt `["Film"]` zurück
+- `episodes_for(title, "Film")` gibt `["Stream"]` zurück
+
 ## Optionale Features (Capabilities)
 Über `capabilities()` kann das Plugin zusätzliche Funktionen anbieten:
 - `popular_series` → `popular_series()`
@@ -27,7 +44,8 @@ Jedes Plugin muss diese Methoden implementieren:
 
 ## Suche (aktuelle Policy)
 - **Nur Titel‑Matches**
-- **Substring‑Match** nach Normalisierung (Lowercase + Nicht‑Alnum → Leerzeichen)
+- **Wortbasierter Match** nach Normalisierung (Lowercase + Nicht‑Alnum → Leerzeichen)
+- Keine Teilwort-Treffer innerhalb eines Wortes (Beispiel: `hund` matcht nicht `thunder`)
 - Keine Beschreibung/Plot/Meta für Matches
 
 ## Namensgebung
@@ -41,10 +59,23 @@ Standard: `*_base_url` (Domain / BASE_URL)
   - `aniworld_base_url`
   - `einschalten_base_url`
   - `topstream_base_url`
+  - `filmpalast_base_url`
 
 ## Playback
-- Wenn möglich `stream_link_for(...)` implementieren.
-- Optional `available_hosters_for(...)`/`resolve_stream_link(...)` für Hoster‑Auflösung.
+- `stream_link_for(...)` implementieren (liefert bevorzugten Hoster-Link).
+- `available_hosters_for(...)` bereitstellen, wenn die Seite mehrere Hoster anbietet.
+- `resolve_stream_link(...)` nach einheitlichem Flow umsetzen:
+  1. Redirects auflösen (falls vorhanden)
+  2. ResolveURL (`resolveurl_backend.resolve`) versuchen
+  3. Bei Fehlschlag auf den besten verfügbaren Link zurückfallen
+- Optional `set_preferred_hosters(...)` unterstützen, damit die Hoster-Auswahl aus der Hauptlogik direkt greift.
+
+## Standard‑Flow (empfohlen)
+1. **Suche**: nur Titel liefern und Titel→Detail-URL mappen.
+2. **Navigation**: `series_url_for_title`/`remember_series_url` unterstützen, damit URLs zwischen Aufrufen stabil bleiben.
+3. **Auswahl Hoster**: Hoster-Namen aus der Detailseite extrahieren und anbieten.
+4. **Playback**: Hoster-Link liefern, danach konsistent über `resolve_stream_link` finalisieren.
+5. **Fallbacks**: bei Layout-Unterschieden defensiv parsen und Logging aktivierbar halten.
 
 ## Debugging
 Global gesteuert über Settings:
@@ -67,7 +98,10 @@ Plugins sollten die Helper aus `addon/plugin_helpers.py` nutzen:
 ## Beispiel‑Checkliste
 - [ ] `name` korrekt gesetzt
 - [ ] `*_base_url` in Settings vorhanden
-- [ ] Suche matcht nur Titel
+- [ ] Suche matcht nur Titel und wortbasiert
+- [ ] `stream_link_for` + `resolve_stream_link` folgen dem Standard-Flow
+- [ ] Optional: `available_hosters_for` + `set_preferred_hosters` vorhanden
+- [ ] Optional: `series_url_for_title` + `remember_series_url` vorhanden
 - [ ] Fehlerbehandlung und Timeouts vorhanden
 - [ ] Optional: Caches für Performance
 

docs/PLUGIN_SYSTEM.md

@@ -16,6 +16,7 @@ Weitere Details:
 - `topstreamfilm_plugin.py` – Topstreamfilm
 - `einschalten_plugin.py` – Einschalten
 - `aniworld_plugin.py` – Aniworld
+- `filmpalast_plugin.py` – Filmpalast
 - `_template_plugin.py` – Vorlage für neue Plugins
 
 ### Plugin-Discovery (Ladeprozess)

pyproject.toml

@@ -0,0 +1,20 @@
+[tool.pytest.ini_options]
+addopts = "-q --cov=addon --cov-report=term-missing"
+python_files = ["test_*.py"]
+norecursedirs = ["scripts"]
+markers = [
+  "live: real HTTP requests (set LIVE_TESTS=1 to run)",
+  "perf: performance benchmarks",
+]
+
+[tool.coverage.run]
+source = ["addon"]
+branch = true
+omit = [
+  "*/__pycache__/*",
+  "addon/resources/*",
+]
+
+[tool.coverage.report]
+show_missing = true
+skip_empty = true

requirements-dev.txt

@@ -0,0 +1,2 @@
+pytest>=9,<10
+pytest-cov>=5,<8