dev: bump to 0.1.86.0-dev Settings-Menü benutzerfreundlicher gestaltet

CHANGELOG-DEV.md

@@ -1,3 +1,23 @@
+## 0.1.85.5-dev - 2026-04-02
+
+- dev: bump to 0.1.85.0-dev settings.xml und default.py auf 0.1.84.5-Stand zurueckgesetzt, serienstream_plugin.py aktuell behalten
+
+## 0.1.85.0-dev - 2026-04-01
+
+- dev: bump to 0.1.84.5-dev settings.xml auf Kodi 19+ Format (version=1) migriert, Level-Filter fuer Expert/Advanced korrigiert
+
+## 0.1.84.5-dev - 2026-03-31
+
+- dev: bump to 0.1.84.0-dev SerienStream Sammlungen mit Poster/Plot, Session-Cache für Sammlungs-URLs
+
+## 0.1.84.0-dev - 2026-03-16
+
+- dev: bump to 0.1.83.5-dev Trakt Weiterschauen via watched/shows, Specials überspringen
+
+## 0.1.83.5-dev - 2026-03-15
+
+- dev: SerienStream Suche via /suche?term=, Staffel 0 als Filme, Katalog-Suche entfernt
+
 ## 0.1.83.0-dev - 2026-03-15
 
 - dev: Trakt Performance, Suchfilter Phrase-Match, Debug-Settings Expert-Level

addon/addon.xml

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

addon/core/trakt.py

@@ -370,6 +370,40 @@ class TraktClient:
             return []
         return self._parse_history_items(payload)
 
+    def get_watched_shows(self, token: str) -> list[TraktItem]:
+        """GET /users/me/watched/shows – alle Serien mit zuletzt gesehener Episode."""
+        status, payload = self._get("/users/me/watched/shows", token=token)
+        if status != 200 or not isinstance(payload, list):
+            self._do_log(f"get_watched_shows: status={status}")
+            return []
+        result: list[TraktItem] = []
+        for entry in payload:
+            if not isinstance(entry, dict):
+                continue
+            show = entry.get("show") or {}
+            ids = self._parse_ids((show.get("ids") or {}))
+            title = str(show.get("title", "") or "")
+            year = int(show.get("year", 0) or 0)
+            seasons = entry.get("seasons") or []
+            last_season = 0
+            last_episode = 0
+            for s in seasons:
+                snum = int((s.get("number") or 0))
+                if snum == 0:  # Specials überspringen
+                    continue
+                for ep in (s.get("episodes") or []):
+                    enum = int((ep.get("number") or 0))
+                    if snum > last_season or (snum == last_season and enum > last_episode):
+                        last_season = snum
+                        last_episode = enum
+            if title:
+                result.append(TraktItem(
+                    title=title, year=year, media_type="episode",
+                    ids=ids, season=last_season, episode=last_episode,
+                ))
+        self._do_log(f"get_watched_shows: {len(result)} Serien")
+        return result
+
     # -------------------------------------------------------------------
     # Calendar
     # -------------------------------------------------------------------

addon/default.py

@@ -602,6 +602,20 @@ def _get_setting_int(setting_id: str, *, default: int = 0) -> int:
     return default
 
 
