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

dev: bump to 0.1.88.0-dev TMDb Helper Player, Metadaten-Fix, Menü-Icons, Filmpalast veeve

Browse Source
This commit is contained in:
itdrui.de
2026-04-10 14:07:01 +02:00
parent 29da28ebc3
commit a8a85ef14f
22 changed files with 301 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

195
addon/default.py
View File

@@ -117,11 +117,25 @@ from metadata_utils import (
needs_tmdb as _needs_tmdb,
)
from tmdb import TmdbCastMember, TmdbExternalIds, fetch_external_ids, fetch_tv_episode_credits, lookup_movie, lookup_tv_season, lookup_tv_season_summary, lookup_tv_show
from core.metadata import _resolve_tmdb_api_key
from core.router import Router
_router = Router()
PLUGIN_DIR = Path(__file__).with_name("plugins")
_PICTURES_DIR = Path(__file__).parent / "pictures"
_MENU_ICONS: dict[str, str] = {
"search": str(_PICTURES_DIR / "suche.png"),
"plugin_search": str(_PICTURES_DIR / "suche.png"),
"genres": str(_PICTURES_DIR / "generes.png"),
"alpha_index": str(_PICTURES_DIR / "a_z.png"),
"series_catalog": str(_PICTURES_DIR / "serien.png"),
"settings": str(_PICTURES_DIR / "einstellung.png"),
"trakt_menu": str(_PICTURES_DIR / "seriensammlung.png"),
"trakt_continue": str(_PICTURES_DIR / "hgesehn.png"),
"latest_titles": str(_PICTURES_DIR / "neuste.png"),
}
_PLUGIN_CACHE: dict[str, BasisPlugin] | None = None
_TMDB_CACHE: dict[str, tuple[dict[str, str], dict[str, str]]] = {}
_TMDB_CAST_CACHE: dict[str, list[TmdbCastMember]] = {}
@@ -179,7 +193,7 @@ def _fetch_and_cache_imdb_id(title_key: str, tmdb_id: int, kind: str) -> str:
cached = _tmdb_cache_get(_IMDB_ID_CACHE, title_key)
if cached is not None:
return cached
api_key = _get_setting_string("tmdb_api_key").strip()
api_key = _resolve_tmdb_api_key(_get_setting_string("tmdb_api_key").strip())
if not api_key or api_key == "None" or not tmdb_id:
return ""
ext = fetch_external_ids(kind=kind, tmdb_id=tmdb_id, api_key=api_key)
@@ -870,7 +884,7 @@ def _tmdb_labels_and_art(title: str) -> tuple[dict[str, str], dict[str, str], li
art: dict[str, str] = {}
cast: list[TmdbCastMember] = []
query = (title or "").strip()
api_key = _get_setting_string("tmdb_api_key").strip()
api_key = _resolve_tmdb_api_key(_get_setting_string("tmdb_api_key").strip())
log_requests = _get_setting_bool("tmdb_log_requests", default=False)
log_responses = _get_setting_bool("tmdb_log_responses", default=False)
if api_key and api_key != "None":
@@ -1020,7 +1034,7 @@ def _tmdb_episode_labels_and_art(*, title: str, season_label: str, episode_label
season_key = (tmdb_id, season_number, language, flags)
cached_season = _tmdb_cache_get(_TMDB_SEASON_CACHE, season_key)
if cached_season is None:
api_key = _get_setting_string("tmdb_api_key").strip()
api_key = _resolve_tmdb_api_key(_get_setting_string("tmdb_api_key").strip())
if not api_key or api_key == "None":
return _trakt_episode_labels_and_art(
title=title, season_label=season_label, episode_label=episode_label
@@ -1151,7 +1165,7 @@ def _tmdb_episode_cast(*, title: str, season_label: str, episode_label: str) ->
if cached is not None:
return list(cached)
api_key = _get_setting_string("tmdb_api_key").strip()
api_key = _resolve_tmdb_api_key(_get_setting_string("tmdb_api_key").strip())
if not api_key or api_key == "None":
_tmdb_cache_set(_TMDB_EPISODE_CAST_CACHE, cache_key, [])
return []
@@ -1179,6 +1193,11 @@ def _tmdb_episode_cast(*, title: str, season_label: str, episode_label: str) ->
return list(cast)
def _icon_for(action: str) -> dict[str, str] | None:
path = _MENU_ICONS.get(action)
return {"icon": path, "thumb": path} if path else None
def _add_directory_item(
handle: int,
label: str,
@@ -1238,6 +1257,8 @@ UPDATE_ADDON_ID = "plugin.video.viewit"
RESOLVEURL_ADDON_ID = "script.module.resolveurl"
RESOLVEURL_AUTO_INSTALL_INTERVAL_SEC = 6 * 60 * 60
YTDLP_ADDON_ID = "script.module.yt-dlp"
TMDB_HELPER_ADDON_ID = "plugin.video.themoviedb.helper"
TMDB_HELPER_PLAYERS_DIR = Path.home() / ".kodi" / "addons" / TMDB_HELPER_ADDON_ID / "resources" / "players"
def _selected_update_channel() -> int:
@@ -1716,7 +1737,6 @@ def _maybe_auto_install_resolveurl(action: str | None) -> None:
def _sync_tmdb_active_key_setting() -> None:
from core.metadata import _resolve_tmdb_api_key
raw_key = _get_setting_string("tmdb_api_key").strip()
active_key = _resolve_tmdb_api_key(raw_key)
if active_key:
@@ -1731,6 +1751,34 @@ def _sync_ytdlp_status_setting() -> None:
_set_setting_string("ytdlp_status", status)
def _sync_tmdb_helper_status_setting() -> None:
status = "Installiert" if _is_addon_installed(TMDB_HELPER_ADDON_ID) else "Nicht installiert"
_set_setting_string("tmdb_helper_status", status)
_TMDB_HELPER_PLAYERS_SOURCE = Path(__file__).parent / "resources" / "players"
def _install_tmdb_helper_players() -> None:
if not _is_addon_installed(TMDB_HELPER_ADDON_ID):
xbmcgui.Dialog().notification("TMDb Helper", "TMDb Helper ist nicht installiert.", xbmcgui.NOTIFICATION_WARNING, 4000)
return
try:
source_files = list(_TMDB_HELPER_PLAYERS_SOURCE.glob("*.json"))
if not source_files:
xbmcgui.Dialog().notification("TMDb Helper", "Keine Player-Dateien gefunden.", xbmcgui.NOTIFICATION_WARNING, 4000)
return
TMDB_HELPER_PLAYERS_DIR.mkdir(parents=True, exist_ok=True)
import shutil
for src in source_files:
shutil.copy2(src, TMDB_HELPER_PLAYERS_DIR / src.name)
_log(f"TMDb Helper Player installiert: {[f.name for f in source_files]}")
xbmcgui.Dialog().notification("TMDb Helper", f"{len(source_files)} Player installiert.", xbmcgui.NOTIFICATION_INFO, 3000)
except Exception as exc:
_log(f"TMDb Helper Player Installation fehlgeschlagen: {exc}", xbmc.LOGWARNING)
xbmcgui.Dialog().notification("TMDb Helper", f"Fehler: {exc}", xbmcgui.NOTIFICATION_ERROR, 5000)
def _fetch_ytdlp_zip_url() -> str:
"""Ermittelt die aktuellste ZIP-URL fuer script.module.yt-dlp von GitHub."""
api_url = "https://api.github.com/repos/lekma/script.module.yt-dlp/releases/latest"
@@ -1827,6 +1875,7 @@ def _sync_update_version_settings() -> None:
_set_setting_string("update_installed_version", addon_version)
_sync_resolveurl_status_setting()
_sync_ytdlp_status_setting()
_sync_tmdb_helper_status_setting()
_sync_update_channel_status_settings()
_sync_tmdb_active_key_setting()
@@ -1845,7 +1894,7 @@ def _show_root_menu() -> None:
"select_update_version",
)
_add_directory_item(handle, "Suche in allen Quellen", "search")
_add_directory_item(handle, "Suche in allen Quellen", "search", art=_icon_for("search"))
plugins = _discover_plugins()
for plugin_name in sorted(plugins.keys(), key=lambda value: value.casefold()):
@@ -1853,9 +1902,9 @@ def _show_root_menu() -> None:
# Trakt-Menue (nur wenn aktiviert)
if _get_setting_bool("trakt_enabled", default=False):
_add_directory_item(handle, "Trakt", "trakt_menu", is_folder=True)
_add_directory_item(handle, "Trakt", "trakt_menu", is_folder=True, art=_icon_for("trakt_menu"))
_add_directory_item(handle, "Einstellungen", "settings")
_add_directory_item(handle, "Einstellungen", "settings", art=_icon_for("settings"))
xbmcplugin.endOfDirectory(handle)
@@ -1863,7 +1912,7 @@ 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, "Weiterschauen", "trakt_continue", is_folder=True, art=_icon_for("trakt_continue"))
_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)
@@ -1884,19 +1933,19 @@ def _show_plugin_menu(plugin_name: str) -> None:
xbmcplugin.setPluginCategory(handle, plugin_name)
if callable(getattr(plugin, "search_titles", None)):
_add_directory_item(handle, "Suche", "plugin_search", {"plugin": plugin_name}, is_folder=True)
_add_directory_item(handle, "Suche", "plugin_search", {"plugin": plugin_name}, is_folder=True, art=_icon_for("plugin_search"))
if _plugin_has_capability(plugin, "new_titles") or _plugin_has_capability(plugin, "latest_episodes"):
_add_directory_item(handle, LATEST_MENU_LABEL, "latest_titles", {"plugin": plugin_name, "page": "1"}, is_folder=True)
_add_directory_item(handle, LATEST_MENU_LABEL, "latest_titles", {"plugin": plugin_name, "page": "1"}, is_folder=True, art=_icon_for("latest_titles"))
if _plugin_has_capability(plugin, "genres"):
_add_directory_item(handle, "Genres", "genres", {"plugin": plugin_name}, is_folder=True)
_add_directory_item(handle, "Genres", "genres", {"plugin": plugin_name}, is_folder=True, art=_icon_for("genres"))
if _plugin_has_capability(plugin, "alpha"):
_add_directory_item(handle, "A-Z", "alpha_index", {"plugin": plugin_name}, is_folder=True)
_add_directory_item(handle, "A-Z", "alpha_index", {"plugin": plugin_name}, is_folder=True, art=_icon_for("alpha_index"))
if _plugin_has_capability(plugin, "series_catalog"):
_add_directory_item(handle, "Serien", "series_catalog", {"plugin": plugin_name, "page": "1"}, is_folder=True)
_add_directory_item(handle, "Serien", "series_catalog", {"plugin": plugin_name, "page": "1"}, is_folder=True, art=_icon_for("series_catalog"))
if _plugin_has_capability(plugin, "popular_series"):
_add_directory_item(handle, POPULAR_MENU_LABEL, "popular", {"plugin": plugin_name, "page": "1"}, is_folder=True)
@@ -1919,7 +1968,7 @@ def _show_plugin_menu(plugin_name: str) -> None:
xbmcplugin.endOfDirectory(handle)
def _show_plugin_search(plugin_name: str) -> None:
def _show_plugin_search(plugin_name: str, query: str = "") -> None:
plugin_name = (plugin_name or "").strip()
plugin = _discover_plugins().get(plugin_name)
if not plugin:
@@ -1927,13 +1976,15 @@ def _show_plugin_search(plugin_name: str) -> None:
_show_root_menu()
return
_log(f"Plugin-Suche gestartet: {plugin_name}")
dialog = xbmcgui.Dialog()
query = dialog.input(f"{plugin_name}: Titel eingeben", type=xbmcgui.INPUT_ALPHANUM).strip()
query = (query or "").strip()
if not query:
_log("Plugin-Suche abgebrochen (leere Eingabe).", xbmc.LOGDEBUG)
_show_plugin_menu(plugin_name)
return
_log(f"Plugin-Suche gestartet: {plugin_name}")
dialog = xbmcgui.Dialog()
query = dialog.input(f"{plugin_name}: Titel eingeben", type=xbmcgui.INPUT_ALPHANUM).strip()
if not query:
_log("Plugin-Suche abgebrochen (leere Eingabe).", xbmc.LOGDEBUG)
_show_plugin_menu(plugin_name)
return
_log(f"Plugin-Suchbegriff ({plugin_name}): {query}", xbmc.LOGDEBUG)
_show_plugin_search_results(plugin_name, query)
@@ -2556,7 +2607,7 @@ def _show_seasons(plugin_name: str, title: str, series_url: str = "") -> None:
# Staffel-Metadaten (Plot/Poster) optional via TMDB.
if show_tmdb:
_tmdb_labels_and_art(title)
api_key = _get_setting_string("tmdb_api_key").strip() if show_tmdb else ""
api_key = _resolve_tmdb_api_key(_get_setting_string("tmdb_api_key").strip()) if show_tmdb else ""
language = _get_setting_string("tmdb_language").strip() or "de-DE"
show_plot = _get_setting_bool("tmdb_show_plot", default=True)
show_art = _get_setting_bool("tmdb_show_art", default=True)
@@ -3544,6 +3595,8 @@ def _show_latest_episodes(plugin_name: str, page: int = 1) -> None:
xbmcplugin.endOfDirectory(handle)
return
# Unique Serientitel für Metadaten-Prefetch sammeln
valid_entries = []
for entry in entries:
try:
title = str(getattr(entry, "series_title", "") or "").strip()
@@ -3555,7 +3608,28 @@ def _show_latest_episodes(plugin_name: str, page: int = 1) -> None:
continue
if not title or not url or season_number < 0 or episode_number <= 0:
continue
valid_entries.append((title, season_number, episode_number, url, airdate))
unique_titles = list(dict.fromkeys(t for t, *_ in valid_entries))
use_source, show_tmdb, prefer_source = _metadata_policy(
plugin_name, plugin, allow_tmdb=_tmdb_enabled()
)
plugin_meta = _collect_plugin_metadata(plugin, unique_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(unique_titles) if show_tmdb else []
if show_tmdb and prefer_source and use_source:
tmdb_titles = [t for t in unique_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"{LATEST_MENU_LABEL} wird geladen..."):
tmdb_prefetched = _tmdb_labels_and_art_bulk(tmdb_titles)
for title, season_number, episode_number, url, airdate in valid_entries:
season_label = f"Staffel {season_number}"
episode_label = f"Episode {episode_number}"
key = _playstate_key(plugin_name=plugin_name, title=title, season=season_label, episode=episode_label)
@@ -3564,13 +3638,20 @@ def _show_latest_episodes(plugin_name: str, page: int = 1) -> None:
label = f"{title} - S{season_number:02d}E{episode_number:02d}"
label = _label_with_playstate(label, playstate)
info_labels: dict[str, object] = {
tmdb_info, tmdb_art, tmdb_cast = tmdb_prefetched.get(title, ({}, {}, [])) if show_tmdb else ({}, {}, [])
meta = plugin_meta.get(title)
merged_labels, art, cast = _merge_metadata(title, tmdb_info, tmdb_art, tmdb_cast, meta)
info_labels: dict[str, object] = dict(merged_labels or {})
info_labels.update({
"title": f"{title} - S{season_number:02d}E{episode_number:02d}",
"tvshowtitle": title,
"season": season_number,
"episode": episode_number,
"mediatype": "episode",
}
})
if airdate:
info_labels.setdefault("aired", airdate)
info_labels = _apply_playstate_to_info(info_labels, playstate)
_add_directory_item(
@@ -3586,6 +3667,8 @@ def _show_latest_episodes(plugin_name: str, page: int = 1) -> None:
},
is_folder=False,
info_labels=info_labels,
art=art,
cast=cast,
)
has_more_fn = getattr(plugin, "latest_episodes_has_more", None)
@@ -5332,7 +5415,7 @@ def _route_plugin_menu(params: dict[str, str]) -> None:
@_router.route("plugin_search")
def _route_plugin_search(params: dict[str, str]) -> None:
_show_plugin_search(params.get("plugin", ""))
_show_plugin_search(params.get("plugin", ""), params.get("query", ""))
@_router.route("genres")
@@ -5430,6 +5513,11 @@ def _route_install_ytdlp(params: dict[str, str]) -> None:
_ensure_ytdlp_installed(force=True, silent=False)
@_router.route("install_tmdb_helper_players")
def _route_install_tmdb_helper_players(params: dict[str, str]) -> None:
_install_tmdb_helper_players()
@_router.route("choose_source")
def _route_choose_source(params: dict[str, str]) -> None:
_show_choose_source(params.get("title", ""), params.get("plugins", ""))
@@ -5480,6 +5568,63 @@ def _route_play_movie(params: dict[str, str]) -> None:
_play_episode(plugin_name, title, "Film", "Stream", resolve_handle=_get_handle())
@_router.route("play_direct")
def _route_play_direct(params: dict[str, str]) -> None:
"""Direkte Wiedergabe ohne Ordner-Navigation: sucht Titel im Plugin, nimmt besten Match."""
plugin_name = (params.get("plugin", "") or "").strip()
query = (params.get("query", "") or "").strip()
season_num = _parse_positive_int(params.get("season", "1"), default=1)
episode_num = _parse_positive_int(params.get("episode", "1"), default=1)
is_movie = params.get("type", "").lower() == "movie"
plugin = _discover_plugins().get(plugin_name)
if not plugin:
xbmcgui.Dialog().notification("ViewIT", f"Plugin nicht gefunden: {plugin_name}", xbmcgui.NOTIFICATION_ERROR, 4000)
return
if not query:
xbmcgui.Dialog().notification("ViewIT", "Kein Suchtitel angegeben.", xbmcgui.NOTIFICATION_ERROR, 4000)
return
# Suche im Plugin
try:
search_coro = _call_plugin_search(plugin, query)
results = _run_async(search_coro)
results = _clean_search_titles([str(t).strip() for t in (results or []) if t and str(t).strip()])
except Exception as exc:
xbmcgui.Dialog().notification("ViewIT", f"Suche fehlgeschlagen: {exc}", xbmcgui.NOTIFICATION_ERROR, 4000)
return
if not results:
xbmcgui.Dialog().notification("ViewIT", f"Kein Ergebnis für: {query}", xbmcgui.NOTIFICATION_WARNING, 4000)
return
# Besten Match wählen: bevorzuge Titel die den Query enthalten
from search_utils import matches_query as _mq
matched = [r for r in results if _mq(query, title=r)]
title = matched[0] if matched else results[0]
if is_movie:
_play_episode(plugin_name, title, "Film", "Stream", resolve_handle=_get_handle())
else:
season_label = f"Staffel {season_num}"
# Episodenlabel exakt aus dem Plugin holen (z.B. "Episode 3: Titel (Original)")
episode_label = f"Episode {episode_num}"
episodes = getattr(plugin, "episodes_for", None)
if callable(episodes):
try:
ep_list = episodes(title, season_label)
# Suche das Label das mit "Episode {episode_num}:" oder "Episode {episode_num} " beginnt
prefix = f"Episode {episode_num}:"
prefix2 = f"Episode {episode_num} "
for ep in (ep_list or []):
if ep.startswith(prefix) or ep.startswith(prefix2) or ep == f"Episode {episode_num}":
episode_label = ep
break
except Exception:
pass
_play_episode(plugin_name, title, season_label, episode_label, resolve_handle=_get_handle())
@_router.route("play_episode_url")
def _route_play_episode_url(params: dict[str, str]) -> None:
_play_episode_url(