dev: bump to 0.1.86.5-dev Globale Suche konfigurierbar, Changelog-Dialog beim ersten Start

CHANGELOG-DEV.md

@@ -1,3 +1,19 @@
+## 0.1.86.0-dev - 2026-04-02
+
+- dev: bump to 0.1.85.5-dev Settings-Menü benutzerfreundlicher gestaltet
+
+## 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

addon/CHANGELOG-USER.md

@@ -0,0 +1,23 @@
+## 0.1.86.0
+
+**Globale Suche verbessert**
+- Jedes Such-Plugin kann in den Einstellungen unter „Globale Suche" einzeln aktiviert oder deaktiviert werden
+- YouTube ist nun ebenfalls als optionale Suchquelle wählbar
+- Suchergebnisse zeigen jetzt den Anbieter in eckigen Klammern an, z.B. „Breaking Bad [Serienstream]"
+
+**Einstellungsmenü übersichtlicher**
+- Neue Kategorie „Globale Suche" mit Checkboxen für alle Anbieter
+- Trakt-Verbindungsstatus direkt in den Einstellungen sichtbar
+- Bevorzugter Hoster als Auswahlliste, nur aktiv wenn Autoplay eingeschaltet ist
+
+## 0.1.84.0
+
+**Trakt Weiterschauen**
+- Serien, die du bereits angeschaut hast, werden über Trakt als „Weiterschauen"-Liste angezeigt
+- Specials (Staffel 0) werden dabei automatisch übersprungen
+
+## 0.1.82.0
+
+**SerienStream Sammlungen**
+- Sammlungen auf SerienStream sind jetzt durchsuchbar
+- Die Liste wird alphabetisch sortiert und Sonderzeichen in Titeln werden bereinigt

addon/addon.xml

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

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()
@@ -2170,6 +2189,29 @@ def _clean_search_titles(values: list[str]) -> list[str]:
     return cleaned
 
 
+_SEARCH_PLUGIN_SETTING_IDS: dict[str, str] = {
+    "Serienstream":  "search_plugin_serienstream",
+    "Aniworld":      "search_plugin_aniworld",
+    "Topstreamfilm": "search_plugin_topstreamfilm",
+    "Filmpalast":    "search_plugin_filmpalast",
+    "Moflix":        "search_plugin_moflix",
+    "KKiste":        "search_plugin_kkiste",
+    "HDFilme":       "search_plugin_hdfilme",
+    "Einschalten":   "search_plugin_einschalten",
+    "Doku-Streams":  "search_plugin_doku_streams",
+    "NetzkKino":     "search_plugin_netzkino",
+    "YouTube":       "search_plugin_youtube",
+}
+
+
+def _plugin_search_enabled(plugin_name: str) -> bool:
+    """Gibt True zurück wenn das Plugin in der globalen Suche aktiv ist."""
+    setting_id = _SEARCH_PLUGIN_SETTING_IDS.get(plugin_name)
+    if setting_id is None:
+        return True  # unbekannte Plugins standardmäßig einschließen
+    return _get_setting_bool(setting_id, default=True)
+
+
 def _show_search() -> None:
     _log("Suche gestartet.")
     dialog = xbmcgui.Dialog()
@@ -2194,7 +2236,7 @@ def _show_search_results(query: str) -> None:
     # grouped: casefold-key → Liste der Plugin-Einträge für diesen Titel
     grouped: dict[str, list[dict[str, object]]] = {}
     canceled = False
-    plugin_entries = list(plugins.items())
+    plugin_entries = [(n, p) for n, p in plugins.items() if _plugin_search_enabled(n)]
     total_plugins = max(1, len(plugin_entries))
     with _progress_dialog("Suche laeuft", "Suche startet...") as progress:
         for plugin_index, (plugin_name, plugin) in enumerate(plugin_entries, start=1):