+_PREFERRED_HOSTERS_LIST = [
+    "voe", "streamtape", "doodstream", "vidoza", "mixdrop", "supervideo", "dropload",
+]
+
+
+def _get_preferred_hoster() -> str:
+    """Liest preferred_hoster (enum-Index) und gibt den Hosternamen zurueck."""
+    raw = _get_setting_string("preferred_hoster").strip()
+    try:
+        return _PREFERRED_HOSTERS_LIST[int(raw)]
+    except (ValueError, IndexError):
+        return raw  # Fallback: Textwert direkt verwenden
+
+
 def _metadata_policy(
     plugin_name: str,
     plugin: BasisPlugin,
@@ -1535,6 +1549,11 @@ def _install_addon_version(info_url: str, version: str) -> bool:
     return _install_addon_version_manual(info_url, version)
 
 
+def _sync_trakt_status_setting() -> None:
+    connected = bool(_trakt_load_token())
+    _get_addon().setSetting("trakt_status", "Verbunden" if connected else "Nicht verbunden")
+
+
 def _sync_update_channel_status_settings() -> None:
     channel = _selected_update_channel()
     selected_info_url = _resolve_update_info_url()
@@ -2095,8 +2114,17 @@ def _run_async(coro):
     """Fuehrt eine Coroutine aus, auch wenn Kodi bereits einen Event-Loop hat."""
     _ensure_windows_selector_policy()
 
-    def _run_with_asyncio_run():
-        return asyncio.run(coro)
+    def _run_without_asyncio_run():
+        # asyncio.run() wuerde cancel_all_tasks() aufrufen, was auf Android TV
+        # wegen eines kaputten _weakrefset.py-Builds zu NameError: 'len' fuehrt.
+        loop = asyncio.new_event_loop()
+        try:
+            return loop.run_until_complete(coro)
+        finally:
+            try:
+                loop.close()
+            except Exception:
+                pass
 
     try:
         running_loop = asyncio.get_running_loop()
@@ -2109,7 +2137,7 @@ def _run_async(coro):
 
         def _worker() -> None:
             try:
-                result_box["value"] = _run_with_asyncio_run()
+                result_box["value"] = _run_without_asyncio_run()
             except BaseException as exc:  # pragma: no cover - defensive
                 error_box["error"] = exc
 
@@ -2120,7 +2148,7 @@ def _run_async(coro):
             raise error_box["error"]
         return result_box.get("value")
 
-    return _run_with_asyncio_run()
+    return _run_without_asyncio_run()
 
 
 def _series_url_params(plugin: BasisPlugin, title: str) -> dict[str, str]:
@@ -4379,7 +4407,7 @@ def _play_episode(
     selected_hoster: str | None = None
     forced_hoster = (forced_hoster or "").strip()
     autoplay = _get_setting_bool("autoplay_enabled", default=False)
-    preferred = _get_setting_string("preferred_hoster").strip()
+    preferred = _get_preferred_hoster()
     if available_hosters:
         if forced_hoster:
             for hoster in available_hosters:
@@ -4414,12 +4442,14 @@ def _play_episode(
         preferred_setter([selected_hoster])
 
     try:
+        with _busy_dialog("Stream wird gesucht..."):
             link = plugin.stream_link_for(title, season, episode)
         if not link:
             _log("Kein Stream gefunden.", xbmc.LOGWARNING)
             xbmcgui.Dialog().notification("Wiedergabe", "Kein Stream gefunden.", xbmcgui.NOTIFICATION_INFO, 3000)
             return
         _log(f"Stream-Link: {link}", xbmc.LOGDEBUG)
+        with _busy_dialog("Stream wird aufgelöst..."):
             final_link = _resolve_stream_with_retry(plugin, link)
         if not final_link:
             return
@@ -4496,7 +4526,7 @@ def _play_episode_url(
 
     selected_hoster: str | None = None
     autoplay = _get_setting_bool("autoplay_enabled", default=False)
-    preferred = _get_setting_string("preferred_hoster").strip()
+    preferred = _get_preferred_hoster()
     if available_hosters:
         if autoplay and preferred:
             pref_lower = preferred.casefold()
@@ -4754,13 +4784,33 @@ def _show_collection_titles_page(plugin_name: str, collection: str, page: int =
         xbmcplugin.endOfDirectory(handle)
         return
     titles = [str(t).strip() for t in titles if t and str(t).strip()]
-    direct_play = bool(plugin_name.casefold() == "einschalten"
-                       and _get_setting_bool("einschalten_enable_playback", default=False))
-    for title in titles:
-        _add_directory_item(handle, title, "play_movie" if direct_play else "seasons",
-                            {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
-                            is_folder=not direct_play)
     if titles:
+        use_source, show_tmdb, prefer_source = _metadata_policy(
+            plugin_name, plugin, allow_tmdb=_tmdb_list_enabled()
+        )
+        plugin_meta = _collect_plugin_metadata(plugin, titles) if use_source else {}
+        show_plot = _get_setting_bool("tmdb_show_plot", default=True)
+        show_art = _get_setting_bool("tmdb_show_art", default=True)
+        tmdb_prefetched: dict[str, tuple[dict[str, str], dict[str, str], list[TmdbCastMember]]] = {}
+        tmdb_titles = list(titles) if show_tmdb else []
+        if show_tmdb and prefer_source and use_source:
+            tmdb_titles = [
+                t for t in titles
+                if _needs_tmdb((plugin_meta.get(t) or ({},))[0], (plugin_meta.get(t) or ({}, {}))[1],
+                               want_plot=show_plot, want_art=show_art)
+            ]
+        if show_tmdb and tmdb_titles:
+            with _busy_dialog(f"{collection} wird geladen..."):
+                tmdb_prefetched = _tmdb_labels_and_art_bulk(tmdb_titles)
+        for title in titles:
+            tmdb_info, tmdb_art, tmdb_cast = tmdb_prefetched.get(title, ({}, {}, [])) if show_tmdb else ({}, {}, [])
+            meta = plugin_meta.get(title)
+            info_labels, art, cast = _merge_metadata(title, tmdb_info, tmdb_art, tmdb_cast, meta)
+            info_labels = dict(info_labels or {})
+            info_labels.setdefault("mediatype", "tvshow")
+            _add_directory_item(handle, title, "seasons",
+                                {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
+                                is_folder=True, info_labels=info_labels, art=art, cast=cast)
         _add_directory_item(handle, "Naechste Seite", "collection_titles_page",
                             {"plugin": plugin_name, "collection": collection, "page": str(page + 1)}, is_folder=True)
     xbmcplugin.endOfDirectory(handle)
@@ -4815,11 +4865,33 @@ def _show_tag_titles_page(plugin_name: str, tag: str, page: int = 1) -> None:
         xbmcplugin.endOfDirectory(handle)
         return
     titles = [str(t).strip() for t in titles if t and str(t).strip()]
+    if titles:
+        use_source, show_tmdb, prefer_source = _metadata_policy(
+            plugin_name, plugin, allow_tmdb=_tmdb_list_enabled()
+        )
+        plugin_meta = _collect_plugin_metadata(plugin, titles) if use_source else {}
+        show_plot = _get_setting_bool("tmdb_show_plot", default=True)
+        show_art = _get_setting_bool("tmdb_show_art", default=True)
+        tmdb_prefetched: dict[str, tuple[dict[str, str], dict[str, str], list[TmdbCastMember]]] = {}
+        tmdb_titles = list(titles) if show_tmdb else []
+        if show_tmdb and prefer_source and use_source:
+            tmdb_titles = [
+                t for t in titles
+                if _needs_tmdb((plugin_meta.get(t) or ({},))[0], (plugin_meta.get(t) or ({}, {}))[1],
+                               want_plot=show_plot, want_art=show_art)
+            ]
+        if show_tmdb and tmdb_titles:
+            with _busy_dialog("Schlagwort-Liste wird geladen..."):
+                tmdb_prefetched = _tmdb_labels_and_art_bulk(tmdb_titles)
         for title in titles:
+            tmdb_info, tmdb_art, tmdb_cast = tmdb_prefetched.get(title, ({}, {}, [])) if show_tmdb else ({}, {}, [])
+            meta = plugin_meta.get(title)
+            info_labels, art, cast = _merge_metadata(title, tmdb_info, tmdb_art, tmdb_cast, meta)
+            info_labels = dict(info_labels or {})
+            info_labels.setdefault("mediatype", "tvshow")
             _add_directory_item(handle, title, "seasons",
                                 {"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
-                            is_folder=True)
-    if titles:
+                                is_folder=True, info_labels=info_labels, art=art, cast=cast)
         _add_directory_item(handle, "Naechste Seite", "tag_titles_page",
                             {"plugin": plugin_name, "tag": tag, "page": str(page + 1)}, is_folder=True)
     xbmcplugin.endOfDirectory(handle)
@@ -4929,7 +5001,7 @@ def _show_trakt_watchlist(media_type: str = "") -> None:
         _add_directory_item(handle, label, "search", {"query": item.title}, is_folder=True, info_labels=info_labels, art=art)
     if not items:
         xbmcgui.Dialog().notification("Trakt", "Watchlist ist leer.", xbmcgui.NOTIFICATION_INFO, 3000)
-    xbmcplugin.endOfDirectory(handle)
+    xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
 
 
 def _show_trakt_history(page: int = 1) -> None:
@@ -4999,7 +5071,7 @@ def _show_trakt_history(page: int = 1) -> None:
         _add_directory_item(handle, "Naechste Seite >>", "trakt_history", {"page": str(page + 1)}, is_folder=True)
     if not items and page == 1:
         xbmcgui.Dialog().notification("Trakt", "Keine History vorhanden.", xbmcgui.NOTIFICATION_INFO, 3000)
-    xbmcplugin.endOfDirectory(handle)
+    xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
 
 
 def _show_trakt_upcoming() -> None:
@@ -5110,7 +5182,7 @@ def _show_trakt_upcoming() -> None:
 
         _add_directory_item(handle, label, action, params, is_folder=True, info_labels=info_labels, art=art)
 
-    xbmcplugin.endOfDirectory(handle)
+    xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
 
 
 def _show_trakt_continue_watching() -> None:
@@ -5127,21 +5199,17 @@ def _show_trakt_continue_watching() -> None:
     _set_content(handle, "episodes")
 
     try:
-        history = client.get_history(token, media_type="episodes", limit=100)
+        watched = client.get_watched_shows(token)
     except Exception as exc:
-        _log(f"Trakt History fehlgeschlagen: {exc}", xbmc.LOGWARNING)
-        xbmcgui.Dialog().notification("Trakt", "History konnte nicht geladen werden.", xbmcgui.NOTIFICATION_INFO, 3000)
+        _log(f"Trakt Watched fehlgeschlagen: {exc}", xbmc.LOGWARNING)
+        xbmcgui.Dialog().notification("Trakt", "Watched-Liste konnte nicht geladen werden.", xbmcgui.NOTIFICATION_INFO, 3000)
         xbmcplugin.endOfDirectory(handle)
         return
 
-    # Pro Serie nur den zuletzt gesehenen Eintrag behalten (History ist absteigend sortiert)
-    seen: dict[str, object] = {}
-    for item in history:
-        if item.title and item.title not in seen:
-            seen[item.title] = item
+    seen: dict[str, object] = {item.title: item for item in watched if item.title}
 
     if not seen:
-        xbmcgui.Dialog().notification("Trakt", "Keine History vorhanden.", xbmcgui.NOTIFICATION_INFO, 3000)
+        xbmcgui.Dialog().notification("Trakt", "Keine gesehenen Serien vorhanden.", xbmcgui.NOTIFICATION_INFO, 3000)
         xbmcplugin.endOfDirectory(handle)
         return
 
@@ -5169,7 +5237,7 @@ def _show_trakt_continue_watching() -> None:
         _, art, _ = tmdb_prefetched.get(last.title, ({}, {}, []))
         _add_directory_item(handle, display_label, "search", {"query": last.title}, is_folder=True, info_labels=info_labels, art=art)
 
-    xbmcplugin.endOfDirectory(handle)
+    xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
 
 
 # ---------------------------------------------------------------------------
@@ -5497,6 +5565,7 @@ def run() -> None:
     _log(f"Action: {action}", xbmc.LOGDEBUG)
     _maybe_run_auto_update_check(action)
     _maybe_auto_install_resolveurl(action)
+    _sync_trakt_status_setting()
     _router.dispatch(action=action, params=params)
 
 

addon/plugins/serienstream_plugin.py

@@ -505,6 +505,14 @@ def _strip_tags(value: str) -> str:
     return re.sub(r"<[^>]+>", " ", value or "")
 
 
+def _clean_collection_title(title: str) -> str:
+    cleaned = "".join(
+        ch for ch in title
+        if unicodedata.category(ch) not in ("So", "Sm", "Sk", "Sc", "Cs", "Co", "Cn")
+    )
+    return re.sub(r"\s+", " ", cleaned).strip()
+
+
 def _search_series_api(query: str) -> list[SeriesResult]:
     query = (query or "").strip()
     if not query:
@@ -1027,6 +1035,8 @@ class SerienstreamPlugin(BasisPlugin):
         self._latest_hoster_cache: dict[str, list[str]] = {}
         self._series_metadata_cache: dict[str, tuple[dict[str, str], dict[str, str]]] = {}
         self._series_metadata_full: set[str] = set()
+        self._collection_url_cache: dict[str, str] = {}
+        self._collection_has_more: bool = False
         self.is_available = True
         self.unavailable_reason: str | None = None
         if not self._requests_available:  # pragma: no cover - optional dependency
@@ -1251,7 +1261,63 @@ class SerienstreamPlugin(BasisPlugin):
 
     def capabilities(self) -> set[str]:
         """Meldet unterstützte Features für Router-Menüs."""
-        return {"popular_series", "genres", "latest_episodes", "alpha"}
+        return {"popular_series", "genres", "latest_episodes", "alpha", "collections"}
+
+    def collections(self) -> list[str]:
+        """Liefert Sammlungs-Namen von /sammlungen (Seite 1, für Paginierung)."""
+        return self._collections_page(1)
+
+    def _collections_page(self, page: int = 1) -> list[str]:
+        """Liefert eine Seite mit Sammlungs-Namen von /sammlungen (paginiert)."""
+        if not self._requests_available:
+            return []
+        base = _get_base_url()
+        names: list[str] = []
+        url_map: dict[str, str] = {}
+        url = f"{base}/sammlungen" if page == 1 else f"{base}/sammlungen?page={page}"
+        soup = _get_soup_simple(url)
+        for a in soup.select('a[href*="/sammlung/"]'):
+            h2 = a.find("h2")
+            if not h2:
+                continue
+            title = _clean_collection_title(h2.get_text(strip=True))
+            href = (a.get("href") or "").strip()
+            if title and href:
+                url_map[title] = _absolute_url(href)
+                names.append(title)
+        if url_map:
+            existing = _session_cache_get("collection_urls")
+            if isinstance(existing, dict):
+                existing.update(url_map)
+                _session_cache_set("collection_urls", existing)
+            else:
+                _session_cache_set("collection_urls", url_map)
+        names.sort(key=lambda t: t.casefold())
+        return names
+
+    def titles_for_collection(self, collection: str, page: int = 1) -> list[str]:
+        """Liefert Serien-Titel einer Sammlung (paginiert)."""
+        if not self._requests_available:
+            return []
+        url_map = _session_cache_get("collection_urls")
+        if isinstance(url_map, dict):
+            self._collection_url_cache.update(url_map)
+        url = self._collection_url_cache.get(collection)
+        if not url:
+            return []
+        if page > 1:
+            url = f"{url}?page={page}"
+        base_url = self._collection_url_cache[collection]
+        soup = _get_soup_simple(url)
+        titles: list[str] = []
+        for a in soup.select('h6 a[href*="/serie/"]'):
+            title = a.get_text(strip=True)
+            href = (a.get("href") or "").strip()
+            if title and href:
+                self._remember_series_result(title, _absolute_url(href), "")
+                titles.append(title)
+        self._collection_has_more = bool(soup.select(f'a[href*="?page={page + 1}"]'))
+        return titles
 
     def popular_series(self) -> list[str]:
         """Liefert die Titel der beliebten Serien (Quelle: `/beliebte-serien`)."""

addon/resources/settings.xml

@@ -1,41 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <settings>
-  <category label="Quellen">
-    <setting id="serienstream_base_url" type="text" label="SerienStream Basis-URL" default="https://s.to" />
-<setting id="aniworld_base_url" type="text" label="AniWorld Basis-URL" default="https://aniworld.to" />
-    <setting id="topstream_base_url" type="text" label="TopStream Basis-URL" default="https://topstreamfilm.live" />
-    <setting id="einschalten_base_url" type="text" label="Einschalten Basis-URL" default="https://einschalten.in" />
-    <setting id="filmpalast_base_url" type="text" label="Filmpalast Basis-URL" default="https://filmpalast.to" />
-    <setting id="doku_streams_base_url" type="text" label="Doku-Streams Basis-URL" default="https://doku-streams.com" />
+
+  <category label="Wiedergabe">
+    <setting id="autoplay_enabled" type="bool" label="Autoplay (bevorzugten Hoster automatisch waehlen)" default="false" />
+    <setting id="preferred_hoster" type="enum" label="Bevorzugter Hoster" default="0" values="voe|streamtape|doodstream|vidoza|mixdrop|supervideo|dropload" enable="eq(-1,true)" />
+  </category>
+
+  <category label="Trakt">
+    <setting id="trakt_enabled" type="bool" label="Trakt aktivieren" default="false" />
+    <setting id="trakt_status" type="text" label="Status" default="Nicht verbunden" enable="false" />
+    <setting id="trakt_auth" type="action" label="Trakt autorisieren" action="RunPlugin(plugin://plugin.video.viewit/?action=trakt_auth)" option="close" />
+    <setting id="trakt_scrobble" type="bool" label="Scrobbling aktivieren" default="true" enable="eq(-3,true)" />
+    <setting id="trakt_auto_watchlist" type="bool" label="Geschaute Serien automatisch zur Watchlist hinzufuegen" default="false" enable="eq(-4,true)" />
+    <setting id="trakt_access_token" type="text" label="" default="" visible="false" />
+    <setting id="trakt_refresh_token" type="text" label="" default="" visible="false" />
+    <setting id="trakt_token_expires" type="text" label="" default="0" visible="false" />
   </category>
 
   <category label="Metadaten">
-    <setting id="serienstream_metadata_source" type="enum" label="SerienStream Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
-    <setting id="aniworld_metadata_source" type="enum" label="AniWorld Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
-    <setting id="topstreamfilm_metadata_source" type="enum" label="TopStream Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
-    <setting id="einschalten_metadata_source" type="enum" label="Einschalten Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
-    <setting id="filmpalast_metadata_source" type="enum" label="Filmpalast Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
-    <setting id="doku_streams_metadata_source" type="enum" label="Doku-Streams Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
-    <setting id="kkiste_metadata_source" type="enum" label="KKiste Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
-    <setting id="moflix_metadata_source" type="enum" label="Moflix Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
     <setting id="tmdb_enabled" type="bool" label="TMDB aktivieren" default="true" />
-    <setting id="tmdb_language" type="text" label="TMDB Sprache (z. B. de-DE)" default="de-DE" />
-    <setting id="tmdb_show_plot" type="bool" label="TMDB Beschreibung anzeigen" default="true" />
-    <setting id="tmdb_show_art" type="bool" label="TMDB Poster und Vorschaubild anzeigen" default="true" />
-    <setting id="tmdb_show_fanart" type="bool" label="TMDB Fanart/Backdrop anzeigen" default="true" />
-    <setting id="tmdb_show_rating" type="bool" label="TMDB Bewertung anzeigen" default="true" />
-    <setting id="tmdb_show_votes" type="bool" label="TMDB Stimmen anzeigen" default="false" />
+    <setting id="tmdb_language" type="text" label="TMDB Sprache (z. B. de-DE)" default="de-DE" enable="eq(-1,true)" />
+    <setting id="tmdb_show_plot" type="bool" label="Beschreibung anzeigen" default="true" enable="eq(-2,true)" />
+    <setting id="tmdb_show_art" type="bool" label="Poster und Vorschaubild anzeigen" default="true" enable="eq(-3,true)" />
+    <setting id="tmdb_show_fanart" type="bool" label="Fanart/Backdrop anzeigen" default="true" enable="eq(-4,true)" />
+    <setting id="tmdb_show_rating" type="bool" label="Bewertung anzeigen" default="true" enable="eq(-5,true)" />
+    <setting id="tmdb_show_votes" type="bool" label="Stimmen anzeigen" default="false" enable="eq(-6,true)" />
+    <setting type="lsep" label="Metadatenquellen" />
+    <setting id="serienstream_metadata_source" type="enum" label="SerienStream" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
+    <setting id="aniworld_metadata_source" type="enum" label="AniWorld" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
+    <setting id="topstreamfilm_metadata_source" type="enum" label="TopStream" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
+    <setting id="einschalten_metadata_source" type="enum" label="Einschalten" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
+    <setting id="filmpalast_metadata_source" type="enum" label="Filmpalast" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
+    <setting id="doku_streams_metadata_source" type="enum" label="Doku-Streams" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
+    <setting id="kkiste_metadata_source" type="enum" label="KKiste" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
+    <setting id="moflix_metadata_source" type="enum" label="Moflix" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
   </category>
 
-  <category label="TMDB Erweitert">
-    <setting id="tmdb_api_key" type="text" label="TMDB API Key (optional)" default="" />
-    <setting id="tmdb_api_key_active" type="text" label="Aktiver TMDB API Key" default="" />
-    <setting id="tmdb_prefetch_concurrency" type="number" label="TMDB: gleichzeitige Anfragen (1-20)" default="6" />
-    <setting id="tmdb_show_cast" type="bool" label="TMDB Besetzung anzeigen" default="false" />
-    <setting id="tmdb_show_episode_cast" type="bool" label="TMDB Besetzung pro Episode anzeigen" default="false" />
-    <setting id="tmdb_genre_metadata" type="bool" label="TMDB Daten in Genre-Listen anzeigen" default="false" />
-    <setting id="tmdb_log_requests" type="bool" label="TMDB API-Anfragen loggen" default="false" />
-    <setting id="tmdb_log_responses" type="bool" label="TMDB API-Antworten loggen" default="false" />
+  <category label="Updates">
+    <setting id="update_installed_version" type="text" label="Installierte Version" default="-" enable="false" />
+    <setting id="update_available_selected" type="text" label="Verfuegbar (gewaehlter Kanal)" default="-" enable="false" />
+    <setting id="update_channel" type="enum" label="Update-Kanal" default="1" values="Main|Nightly|Custom|Dev" />
+    <setting id="apply_update_channel" type="action" label="Update-Kanal jetzt anwenden" action="RunPlugin(plugin://plugin.video.viewit/?action=apply_update_channel)" option="close" />
+    <setting id="auto_update_enabled" type="bool" label="Automatische Updates (beim Start pruefen)" default="false" />
+    <setting id="auto_update_interval" type="enum" label="Update-Pruefintervall" default="1" values="1 Stunde|6 Stunden|24 Stunden" enable="eq(-1,true)" />
+    <setting id="select_update_version" type="action" label="Version waehlen und installieren" action="RunPlugin(plugin://plugin.video.viewit/?action=select_update_version)" option="close" />
+    <setting type="lsep" label="ResolveURL" />
+    <setting id="install_resolveurl" type="action" label="ResolveURL installieren/reparieren" action="RunPlugin(plugin://plugin.video.viewit/?action=install_resolveurl)" option="close" />
+    <setting id="resolveurl_auto_install" type="bool" label="ResolveURL automatisch installieren (beim Start pruefen)" default="true" />
+    <setting id="resolveurl_status" type="text" label="ResolveURL Status" default="-" enable="false" />
+    <setting type="lsep" label="Kanaldetails" />
+    <setting id="update_active_channel" type="text" label="Aktiver Kanal" default="-" enable="false" />
+    <setting id="update_active_repo_url" type="text" label="Aktive Repo URL" default="-" enable="false" />
+    <setting id="update_repo_url_main" type="text" label="Main URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/main/addons.xml" />
+    <setting id="update_repo_url_nightly" type="text" label="Nightly URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/nightly/addons.xml" />
+    <setting id="update_repo_url_dev" type="text" label="Dev URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/dev/addons.xml" />
+    <setting id="update_repo_url" type="text" label="Custom URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/nightly/addons.xml" />
+    <setting id="auto_update_last_ts" type="text" label="" default="0" visible="false" />
+    <setting id="resolveurl_last_ts" type="text" label="" default="0" visible="false" />
+  </category>
+
+  <category label="YouTube">
+    <setting id="youtube_quality" type="enum" label="YouTube Videoqualitaet" default="0" values="Beste|1080p|720p|480p|360p" />
+    <setting id="install_ytdlp" type="action" label="yt-dlp installieren/reparieren" action="RunPlugin(plugin://plugin.video.viewit/?action=install_ytdlp)" option="close" />
+    <setting id="ytdlp_status" type="text" label="yt-dlp Status" default="-" enable="false" />
   </category>
 
   <category label="Anzeige">
@@ -49,82 +76,55 @@
     <setting id="einschalten_max_page_items" type="number" label="Einschalten: Max. Eintraege pro Seite" default="15" />
   </category>
 
-  <category label="Wiedergabe">
-    <setting id="autoplay_enabled" type="bool" label="Autoplay (bevorzugten Hoster automatisch waehlen)" default="false" />
-    <setting id="preferred_hoster" type="text" label="Bevorzugter Hoster" default="voe" />
+  <category label="TMDB Erweitert">
+    <setting id="tmdb_api_key" type="text" label="TMDB API Key (optional)" default="" />
+    <setting id="tmdb_api_key_active" type="text" label="Aktiver TMDB API Key" default="" enable="false" />
+    <setting id="tmdb_prefetch_concurrency" type="number" label="TMDB: gleichzeitige Anfragen (1-20)" default="6" />
+    <setting id="tmdb_show_cast" type="bool" label="TMDB Besetzung anzeigen" default="false" />
+    <setting id="tmdb_show_episode_cast" type="bool" label="TMDB Besetzung pro Episode anzeigen" default="false" />
+    <setting id="tmdb_genre_metadata" type="bool" label="TMDB Daten in Genre-Listen anzeigen" default="false" />
+    <setting id="tmdb_log_requests" type="bool" label="TMDB API-Anfragen loggen" default="false" />
+    <setting id="tmdb_log_responses" type="bool" label="TMDB API-Antworten loggen" default="false" />
   </category>
 
-  <category label="Updates">
-    <setting id="update_channel" type="enum" label="Update-Kanal" default="1" values="Main|Nightly|Custom|Dev" />
-    <setting id="apply_update_channel" type="action" label="Update-Kanal jetzt anwenden" action="RunPlugin(plugin://plugin.video.viewit/?action=apply_update_channel)" option="close" />
-    <setting id="auto_update_enabled" type="bool" label="Automatische Updates (beim Start pruefen)" default="false" />
-    <setting id="auto_update_interval" type="enum" label="Update-Pruefintervall" default="1" values="1 Stunde|6 Stunden|24 Stunden" />
-    <setting id="select_update_version" type="action" label="Version waehlen und installieren" action="RunPlugin(plugin://plugin.video.viewit/?action=select_update_version)" option="close" />
-    <setting id="install_resolveurl" type="action" label="ResolveURL installieren/reparieren" action="RunPlugin(plugin://plugin.video.viewit/?action=install_resolveurl)" option="close" />
-    <setting id="resolveurl_auto_install" type="bool" label="ResolveURL automatisch installieren (beim Start pruefen)" default="true" />
-    <setting id="update_installed_version" type="text" label="Installierte Version" default="-" enable="false" />
-    <setting id="update_available_selected" type="text" label="Verfuegbar (gewaehlter Kanal)" default="-" enable="false" />
-    <setting id="resolveurl_status" type="text" label="ResolveURL Status" default="-" enable="false" />
-    <setting id="update_active_channel" type="text" label="Aktiver Kanal" default="-" enable="false" />
-    <setting id="update_active_repo_url" type="text" label="Aktive Repo URL" default="-" enable="false" />
-    <setting id="update_repo_url_main" type="text" label="Main URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/main/addons.xml" />
-    <setting id="update_repo_url_nightly" type="text" label="Nightly URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/nightly/addons.xml" />
-    <setting id="update_repo_url_dev" type="text" label="Dev URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/dev/addons.xml" />
-    <setting id="update_repo_url" type="text" label="Custom URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/nightly/addons.xml" />
-    <setting id="auto_update_last_ts" type="text" label="Auto-Update letzte Pruefung (intern)" default="0" visible="false" />
-    <setting id="resolveurl_last_ts" type="text" label="ResolveURL letzte Pruefung (intern)" default="0" visible="false" />
+  <category label="Quellen">
+    <setting id="serienstream_base_url" type="text" label="SerienStream Basis-URL" default="https://s.to" />
+    <setting id="aniworld_base_url" type="text" label="AniWorld Basis-URL" default="https://aniworld.to" />
+    <setting id="topstream_base_url" type="text" label="TopStream Basis-URL" default="https://topstreamfilm.live" />
+    <setting id="einschalten_base_url" type="text" label="Einschalten Basis-URL" default="https://einschalten.in" />
+    <setting id="filmpalast_base_url" type="text" label="Filmpalast Basis-URL" default="https://filmpalast.to" />
+    <setting id="doku_streams_base_url" type="text" label="Doku-Streams Basis-URL" default="https://doku-streams.com" />
   </category>
 
-  <category label="Trakt">
-    <setting id="trakt_enabled" type="bool" label="Trakt aktivieren" default="false" />
-    <setting id="trakt_auth" type="action" label="Trakt autorisieren" action="RunPlugin(plugin://plugin.video.viewit/?action=trakt_auth)" option="close" />
-    <setting id="trakt_scrobble" type="bool" label="Scrobbling aktivieren" default="true" />
-    <setting id="trakt_auto_watchlist" type="bool" label="Geschaute Serien automatisch zur Watchlist hinzufuegen" default="false" />
-    <setting id="trakt_access_token" type="text" label="" default="" visible="false" />
-    <setting id="trakt_refresh_token" type="text" label="" default="" visible="false" />
-    <setting id="trakt_token_expires" type="text" label="" default="0" visible="false" />
-  </category>
-
-  <category label="Debug Global">
-    <setting id="debug_log_urls" type="bool" label="URLs mitschreiben (global)" default="false" level="3" />
-    <setting id="debug_dump_html" type="bool" label="HTML speichern (global)" default="false" level="3" />
-    <setting id="debug_show_url_info" type="bool" label="Aktuelle URL anzeigen (global)" default="false" level="3" />
-    <setting id="debug_log_errors" type="bool" label="Fehler mitschreiben (global)" default="false" level="3" />
-    <setting id="log_max_mb" type="number" label="URL-Log: maximale Dateigroesse (MB)" default="5" level="3" />
-    <setting id="log_max_files" type="number" label="URL-Log: Anzahl alter Dateien" default="3" level="3" />
-    <setting id="dump_max_files" type="number" label="HTML: maximale Dateien pro Plugin" default="200" level="3" />
-  </category>
-
-  <category label="Debug Quellen">
-    <setting id="log_urls_serienstream" type="bool" label="SerienStream: URLs mitschreiben" default="false" level="3" />
-    <setting id="dump_html_serienstream" type="bool" label="SerienStream: HTML speichern" default="false" level="3" />
-    <setting id="show_url_info_serienstream" type="bool" label="SerienStream: Aktuelle URL anzeigen" default="false" level="3" />
-    <setting id="log_errors_serienstream" type="bool" label="SerienStream: Fehler mitschreiben" default="false" level="3" />
-
-    <setting id="log_urls_aniworld" type="bool" label="AniWorld: URLs mitschreiben" default="false" level="3" />
-    <setting id="dump_html_aniworld" type="bool" label="AniWorld: HTML speichern" default="false" level="3" />
-    <setting id="show_url_info_aniworld" type="bool" label="AniWorld: Aktuelle URL anzeigen" default="false" level="3" />
-    <setting id="log_errors_aniworld" type="bool" label="AniWorld: Fehler mitschreiben" default="false" level="3" />
-
-    <setting id="log_urls_topstreamfilm" type="bool" label="TopStream: URLs mitschreiben" default="false" level="3" />
-    <setting id="dump_html_topstreamfilm" type="bool" label="TopStream: HTML speichern" default="false" level="3" />
-    <setting id="show_url_info_topstreamfilm" type="bool" label="TopStream: Aktuelle URL anzeigen" default="false" level="3" />
-    <setting id="log_errors_topstreamfilm" type="bool" label="TopStream: Fehler mitschreiben" default="false" level="3" />
-
-    <setting id="log_urls_einschalten" type="bool" label="Einschalten: URLs mitschreiben" default="false" level="3" />
-    <setting id="dump_html_einschalten" type="bool" label="Einschalten: HTML speichern" default="false" level="3" />
-    <setting id="show_url_info_einschalten" type="bool" label="Einschalten: Aktuelle URL anzeigen" default="false" level="3" />
-    <setting id="log_errors_einschalten" type="bool" label="Einschalten: Fehler mitschreiben" default="false" level="3" />
-
-    <setting id="log_urls_filmpalast" type="bool" label="Filmpalast: URLs mitschreiben" default="false" level="3" />
-    <setting id="dump_html_filmpalast" type="bool" label="Filmpalast: HTML speichern" default="false" level="3" />
-    <setting id="show_url_info_filmpalast" type="bool" label="Filmpalast: Aktuelle URL anzeigen" default="false" level="3" />
-    <setting id="log_errors_filmpalast" type="bool" label="Filmpalast: Fehler mitschreiben" default="false" level="3" />
-  </category>
-  <category label="YouTube">
-    <setting id="youtube_quality" type="enum" label="YouTube Videoqualitaet" default="0" values="Beste|1080p|720p|480p|360p" />
-    <setting id="install_ytdlp" type="action" label="yt-dlp installieren/reparieren" action="RunPlugin(plugin://plugin.video.viewit/?action=install_ytdlp)" option="close" />
-    <setting id="ytdlp_status" type="text" label="yt-dlp Status" default="-" enable="false" />
+  <category label="Debug">
+    <setting id="debug_log_urls" type="bool" label="URLs mitschreiben (global)" default="false" />
+    <setting id="debug_dump_html" type="bool" label="HTML speichern (global)" default="false" />
+    <setting id="debug_show_url_info" type="bool" label="Aktuelle URL anzeigen (global)" default="false" />
+    <setting id="debug_log_errors" type="bool" label="Fehler mitschreiben (global)" default="false" />
+    <setting id="log_max_mb" type="number" label="URL-Log: maximale Dateigroesse (MB)" default="5" />
+    <setting id="log_max_files" type="number" label="URL-Log: Anzahl alter Dateien" default="3" />
+    <setting id="dump_max_files" type="number" label="HTML: maximale Dateien pro Plugin" default="200" />
+    <setting type="lsep" label="Pro Quelle" />
+    <setting id="log_urls_serienstream" type="bool" label="SerienStream: URLs mitschreiben" default="false" />
+    <setting id="dump_html_serienstream" type="bool" label="SerienStream: HTML speichern" default="false" />
+    <setting id="show_url_info_serienstream" type="bool" label="SerienStream: Aktuelle URL anzeigen" default="false" />
+    <setting id="log_errors_serienstream" type="bool" label="SerienStream: Fehler mitschreiben" default="false" />
+    <setting id="log_urls_aniworld" type="bool" label="AniWorld: URLs mitschreiben" default="false" />
+    <setting id="dump_html_aniworld" type="bool" label="AniWorld: HTML speichern" default="false" />
+    <setting id="show_url_info_aniworld" type="bool" label="AniWorld: Aktuelle URL anzeigen" default="false" />
+    <setting id="log_errors_aniworld" type="bool" label="AniWorld: Fehler mitschreiben" default="false" />
+    <setting id="log_urls_topstreamfilm" type="bool" label="TopStream: URLs mitschreiben" default="false" />
+    <setting id="dump_html_topstreamfilm" type="bool" label="TopStream: HTML speichern" default="false" />
+    <setting id="show_url_info_topstreamfilm" type="bool" label="TopStream: Aktuelle URL anzeigen" default="false" />
+    <setting id="log_errors_topstreamfilm" type="bool" label="TopStream: Fehler mitschreiben" default="false" />
+    <setting id="log_urls_einschalten" type="bool" label="Einschalten: URLs mitschreiben" default="false" />
+    <setting id="dump_html_einschalten" type="bool" label="Einschalten: HTML speichern" default="false" />
+    <setting id="show_url_info_einschalten" type="bool" label="Einschalten: Aktuelle URL anzeigen" default="false" />
+    <setting id="log_errors_einschalten" type="bool" label="Einschalten: Fehler mitschreiben" default="false" />
+    <setting id="log_urls_filmpalast" type="bool" label="Filmpalast: URLs mitschreiben" default="false" />
+    <setting id="dump_html_filmpalast" type="bool" label="Filmpalast: HTML speichern" default="false" />
+    <setting id="show_url_info_filmpalast" type="bool" label="Filmpalast: Aktuelle URL anzeigen" default="false" />
+    <setting id="log_errors_filmpalast" type="bool" label="Filmpalast: Fehler mitschreiben" default="false" />
   </category>
 
 </settings>