Compare commits

..

4 Commits

6 changed files with 97 additions and 20 deletions

4
.gitignore vendored
View File

@@ -19,3 +19,7 @@ __pycache__/
# Plugin runtime caches
/addon/plugins/*_cache.json
# Projektdokumentation (lokal)
/PROJECT_INDEX.md
/FUNCTION_MAP.md

View File

@@ -1,3 +1,19 @@
## 0.1.78.5-dev - 2026-03-11
- dev: Uhrzeit aus Episodentitel entfernen, tvshow-Mediatype fix
## 0.1.78.0-dev - 2026-03-11
- dev: Trakt-Scrobbling fuer alle Wiedergabe-Pfade
## 0.1.77.5-dev - 2026-03-10
- dev: Max. Eintraege pro Seite Setting pro Plugin
## 0.1.77.0-dev - 2026-03-10
- dev: Changelog-Dialog nur anzeigen wenn Eintrag vorhanden
## 0.1.76.5-dev - 2026-03-10
- dev: Versionsfilter fuer 4-teilige Versionsnummern korrigiert

View File

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

View File

@@ -52,6 +52,24 @@ def _require_init() -> None:
print("[ViewIT/metadata] WARNUNG: metadata.init() wurde nicht aufgerufen Metadaten-Funktionen arbeiten mit Standardwerten!", file=sys.stderr)
def _resolve_tmdb_api_key(user_key: str) -> str:
"""Key aus ViewIT-Settings, installiertem Kodi-Scraper oder Community-Fallback."""
if user_key:
return user_key
if xbmcaddon:
for addon_id in (
"metadata.tvshows.themoviedb.org.python",
"metadata.themoviedb.org.python",
):
try:
key = xbmcaddon.Addon(addon_id).getSetting("tmdb_apikey")
if key:
return key
except RuntimeError:
pass
return "80246691939720672db3fc71c74e0ef2"
def init(
*,
get_setting_string: Callable[[str], str],
@@ -153,7 +171,7 @@ def tmdb_labels_and_art(title: str) -> tuple[dict[str, str], dict[str, str], lis
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:
@@ -295,7 +313,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:
return {"title": episode_label}, {}
log_requests = _get_setting_bool("tmdb_log_requests", default=False)
@@ -358,7 +376,7 @@ def tmdb_episode_cast(*, title: str, season_label: str, episode_label: str) -> l
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:
tmdb_cache_set(_TMDB_EPISODE_CAST_CACHE, cache_key, [])
return []
@@ -398,7 +416,7 @@ def tmdb_season_labels_and_art(
show_plot = _get_setting_bool("tmdb_show_plot", default=True)
show_art = _get_setting_bool("tmdb_show_art", default=True)
flags = f"p{int(show_plot)}a{int(show_art)}"
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)
log_fn = tmdb_file_log if (log_requests or log_responses) else None

View File

@@ -1681,6 +1681,17 @@ def _maybe_auto_install_resolveurl(action: str | None) -> None:
_ensure_resolveurl_installed(force=False, silent=True)
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:
masked = active_key[:6] + "" + active_key[-4:] if len(active_key) > 10 else active_key
else:
masked = "(kein)"
_set_setting_string("tmdb_api_key_active", masked)
def _sync_update_version_settings() -> None:
addon_version = _installed_addon_version_from_disk()
if addon_version == "0.0.0":
@@ -1693,6 +1704,7 @@ def _sync_update_version_settings() -> None:
_set_setting_string("update_installed_version", addon_version)
_sync_resolveurl_status_setting()
_sync_update_channel_status_settings()
_sync_tmdb_active_key_setting()
def _show_root_menu() -> None:
@@ -3176,8 +3188,9 @@ def _show_popular(plugin_name: str | None = None, page: int = 1) -> None:
def _show_new_titles(plugin_name: str, page: int = 1, *, action_name: str = "new_titles") -> None:
handle = _get_handle()
page_size = LIST_PAGE_SIZE
page = max(1, int(page or 1))
max_items_key = f"{(plugin_name or '').strip().casefold()}_max_page_items"
page_size = _get_setting_int(max_items_key, default=15) or LIST_PAGE_SIZE
plugin_name = (plugin_name or "").strip()
plugin = _discover_plugins().get(plugin_name)
@@ -3218,6 +3231,8 @@ def _show_new_titles(plugin_name: str, page: int = 1, *, action_name: str = "new
xbmcplugin.endOfDirectory(handle)
return
page_items = [str(t).strip() for t in page_items if t and str(t).strip()]
if page_size > 0 and len(page_items) > page_size:
page_items = page_items[:page_size]
page_items.sort(key=lambda value: value.casefold())
else:
try:
@@ -3284,15 +3299,16 @@ def _show_new_titles(plugin_name: str, page: int = 1, *, action_name: str = "new
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", "movie")
is_direct_play = bool(
plugin_name.casefold() == "einschalten"
and _get_setting_bool("einschalten_enable_playback", default=False)
)
info_labels.setdefault("mediatype", "movie" if is_direct_play else "tvshow")
playstate = _title_playstate(plugin_name, title)
info_labels = _apply_playstate_to_info(dict(info_labels), playstate)
display_label = _label_with_duration(title, info_labels)
display_label = _label_with_playstate(display_label, playstate)
direct_play = bool(
plugin_name.casefold() == "einschalten"
and _get_setting_bool("einschalten_enable_playback", default=False)
)
direct_play = is_direct_play
_add_directory_item(
handle,
display_label,
@@ -3378,8 +3394,6 @@ def _show_latest_episodes(plugin_name: str, page: int = 1) -> None:
playstate = _get_playstate(key)
label = f"{title} - S{season_number:02d}E{episode_number:02d}"
if airdate:
label = f"{label} ({airdate})"
label = _label_with_playstate(label, playstate)
info_labels: dict[str, object] = {
@@ -4119,15 +4133,14 @@ def _play_episode(
title_key = (title or "").strip().casefold()
_tmdb_id = _tmdb_cache_get(_TMDB_ID_CACHE, title_key, 0)
_imdb_id = ""
trakt_media: dict[str, object] | None = None
_kind = _tmdb_cache_get(_MEDIA_TYPE_CACHE, title_key, "tv") if _tmdb_id else "tv"
if _tmdb_id:
_kind = _tmdb_cache_get(_MEDIA_TYPE_CACHE, title_key, "tv")
_imdb_id = _fetch_and_cache_imdb_id(title_key, _tmdb_id, _kind)
_set_trakt_ids_property(title, _tmdb_id, _imdb_id)
trakt_media = {
"title": title, "tmdb_id": _tmdb_id, "imdb_id": _imdb_id, "kind": _kind,
"season": season_number or 0, "episode": episode_number or 0,
}
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,
}
_play_final_link(
final_link,
@@ -4231,6 +4244,19 @@ def _play_episode_url(
if episode_number > 0:
info_labels["episode"] = str(episode_number)
display_title = _label_with_duration(display_title, info_labels)
title_key = (title or "").strip().casefold()
_tmdb_id = _tmdb_cache_get(_TMDB_ID_CACHE, title_key, 0)
_imdb_id = ""
_kind = _tmdb_cache_get(_MEDIA_TYPE_CACHE, title_key, "tv") if _tmdb_id else "tv"
if _tmdb_id:
_imdb_id = _fetch_and_cache_imdb_id(title_key, _tmdb_id, _kind)
_set_trakt_ids_property(title, _tmdb_id, _imdb_id)
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,
}
_play_final_link(
final_link,
display_title=display_title,
@@ -4238,6 +4264,7 @@ def _play_episode_url(
art=art,
cast=cast,
resolve_handle=resolve_handle,
trakt_media=trakt_media,
)
_track_playback_and_update_state_async(
_playstate_key(plugin_name=plugin_name, title=title, season=season_label, episode=episode_label)

View File

@@ -29,7 +29,8 @@
</category>
<category label="TMDB Erweitert">
<setting id="tmdb_api_key" type="text" label="TMDB API Key" default="" />
<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" />
@@ -38,6 +39,17 @@
<setting id="tmdb_log_responses" type="bool" label="TMDB API-Antworten loggen" default="false" />
</category>
<category label="Anzeige">
<setting id="filmpalast_max_page_items" type="number" label="Filmpalast: Max. Eintraege pro Seite" default="15" />
<setting id="topstreamfilm_max_page_items" type="number" label="TopStream: Max. Eintraege pro Seite" default="15" />
<setting id="aniworld_max_page_items" type="number" label="AniWorld: Max. Eintraege pro Seite" default="15" />
<setting id="netzkkino_max_page_items" type="number" label="Netzkino: Max. Eintraege pro Seite" default="15" />
<setting id="kkiste_max_page_items" type="number" label="KKiste: Max. Eintraege pro Seite" default="15" />
<setting id="hdfilme_max_page_items" type="number" label="HDFilme: Max. Eintraege pro Seite" default="15" />
<setting id="moflix_max_page_items" type="number" label="Moflix: Max. Eintraege pro Seite" default="15" />
<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" />