viewit/ViewIT
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 37 Wiki Activity

dev: bump to 0.1.87.0-dev Trakt-Untermenue, Weiterschauen-Fixes, Scrobbling zuverlässig

Browse Source
This commit is contained in:
itdrui.de
2026-04-04 22:57:03 +02:00
parent ab05040335
commit e8fa00ff7b
6 changed files with 113 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
addon/default.py
View File

@@ -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()