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

dev: Trakt Performance, Suchfilter Phrase-Match, Debug-Settings Expert-Level

Browse Source
This commit is contained in:
itdrui.de
2026-03-15 14:10:08 +01:00
parent 24df7254b7
commit 979ad4f8f5
4 changed files with 55 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
addon/default.py
View File

@@ -1938,6 +1938,8 @@ def _show_plugin_search_results(plugin_name: str, query: str) -> None:
pass
raise
results = _clean_search_titles([str(t).strip() for t in (results or []) if t and str(t).strip()])
from search_utils import matches_query as _mq
results = [r for r in results if _mq(query, title=r)]
results.sort(key=lambda value: value.casefold())
use_source, show_tmdb, prefer_source = _metadata_policy(
@@ -2208,6 +2210,8 @@ def _show_search_results(query: str) -> None:
_log(f"Suche fehlgeschlagen ({plugin_name}): {exc}", xbmc.LOGWARNING)
continue
results = _clean_search_titles([str(t).strip() for t in (results or []) if t and str(t).strip()])
from search_utils import matches_query as _mq
results = [r for r in results if _mq(query, title=r)]
_log(f"Treffer ({plugin_name}): {len(results)}", xbmc.LOGDEBUG)
use_source, show_tmdb, prefer_source = _metadata_policy(
plugin_name, plugin, allow_tmdb=_tmdb_enabled()
@@ -4910,10 +4914,11 @@ def _show_trakt_watchlist(media_type: str = "") -> None:
_set_content(handle, "tvshows")
items = client.get_watchlist(token, media_type=media_type)
tmdb_prefetched = _tmdb_labels_and_art_bulk([i.title for i in items]) if _tmdb_enabled() else {}
for item in items:
label = f"{item.title} ({item.year})" if item.year else item.title
tmdb_info, art, _ = _tmdb_labels_and_art(item.title)
tmdb_info, art, _ = tmdb_prefetched.get(item.title, ({}, {}, []))
info_labels: dict[str, object] = dict(tmdb_info)
info_labels["title"] = label
info_labels["tvshowtitle"] = item.title
@@ -4921,16 +4926,7 @@ def _show_trakt_watchlist(media_type: str = "") -> None:
info_labels["year"] = item.year
info_labels["mediatype"] = "tvshow"
match = _trakt_find_in_plugins(item.title)
if match:
plugin_name, matched_title = match
action = "seasons"
params: dict[str, str] = {"plugin": plugin_name, "title": matched_title}
else:
action = "search"
params = {"query": item.title}
_add_directory_item(handle, label, action, params, is_folder=True, info_labels=info_labels, art=art)
_add_directory_item(handle, label, "search", {"query": item.title}, is_folder=True, info_labels=info_labels, art=art)
if not items:
xbmcgui.Dialog().notification("Trakt", "Watchlist ist leer.", xbmcgui.NOTIFICATION_INFO, 3000)
xbmcplugin.endOfDirectory(handle)
@@ -4949,6 +4945,7 @@ def _show_trakt_history(page: int = 1) -> None:
_set_content(handle, "episodes")
items = client.get_history(token, page=page, limit=LIST_PAGE_SIZE)
tmdb_prefetched = _tmdb_labels_and_art_bulk(list(dict.fromkeys(i.title for i in items))) if _tmdb_enabled() else {}
for item in items:
is_episode = item.media_type == "episode" and item.season and item.episode
@@ -4969,7 +4966,7 @@ def _show_trakt_history(page: int = 1) -> None:
art["fanart"] = item.show_fanart
if item.show_poster:
art["poster"] = item.show_poster
_, tmdb_art, _ = _tmdb_labels_and_art(item.title)
_, tmdb_art, _ = tmdb_prefetched.get(item.title, ({}, {}, []))
for _k, _v in tmdb_art.items():
art.setdefault(_k, _v)
@@ -4996,24 +4993,7 @@ def _show_trakt_history(page: int = 1) -> None:
f"RunPlugin({sys.argv[0]}?{wl_params})"))
# Navigation: Episoden direkt abspielen, Serien zur Staffelauswahl
match = _trakt_find_in_plugins(item.title)
if match:
plugin_name, matched_title = match
if is_episode:
action = "play_episode"
params: dict[str, str] = {
"plugin": plugin_name,
"title": matched_title,
"season": f"Staffel {item.season}",
"episode": f"Episode {item.episode}",
}
_add_directory_item(handle, label, action, params, is_folder=False, info_labels=info_labels, art=art, context_menu=ctx or None)
else:
action = "seasons"
params = {"plugin": plugin_name, "title": matched_title}
_add_directory_item(handle, label, action, params, is_folder=True, info_labels=info_labels, art=art, context_menu=ctx or None)
else:
_add_directory_item(handle, label, "search", {"query": item.title}, is_folder=True, info_labels=info_labels, art=art, context_menu=ctx or None)
_add_directory_item(handle, label, "search", {"query": item.title}, is_folder=True, info_labels=info_labels, art=art, context_menu=ctx or None)
if len(items) >= LIST_PAGE_SIZE:
_add_directory_item(handle, "Naechste Seite >>", "trakt_history", {"page": str(page + 1)}, is_folder=True)
@@ -5066,6 +5046,10 @@ def _show_trakt_upcoming() -> None:
pass
dated_items.append((airdate, item))
# TMDB-Artwork fuer alle Serien parallel prefetchen (dedupliziert)
show_titles = list(dict.fromkeys(item.show_title for _, item in dated_items))
tmdb_prefetched = _tmdb_labels_and_art_bulk(show_titles) if _tmdb_enabled() else {}
last_date: _date | None = None
for airdate, item in dated_items:
# Datums-Ueberschrift einfuegen
@@ -5117,22 +5101,12 @@ def _show_trakt_upcoming() -> None:
art["fanart"] = item.episode_thumb
elif item.show_fanart:
art["fanart"] = item.show_fanart
_, tmdb_art, _ = _tmdb_labels_and_art(item.show_title)
_, tmdb_art, _ = tmdb_prefetched.get(item.show_title, ({}, {}, []))
for _k, _v in tmdb_art.items():
art.setdefault(_k, _v)
match = _trakt_find_in_plugins(item.show_title)
if match:
plugin_name, matched_title = match
action = "episodes"
params: dict[str, str] = {
"plugin": plugin_name,
"title": matched_title,
"season": f"Staffel {item.season}",
}
else:
action = "search"
params = {"query": item.show_title}
action = "search"
params: dict[str, str] = {"query": item.show_title}
_add_directory_item(handle, label, action, params, is_folder=True, info_labels=info_labels, art=art)
@@ -5171,47 +5145,18 @@ def _show_trakt_continue_watching() -> None:
xbmcplugin.endOfDirectory(handle)
return
# TMDB-Artwork fuer alle Serien parallel prefetchen
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
match = _trakt_find_in_plugins(last.title)
# Wenn kein Plugin-Match: Suchaktion anbieten (kein Episode-Overflow-Problem)
if not match:
label = f"{last.title} \u2013 S{next_season:02d}E{next_ep:02d}"
sub = f"(zuletzt: S{last.season:02d}E{last.episode:02d})"
display_label = f"{label} {sub}"
info_labels: dict[str, object] = {
"title": display_label,
"tvshowtitle": last.title,
"mediatype": "episode",
}
if last.year:
info_labels["year"] = last.year
_, art, _ = _tmdb_labels_and_art(last.title)
_add_directory_item(handle, display_label, "search", {"query": last.title}, is_folder=True, info_labels=info_labels, art=art)
continue
plugin_name, matched_title = match
# Prüfe ob die nächste Episode im Plugin tatsächlich existiert
plugin = _discover_plugins().get(plugin_name)
episodes_getter = getattr(plugin, "episodes_for_season", None) if plugin else None
if callable(episodes_getter):
try:
ep_list = episodes_getter(matched_title, next_season) or []
if next_ep > len(ep_list):
# Letzte Folge der Staffel war die letzte – nächste Staffel, Folge 1
next_season += 1
next_ep = 1
except Exception:
pass
label = f"{last.title} \u2013 S{next_season:02d}E{next_ep:02d}"
sub = f"(zuletzt: S{last.season:02d}E{last.episode:02d})"
display_label = f"{label} {sub}"
info_labels = {
info_labels: dict[str, object] = {
"title": display_label,
"tvshowtitle": last.title,
"season": next_season,
@@ -5221,14 +5166,8 @@ def _show_trakt_continue_watching() -> None:
if last.year:
info_labels["year"] = last.year
_, art, _ = _tmdb_labels_and_art(last.title)
params: dict[str, str] = {
"plugin": plugin_name,
"title": matched_title,
"season": f"Staffel {next_season}",
}
_add_directory_item(handle, display_label, "episodes", params, is_folder=True, info_labels=info_labels, art=art)
_, art, _ = tmdb_prefetched.get(last.title, ({}, {}, []))
_add_directory_item(handle, display_label, "search", {"query": last.title}, is_folder=True, info_labels=info_labels, art=art)
xbmcplugin.endOfDirectory(handle)