diff --git a/CHANGELOG-DEV.md b/CHANGELOG-DEV.md index d5418a4..066e579 100644 --- a/CHANGELOG-DEV.md +++ b/CHANGELOG-DEV.md @@ -1,3 +1,7 @@ +## 0.1.86.5-dev - 2026-04-03 + +- dev: bump to 0.1.86.0-dev Globale Suche konfigurierbar, Changelog-Dialog beim ersten Start + ## 0.1.86.0-dev - 2026-04-02 - dev: bump to 0.1.85.5-dev Settings-Menü benutzerfreundlicher gestaltet diff --git a/addon/CHANGELOG-USER.md b/addon/CHANGELOG-USER.md index 97fe05d..fe71747 100644 --- a/addon/CHANGELOG-USER.md +++ b/addon/CHANGELOG-USER.md @@ -1,3 +1,19 @@ +## 0.1.86.5 + +**Trakt** +- Alle Trakt-Funktionen sind jetzt unter einem eigenen Untermenüpunkt „Trakt" gebündelt +- Weiterschauen erkennt Staffelwechsel korrekt (z.B. S02E12 → S03E01 statt S02E13) +- Scrobbling zuverlässiger: Episoden werden nicht mehr fälschlicherweise als gesehen markiert wenn die Streamlänge unbekannt ist +- Trakt-IDs werden jetzt auch gefunden wenn TMDB die Serie nicht kennt + +**Globale Suche** +- Jedes Such-Plugin in den Einstellungen unter „Globale Suche" einzeln aktivierbar +- YouTube optional als Suchquelle wählbar +- Suchergebnisse zeigen den Anbieter in eckigen Klammern an, z.B. „Breaking Bad [Serienstream]" + +**Neu beim Start** +- Nach einem Update wird automatisch ein Changelog-Dialog mit den Neuigkeiten angezeigt + ## 0.1.86.0 **Globale Suche verbessert** diff --git a/addon/addon.xml b/addon/addon.xml index 7344974..858a753 100644 --- a/addon/addon.xml +++ b/addon/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/addon/core/trakt.py b/addon/core/trakt.py index 0e00ab8..36d9cae 100644 --- a/addon/core/trakt.py +++ b/addon/core/trakt.py @@ -65,6 +65,8 @@ class TraktItem: episode_thumb: str = "" # Screenshot-URL (extended=images) show_poster: str = "" # Serien-Poster-URL (extended=images) show_fanart: str = "" # Serien-Fanart-URL (extended=images) + # Staffel → höchste gesehene Episodennummer (für Staffelwechsel-Erkennung) + seasons_watched: dict = field(default_factory=dict) @dataclass(frozen=True) @@ -387,19 +389,26 @@ class TraktClient: seasons = entry.get("seasons") or [] last_season = 0 last_episode = 0 + seasons_watched: dict[int, int] = {} for s in seasons: snum = int((s.get("number") or 0)) if snum == 0: # Specials überspringen continue + max_ep = 0 for ep in (s.get("episodes") or []): enum = int((ep.get("number") or 0)) + if enum > max_ep: + max_ep = enum if snum > last_season or (snum == last_season and enum > last_episode): last_season = snum last_episode = enum + if max_ep > 0: + seasons_watched[snum] = max_ep if title: result.append(TraktItem( title=title, year=year, media_type="episode", ids=ids, season=last_season, episode=last_episode, + seasons_watched=seasons_watched, )) self._do_log(f"get_watched_shows: {len(result)} Serien") return result @@ -461,6 +470,21 @@ class TraktClient: ids = show.get("ids") or {} return str(ids.get("slug") or ids.get("trakt") or "") + def search_show_ids(self, query: str) -> "tuple[int, str]": + """GET /search/show?query=... – gibt (tmdb_id, imdb_id) des ersten Treffers zurück. + Fallback wenn TMDB keine IDs liefert. + """ + from urllib.parse import urlencode + path = f"/search/show?{urlencode({'query': query, 'limit': 1})}" + status, payload = self._get(path) + if status != 200 or not isinstance(payload, list) or not payload: + return 0, "" + show = (payload[0] or {}).get("show") or {} + ids = show.get("ids") or {} + tmdb_id = int(ids.get("tmdb") or 0) + imdb_id = str(ids.get("imdb") or "") + return tmdb_id, imdb_id + def lookup_tv_season( self, show_id_or_slug: "str | int", diff --git a/addon/default.py b/addon/default.py index b76e76a..4854c8a 100644 --- a/addon/default.py +++ b/addon/default.py @@ -132,6 +132,8 @@ _TMDB_SEASON_CACHE: dict[tuple[int, int, str, str], dict[int, tuple[dict[str, st _TMDB_SEASON_SUMMARY_CACHE: dict[tuple[int, int, str, str], tuple[dict[str, str], dict[str, str]]] = {} _TMDB_EPISODE_CAST_CACHE: dict[tuple[int, int, int, str], list[TmdbCastMember]] = {} _TRAKT_SEASON_META_CACHE: dict = {} +_TRAKT_SEASON_META_CACHE_TS: float = 0.0 +_TRAKT_SEASON_META_CACHE_TTL: int = 1800 # 30 Minuten _TMDB_LOG_PATH: str | None = None _GENRE_TITLES_CACHE: dict[tuple[str, str], list[str]] = {} _ADDON_INSTANCE = None @@ -1064,6 +1066,12 @@ def _trakt_episode_labels_and_art( Lädt Staffel-Episodendaten per Batch (extended=full,images) und optionale deutsche Übersetzung per Episode (Translations-Endpunkt). """ + global _TRAKT_SEASON_META_CACHE_TS + now = time.time() + if now - _TRAKT_SEASON_META_CACHE_TS > _TRAKT_SEASON_META_CACHE_TTL: + _TRAKT_SEASON_META_CACHE.clear() + _TRAKT_SEASON_META_CACHE_TS = now + client = _trakt_get_client() if not client: return {"title": episode_label}, {} @@ -1845,18 +1853,25 @@ def _show_root_menu() -> None: # Trakt-Menue (nur wenn aktiviert) if _get_setting_bool("trakt_enabled", default=False): - if _trakt_load_token(): - _add_directory_item(handle, "Weiterschauen", "trakt_continue", is_folder=True) - _add_directory_item(handle, "Trakt Upcoming", "trakt_upcoming", is_folder=True) - _add_directory_item(handle, "Trakt Watchlist", "trakt_watchlist", is_folder=True) - _add_directory_item(handle, "Trakt History", "trakt_history", {"page": "1"}, is_folder=True) - else: - _add_directory_item(handle, "Trakt autorisieren", "trakt_auth", is_folder=True) + _add_directory_item(handle, "Trakt", "trakt_menu", is_folder=True) _add_directory_item(handle, "Einstellungen", "settings") xbmcplugin.endOfDirectory(handle) +def _show_trakt_menu() -> None: + handle = _get_handle() + xbmcplugin.setPluginCategory(handle, "Trakt") + if _trakt_load_token(): + _add_directory_item(handle, "Weiterschauen", "trakt_continue", is_folder=True) + _add_directory_item(handle, "Trakt Upcoming", "trakt_upcoming", is_folder=True) + _add_directory_item(handle, "Trakt Watchlist", "trakt_watchlist", is_folder=True) + _add_directory_item(handle, "Trakt History", "trakt_history", {"page": "1"}, is_folder=True) + else: + _add_directory_item(handle, "Trakt autorisieren", "trakt_auth", is_folder=True) + xbmcplugin.endOfDirectory(handle) + + def _show_plugin_menu(plugin_name: str) -> None: handle = _get_handle() plugin_name = (plugin_name or "").strip() @@ -4304,8 +4319,10 @@ def _trakt_scrobble_start_async(media: dict[str, object]) -> None: threading.Thread(target=_do, daemon=True).start() -def _trakt_scrobble_stop_async(media: dict[str, object], progress: float = 100.0) -> None: - """Sendet scrobble/stop an die Trakt-API in einem Hintergrund-Thread.""" +def _trakt_scrobble_stop_async(media: dict[str, object], progress: float = 100.0) -> threading.Thread: + """Sendet scrobble/stop an die Trakt-API in einem Hintergrund-Thread. + Gibt den Thread zurück damit der Aufrufer bei Bedarf darauf warten kann. + """ def _do() -> None: try: from core.trakt import TraktClient @@ -4326,7 +4343,9 @@ def _trakt_scrobble_stop_async(media: dict[str, object], progress: float = 100.0 progress=progress, ) _log(f"Trakt scrobble/stop: {media.get('title')} progress={progress:.0f}%", xbmc.LOGDEBUG) - threading.Thread(target=_do, daemon=True).start() + t = threading.Thread(target=_do, daemon=True) + t.start() + return t def _trakt_monitor_playback(media: dict[str, object]) -> None: @@ -4368,9 +4387,18 @@ def _trakt_monitor_playback(media: dict[str, object]) -> None: if monitor.abortRequested(): return - progress = min(100.0, (last_pos / total_time * 100.0)) if total_time > 0 else 100.0 + if total_time > 0: + progress = min(100.0, last_pos / total_time * 100.0) + elif last_pos > 0: + # Keine Gesamtlaufzeit bekannt – kein Scrobble um falsche 100%-Markierung zu vermeiden + _log("Trakt monitor: total_time unbekannt, kein Scrobble.", xbmc.LOGDEBUG) + return + else: + _log("Trakt monitor: keine Positionsdaten, kein Scrobble.", xbmc.LOGDEBUG) + return _log(f"Trakt monitor: Wiedergabe beendet, progress={progress:.0f}%", xbmc.LOGDEBUG) - _trakt_scrobble_stop_async(media, progress=progress) + stop_thread = _trakt_scrobble_stop_async(media, progress=progress) + stop_thread.join(timeout=10) def _track_playback_and_update_state_async(key: str) -> None: @@ -4499,6 +4527,15 @@ def _play_episode( if _tmdb_id: _imdb_id = _fetch_and_cache_imdb_id(title_key, _tmdb_id, _kind) _set_trakt_ids_property(title, _tmdb_id, _imdb_id) + if not _tmdb_id and not _imdb_id and _get_setting_bool("trakt_enabled", default=False): + # Fallback: Trakt-Titelsuche wenn TMDB keine IDs liefert + try: + _trakt_client = _trakt_get_client() + if _trakt_client: + _tmdb_id, _imdb_id = _trakt_client.search_show_ids(title) + _log(f"Trakt ID-Fallback fuer '{title}': tmdb={_tmdb_id} imdb={_imdb_id}", xbmc.LOGDEBUG) + except Exception: + pass trakt_media: dict[str, object] = { "title": title, "tmdb_id": _tmdb_id, "imdb_id": _imdb_id, "kind": _kind, "season": season_number or 0, "episode": episode_number or 0, @@ -5241,8 +5278,17 @@ def _show_trakt_continue_watching() -> None: tmdb_prefetched = _tmdb_labels_and_art_bulk(list(seen.keys())) if _tmdb_enabled() else {} for last in seen.values(): - next_season = last.season - next_ep = last.episode + 1 + # Staffelwechsel erkennen: wenn last.episode die höchste gesehene Episode + # der aktuellen Staffel ist und eine höhere Staffel existiert → S+1 E01 + seasons_watched: dict[int, int] = getattr(last, "seasons_watched", {}) + max_ep_in_season = seasons_watched.get(last.season, 0) + next_seasons = sorted(s for s in seasons_watched if s > last.season) + if max_ep_in_season > 0 and last.episode >= max_ep_in_season and next_seasons: + next_season = next_seasons[0] + next_ep = 1 + else: + next_season = last.season + next_ep = last.episode + 1 label = f"{last.title} \u2013 S{next_season:02d}E{next_ep:02d}" sub = f"(zuletzt: S{last.season:02d}E{last.episode:02d})" @@ -5510,6 +5556,11 @@ def _route_random_title(params: dict[str, str]) -> None: _play_random_title(params.get("plugin", "")) +@_router.route("trakt_menu") +def _route_trakt_menu(params: dict[str, str]) -> None: + _show_trakt_menu() + + @_router.route("trakt_auth") def _route_trakt_auth(params: dict[str, str]) -> None: _trakt_authorize() diff --git a/docs/TRAKT.md b/docs/TRAKT.md index 65556a5..7cafd05 100644 --- a/docs/TRAKT.md +++ b/docs/TRAKT.md @@ -44,7 +44,9 @@ Einstellungen Menues im Hauptmenue -Wenn Trakt aktiviert und autorisiert ist, erscheinen im ViewIT-Hauptmenue folgende Eintraege: +Wenn Trakt aktiviert ist, erscheint im ViewIT-Hauptmenue ein Untermenüpunkt "Trakt" (nach allen Quellen-Plugins). + +Ein Klick darauf oeffnet das Trakt-Untermenue mit folgenden Eintraegen (nur wenn bereits autorisiert): Weiterschauen