@@ -2299,7 +2341,7 @@ def _show_search_results(query: str) -> None:
             # Nur ein Plugin → direkt zur Staffel-Ansicht
             direct_play = bool(first["direct_play"])
             list_items.append({
-                "label": first["label_base"],
+                "label": f"{first['label_base']} [{first['plugin_name']}]",
                 "action": "play_movie" if direct_play else "seasons",
                 "params": {"plugin": first["plugin_name"], "title": canonical_title, **dict(first["extra_params"])},
                 "is_folder": not direct_play,
@@ -2310,8 +2352,9 @@ def _show_search_results(query: str) -> None:
         else:
             # Mehrere Plugins → Zwischenstufe "Quelle wählen"
             plugin_list = ",".join(str(e["plugin_name"]) for e in entries)
+            provider_label = ", ".join(str(e["plugin_name"]) for e in entries)
             list_items.append({
-                "label": first["label_base"],
+                "label": f"{first['label_base']} [{provider_label}]",
                 "action": "choose_source",
                 "params": {"title": canonical_title, "plugins": plugin_list},
                 "is_folder": True,
@@ -4388,7 +4431,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:
@@ -4507,7 +4550,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()
@@ -5540,12 +5583,47 @@ def _route_fallback(params: dict[str, str]) -> None:
     _show_root_menu()
 
 
+def _maybe_show_changelog() -> None:
+    """Zeigt beim ersten Start nach einem Update das Benutzer-Changelog an."""
+    try:
+        current_version = str(_get_addon().getAddonInfo("version") or "").strip()
+        last_shown = _get_setting_string("changelog_last_shown_version").strip()
+        if not current_version or current_version == last_shown:
+            return
+        changelog_path = Path(__file__).parent / "CHANGELOG-USER.md"
+        if not changelog_path.exists():
+            return
+        text = changelog_path.read_text(encoding="utf-8")
+        # Ersten Abschnitt (neueste Version) extrahieren
+        lines = text.splitlines()
+        section: list[str] = []
+        for line in lines:
+            if line.startswith("## ") and section:
+                break
+            section.append(line)
+        content = "\n".join(section).strip()
+        if not content:
+            return
+        viewer = getattr(xbmcgui.Dialog(), "textviewer", None)
+        if callable(viewer):
+            try:
+                viewer("Was ist neu?", content)
+            except Exception:
+                pass
+        _get_addon().setSetting("changelog_last_shown_version", current_version)
+    except Exception as exc:
+        _log(f"Changelog-Anzeige fehlgeschlagen: {exc}", xbmc.LOGWARNING)
+
+
 def run() -> None:
     params = _parse_params()
     action = params.get("action")
     _log(f"Action: {action}", xbmc.LOGDEBUG)
     _maybe_run_auto_update_check(action)
     _maybe_auto_install_resolveurl(action)
+    _sync_trakt_status_setting()
+    if not action:
+        _maybe_show_changelog()
     _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:
@@ -1028,6 +1036,7 @@ class SerienstreamPlugin(BasisPlugin):
         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
@@ -1255,34 +1264,35 @@ class SerienstreamPlugin(BasisPlugin):
         return {"popular_series", "genres", "latest_episodes", "alpha", "collections"}
 
     def collections(self) -> list[str]:
-        """Liefert alle Sammlungs-Namen von /sammlungen (alle Seiten)."""
+        """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] = {}
-        page = 1
+        url = f"{base}/sammlungen" if page == 1 else f"{base}/sammlungen?page={page}"
-        while True:
+        soup = _get_soup_simple(url)
-            url = f"{base}/sammlungen" if page == 1 else f"{base}/sammlungen?page={page}"
+        for a in soup.select('a[href*="/sammlung/"]'):
-            soup = _get_soup_simple(url)
+            h2 = a.find("h2")
-            found = False
+            if not h2:
-            for a in soup.select('a[href*="/sammlung/"]'):
+                continue
-                h2 = a.find("h2")
+            title = _clean_collection_title(h2.get_text(strip=True))
-                if not h2:
+            href = (a.get("href") or "").strip()
-                    continue
+            if title and href:
-                title = h2.get_text(strip=True)
+                url_map[title] = _absolute_url(href)
-                href = (a.get("href") or "").strip()
+                names.append(title)
-                if title and href:
-                    url_map[title] = _absolute_url(href)
-                    names.append(title)
-                    found = True
-            if not found:
-                break
-            if not soup.select(f'a[href*="/sammlungen?page={page + 1}"]'):
-                break
-            page += 1
         if url_map:
-            _session_cache_set("collection_urls", 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]:
@@ -1297,6 +1307,7 @@ class SerienstreamPlugin(BasisPlugin):
             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/"]'):
@@ -1305,6 +1316,7 @@ class SerienstreamPlugin(BasisPlugin):
             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]:

addon/resources/settings.xml

@@ -1,41 +1,82 @@
 <?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" />
+  <category label="Wiedergabe">
-<setting id="aniworld_base_url" type="text" label="AniWorld Basis-URL" default="https://aniworld.to" />
+    <setting id="autoplay_enabled" type="bool" label="Autoplay (bevorzugten Hoster automatisch waehlen)" default="false" />
-    <setting id="topstream_base_url" type="text" label="TopStream Basis-URL" default="https://topstreamfilm.live" />
+    <setting id="preferred_hoster" type="enum" label="Bevorzugter Hoster" default="0" values="voe|streamtape|doodstream|vidoza|mixdrop|supervideo|dropload" enable="eq(-1,true)" />
-    <setting id="einschalten_base_url" type="text" label="Einschalten Basis-URL" default="https://einschalten.in" />
+  </category>
-    <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="Globale Suche">
+    <setting id="search_plugin_serienstream" type="bool" label="Serienstream durchsuchen" default="true" />
+    <setting id="search_plugin_aniworld" type="bool" label="Aniworld durchsuchen" default="true" />
+    <setting id="search_plugin_topstreamfilm" type="bool" label="Topstreamfilm durchsuchen" default="true" />
+    <setting id="search_plugin_filmpalast" type="bool" label="Filmpalast durchsuchen" default="true" />
+    <setting id="search_plugin_moflix" type="bool" label="Moflix durchsuchen" default="true" />
+    <setting id="search_plugin_kkiste" type="bool" label="KKiste durchsuchen" default="true" />
+    <setting id="search_plugin_hdfilme" type="bool" label="HDFilme durchsuchen" default="true" />
+    <setting id="search_plugin_einschalten" type="bool" label="Einschalten durchsuchen" default="true" />
+    <setting id="search_plugin_doku_streams" type="bool" label="Doku-Streams durchsuchen" default="true" />
+    <setting id="search_plugin_netzkino" type="bool" label="NetzkKino durchsuchen" default="true" />
+    <setting id="search_plugin_youtube" type="bool" label="YouTube durchsuchen" default="false" />
+  </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_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="TMDB Beschreibung anzeigen" default="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="TMDB Poster und Vorschaubild anzeigen" default="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="TMDB Fanart/Backdrop anzeigen" default="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="TMDB Bewertung anzeigen" default="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="TMDB Stimmen anzeigen" default="false" />
+    <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">
+  <category label="Updates">
-    <setting id="tmdb_api_key" type="text" label="TMDB API Key (optional)" default="" />
+    <setting id="update_installed_version" type="text" label="Installierte Version" default="-" enable="false" />
-    <setting id="tmdb_api_key_active" type="text" label="Aktiver TMDB API Key" default="" />
+    <setting id="update_available_selected" type="text" label="Verfuegbar (gewaehlter Kanal)" default="-" enable="false" />
-    <setting id="tmdb_prefetch_concurrency" type="number" label="TMDB: gleichzeitige Anfragen (1-20)" default="6" />
+    <setting id="update_channel" type="enum" label="Update-Kanal" default="1" values="Main|Nightly|Custom|Dev" />
-    <setting id="tmdb_show_cast" type="bool" label="TMDB Besetzung anzeigen" default="false" />
+    <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="tmdb_show_episode_cast" type="bool" label="TMDB Besetzung pro Episode anzeigen" default="false" />
+    <setting id="auto_update_enabled" type="bool" label="Automatische Updates (beim Start pruefen)" default="false" />
-    <setting id="tmdb_genre_metadata" type="bool" label="TMDB Daten in Genre-Listen anzeigen" 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="tmdb_log_requests" type="bool" label="TMDB API-Anfragen loggen" default="false" />
+    <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="tmdb_log_responses" type="bool" label="TMDB API-Antworten loggen" default="false" />
+    <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 +90,59 @@
     <setting id="einschalten_max_page_items" type="number" label="Einschalten: Max. Eintraege pro Seite" default="15" />
   </category>
 
-  <category label="Wiedergabe">
+  <category label="TMDB Erweitert">
-    <setting id="autoplay_enabled" type="bool" label="Autoplay (bevorzugten Hoster automatisch waehlen)" default="false" />
+    <setting id="tmdb_api_key" type="text" label="TMDB API Key (optional)" default="" />
-    <setting id="preferred_hoster" type="text" label="Bevorzugter Hoster" default="voe" />
+    <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">
+  <category label="Quellen">
-    <setting id="update_channel" type="enum" label="Update-Kanal" default="1" values="Main|Nightly|Custom|Dev" />
+    <setting id="serienstream_base_url" type="text" label="SerienStream Basis-URL" default="https://s.to" />
-    <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="aniworld_base_url" type="text" label="AniWorld Basis-URL" default="https://aniworld.to" />
-    <setting id="auto_update_enabled" type="bool" label="Automatische Updates (beim Start pruefen)" default="false" />
+    <setting id="topstream_base_url" type="text" label="TopStream Basis-URL" default="https://topstreamfilm.live" />
-    <setting id="auto_update_interval" type="enum" label="Update-Pruefintervall" default="1" values="1 Stunde|6 Stunden|24 Stunden" />
+    <setting id="einschalten_base_url" type="text" label="Einschalten Basis-URL" default="https://einschalten.in" />
-    <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="filmpalast_base_url" type="text" label="Filmpalast Basis-URL" default="https://filmpalast.to" />
-    <setting id="install_resolveurl" type="action" label="ResolveURL installieren/reparieren" action="RunPlugin(plugin://plugin.video.viewit/?action=install_resolveurl)" option="close" />
+    <setting id="doku_streams_base_url" type="text" label="Doku-Streams Basis-URL" default="https://doku-streams.com" />
-    <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>
 
-  <category label="Trakt">
+  <category label="Debug">
-    <setting id="trakt_enabled" type="bool" label="Trakt aktivieren" default="false" />
+    <setting id="debug_log_urls" type="bool" label="URLs mitschreiben (global)" default="false" />
-    <setting id="trakt_auth" type="action" label="Trakt autorisieren" action="RunPlugin(plugin://plugin.video.viewit/?action=trakt_auth)" option="close" />
+    <setting id="debug_dump_html" type="bool" label="HTML speichern (global)" default="false" />
-    <setting id="trakt_scrobble" type="bool" label="Scrobbling aktivieren" default="true" />
+    <setting id="debug_show_url_info" type="bool" label="Aktuelle URL anzeigen (global)" default="false" />
-    <setting id="trakt_auto_watchlist" type="bool" label="Geschaute Serien automatisch zur Watchlist hinzufuegen" default="false" />
+    <setting id="debug_log_errors" type="bool" label="Fehler mitschreiben (global)" default="false" />
-    <setting id="trakt_access_token" type="text" label="" default="" visible="false" />
+    <setting id="log_max_mb" type="number" label="URL-Log: maximale Dateigroesse (MB)" default="5" />
-    <setting id="trakt_refresh_token" type="text" label="" default="" visible="false" />
+    <setting id="log_max_files" type="number" label="URL-Log: Anzahl alter Dateien" default="3" />
-    <setting id="trakt_token_expires" type="text" label="" default="0" visible="false" />
+    <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>
 
-  <category label="Debug Global">
+  <category label="Intern">
-    <setting id="debug_log_urls" type="bool" label="URLs mitschreiben (global)" default="false" level="3" />
+    <setting id="changelog_last_shown_version" type="text" label="" default="" visible="false" />
-    <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>
 
 </settings>

scripts/build_kodi_zip.sh

@@ -34,6 +34,10 @@ PY
 ZIP_NAME="${ADDON_ID}-${ADDON_VERSION}.zip"
 ZIP_PATH="${INSTALL_DIR}/${ZIP_NAME}"
 
+CHANGELOG_USER="${SRC_ADDON_DIR}/CHANGELOG-USER.md"
+python3 "${ROOT_DIR}/scripts/update_user_changelog.py" --fill  "${ADDON_XML}" "${CHANGELOG_USER}" >&2
+python3 "${ROOT_DIR}/scripts/update_user_changelog.py" --check "${ADDON_XML}" "${CHANGELOG_USER}" >&2 || exit 1
+
 ADDON_DIR="$("${ROOT_DIR}/scripts/build_install_addon.sh" >/dev/null; echo "${INSTALL_DIR}/${ADDON_ID}")"
 
 rm -f "${ZIP_PATH}"

scripts/update_user_changelog.py

@@ -0,0 +1,238 @@
+#!/usr/bin/env python3
+"""
+Pflegt CHANGELOG-USER.md vor dem ZIP-Build.
+
+Modi:
+  --fill    Liest Commits seit letztem Tag, generiert lesbaren Text und ersetzt
+            den Platzhalter im Abschnitt der aktuellen Version.
+            Legt den Abschnitt an falls noch nicht vorhanden.
+  --check   Prüft ob ein gefüllter Abschnitt für VERSION existiert.
+            Exit 0 = OK, Exit 1 = fehlt oder ist Platzhalter.
+
+Aufruf durch build_kodi_zip.sh:
+  python3 scripts/update_user_changelog.py --fill  addon/addon.xml addon/CHANGELOG-USER.md
+  python3 scripts/update_user_changelog.py --check addon/addon.xml addon/CHANGELOG-USER.md
+"""
+
+import re
+import subprocess
+import sys
+import xml.etree.ElementTree as ET
+from pathlib import Path
+
+PLACEHOLDER_LINE = "(Bitte Changelog-Einträge hier einfügen)"
+
+# Schlüsselwörter aus Commit-Messages → lesbarer Kategorie-Text
+# Reihenfolge bestimmt Priorität (erster Treffer gewinnt).
+CATEGORY_RULES: list[tuple[re.Pattern, str]] = [
+    (re.compile(r"trakt", re.I),             "Trakt"),
+    (re.compile(r"serienstream|serien.?stream", re.I), "SerienStream"),
+    (re.compile(r"aniworld", re.I),          "AniWorld"),
+    (re.compile(r"youtube|yt.?dlp", re.I),  "YouTube"),
+    (re.compile(r"tmdb|metadat", re.I),     "Metadaten"),
+    (re.compile(r"suche|search", re.I),     "Suche"),
+    (re.compile(r"setting|einstellung", re.I), "Einstellungen"),
+    (re.compile(r"update|version", re.I),   "Updates"),
+    (re.compile(r"moflix", re.I),           "Moflix"),
+    (re.compile(r"filmpalast", re.I),       "Filmpalast"),
+    (re.compile(r"kkiste", re.I),           "KKiste"),
+    (re.compile(r"doku.?stream", re.I),     "Doku-Streams"),
+    (re.compile(r"topstream", re.I),        "Topstreamfilm"),
+    (re.compile(r"einschalten", re.I),      "Einschalten"),
+    (re.compile(r"hdfilme", re.I),          "HDFilme"),
+    (re.compile(r"netzkino", re.I),         "NetzkKino"),
+]
+
+
+def get_version(addon_xml: Path) -> str:
+    root = ET.parse(addon_xml).getroot()
+    return root.attrib.get("version", "").strip()
+
+
+def strip_suffix(version: str) -> str:
+    return re.sub(r"-(dev|nightly|beta|alpha).*$", "", version)
+
+
+def get_prev_tag(current_tag: str) -> str | None:
+    try:
+        result = subprocess.run(
+            ["git", "tag", "--sort=-version:refname"],
+            capture_output=True, text=True, check=True,
+        )
+        tags = [t.strip() for t in result.stdout.splitlines() if t.strip()]
+        if current_tag in tags:
+            idx = tags.index(current_tag)
+            return tags[idx + 1] if idx + 1 < len(tags) else None
+        return tags[0] if tags else None
+    except Exception:
+        return None
+
+
+def get_commits_since(prev_tag: str | None) -> list[str]:
+    """Gibt Commit-Subjects seit prev_tag zurück (ohne den Tag-Commit selbst)."""
+    try:
+        ref = f"{prev_tag}..HEAD" if prev_tag else "HEAD"
+        result = subprocess.run(
+            ["git", "log", ref, "--pretty=format:%s"],
+            capture_output=True, text=True, check=True,
+        )
+        return [l.strip() for l in result.stdout.splitlines() if l.strip()]
+    except Exception:
+        return []
+
+
+def extract_description(subject: str) -> str:
+    """Extrahiert den lesbaren Teil aus einer Commit-Message."""
+    # "dev: bump to 0.1.86.0-dev Beschreibung hier" → "Beschreibung hier"
+    m = re.match(r"^(?:dev|nightly|main):\s*bump\s+to\s+[\d.]+(?:-\w+)?\s*(.+)$", subject, re.I)
+    if m:
+        return m.group(1).strip()
+    # "dev: Beschreibung" → "Beschreibung"
+    m = re.match(r"^(?:dev|nightly|main):\s*(.+)$", subject, re.I)
+    if m:
+        return m.group(1).strip()
+    return subject
+
+
+def split_description(desc: str) -> list[str]:
+    """Zerlegt kommagetrennte Beschreibungen in Einzelpunkte."""
+    parts = [p.strip() for p in re.split(r",\s*(?=[A-ZÄÖÜ\w])", desc) if p.strip()]
+    return parts if parts else [desc]
+
+
+def categorize(items: list[str]) -> dict[str, list[str]]:
+    """Gruppiert Beschreibungs-Punkte nach Kategorie."""
+    categories: dict[str, list[str]] = {}
+    for item in items:
+        cat = "Allgemein"
+        for pattern, label in CATEGORY_RULES:
+            if pattern.search(item):
+                cat = label
+                break
+        categories.setdefault(cat, []).append(item)
+    return categories
+
+
+def build_changelog_text(commits: list[str]) -> str:
+    """Erzeugt lesbaren Changelog-Text aus Commit-Subjects."""
+    all_items: list[str] = []
+    for subject in commits:
+        desc = extract_description(subject)
+        if desc:
+            all_items.extend(split_description(desc))
+
+    if not all_items:
+        return "- Verschiedene Verbesserungen und Fehlerbehebungen"
+
+    categories = categorize(all_items)
+    lines: list[str] = []
+    for cat, items in categories.items():
+        lines.append(f"**{cat}**")
+        for item in items:
+            # Ersten Buchstaben groß, Punkt am Ende
+            item = item[0].upper() + item[1:] if item else item
+            if not item.endswith((".","!","?")):
+                item += "."
+            lines.append(f"- {item}")
+        lines.append("")
+    return "\n".join(lines).rstrip()
+
+
+def section_exists(lines: list[str], header: str) -> bool:
+    return any(line.strip() == header for line in lines)
+
+
+def section_is_placeholder(lines: list[str], header: str) -> bool:
+    in_section = False
+    content_lines = []
+    for line in lines:
+        if line.strip() == header:
+            in_section = True
+            continue
+        if in_section:
+            if line.startswith("## "):
+                break
+            stripped = line.strip()
+            if stripped:
+                content_lines.append(stripped)
+    return not content_lines or all(l == PLACEHOLDER_LINE for l in content_lines)
+
+
+def replace_section_content(lines: list[str], header: str, new_content: str) -> list[str]:
+    """Ersetzt den Inhalt eines bestehenden Abschnitts."""
+    result: list[str] = []
+    in_section = False
+    content_written = False
+    for line in lines:
+        if line.strip() == header:
+            result.append(line)
+            result.append("")
+            result.extend(new_content.splitlines())
+            result.append("")
+            in_section = True
+            content_written = True
+            continue
+        if in_section:
+            if line.startswith("## "):
+                in_section = False
+                result.append(line)
+            # Alte Zeilen des Abschnitts überspringen
+            continue
+        result.append(line)
+    return result
+
+
+def insert_section(lines: list[str], header: str, content: str) -> list[str]:
+    new_section = [header, "", *content.splitlines(), ""]
+    return new_section + ([""] if lines and lines[0].strip() else []) + lines
+
+
+def main() -> None:
+    if len(sys.argv) < 4 or sys.argv[1] not in ("--fill", "--check"):
+        print(f"Usage: {sys.argv[0]} --fill|--check <addon.xml> <CHANGELOG-USER.md>", file=sys.stderr)
+        sys.exit(2)
+
+    mode = sys.argv[1]
+    addon_xml = Path(sys.argv[2])
+    changelog = Path(sys.argv[3])
+
+    version = get_version(addon_xml)
+    if not version:
+        print("Fehler: Version konnte nicht aus addon.xml gelesen werden.", file=sys.stderr)
+        sys.exit(2)
+
+    clean_version = strip_suffix(version)
+    header = f"## {clean_version}"
+    lines = changelog.read_text(encoding="utf-8").splitlines() if changelog.exists() else []
+
+    if mode == "--check":
+        if not section_exists(lines, header):
+            print(f"FEHLER: Kein Changelog-Abschnitt für {clean_version} in {changelog}", file=sys.stderr)
+            sys.exit(1)
+        if section_is_placeholder(lines, header):
+            print(f"FEHLER: Changelog-Abschnitt für {clean_version} ist noch ein Platzhalter.", file=sys.stderr)
+            sys.exit(1)
+        print(f"OK: Changelog-Abschnitt für {clean_version} vorhanden.")
+        sys.exit(0)
+
+    # --fill
+    current_tag = f"v{version}"
+    prev_tag = get_prev_tag(current_tag)
+    commits = get_commits_since(prev_tag)
+    content = build_changelog_text(commits)
+
+    if section_exists(lines, header):
+        if not section_is_placeholder(lines, header):
+            print(f"Abschnitt {header} bereits gefüllt – keine Änderung.")
+            sys.exit(0)
+        new_lines = replace_section_content(lines, header, content)
+    else:
+        new_lines = insert_section(lines, header, content)
+
+    changelog.write_text("\n".join(new_lines) + "\n", encoding="utf-8")
+    print(f"Changelog für {header} geschrieben.")
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()