Compare commits
2 Commits
v0.1.82.5-
...
v0.1.83.5-
| Author | SHA1 | Date | |
|---|---|---|---|
| 4e9ae348b9 | |||
| 979ad4f8f5 |
@@ -1,3 +1,11 @@
|
|||||||
|
## 0.1.83.0-dev - 2026-03-15
|
||||||
|
|
||||||
|
- dev: Trakt Performance, Suchfilter Phrase-Match, Debug-Settings Expert-Level
|
||||||
|
|
||||||
|
## 0.1.82.5-dev - 2026-03-15
|
||||||
|
|
||||||
|
- dev: Update-Versionsvergleich numerisch korrigiert
|
||||||
|
|
||||||
## 0.1.82.0-dev - 2026-03-14
|
## 0.1.82.0-dev - 2026-03-14
|
||||||
|
|
||||||
- dev: HDFilme Plot in Rubrik Neuste anzeigen
|
- dev: HDFilme Plot in Rubrik Neuste anzeigen
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version='1.0' encoding='utf-8'?>
|
<?xml version='1.0' encoding='utf-8'?>
|
||||||
<addon id="plugin.video.viewit" name="ViewIt" version="0.1.82.5-dev" provider-name="ViewIt">
|
<addon id="plugin.video.viewit" name="ViewIt" version="0.1.83.5-dev" provider-name="ViewIt">
|
||||||
<requires>
|
<requires>
|
||||||
<import addon="xbmc.python" version="3.0.0" />
|
<import addon="xbmc.python" version="3.0.0" />
|
||||||
<import addon="script.module.requests" />
|
<import addon="script.module.requests" />
|
||||||
|
|||||||
107
addon/default.py
107
addon/default.py
@@ -1938,6 +1938,8 @@ def _show_plugin_search_results(plugin_name: str, query: str) -> None:
|
|||||||
pass
|
pass
|
||||||
raise
|
raise
|
||||||
results = _clean_search_titles([str(t).strip() for t in (results or []) if t and str(t).strip()])
|
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())
|
results.sort(key=lambda value: value.casefold())
|
||||||
|
|
||||||
use_source, show_tmdb, prefer_source = _metadata_policy(
|
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)
|
_log(f"Suche fehlgeschlagen ({plugin_name}): {exc}", xbmc.LOGWARNING)
|
||||||
continue
|
continue
|
||||||
results = _clean_search_titles([str(t).strip() for t in (results or []) if t and str(t).strip()])
|
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)
|
_log(f"Treffer ({plugin_name}): {len(results)}", xbmc.LOGDEBUG)
|
||||||
use_source, show_tmdb, prefer_source = _metadata_policy(
|
use_source, show_tmdb, prefer_source = _metadata_policy(
|
||||||
plugin_name, plugin, allow_tmdb=_tmdb_enabled()
|
plugin_name, plugin, allow_tmdb=_tmdb_enabled()
|
||||||
@@ -4910,10 +4914,11 @@ def _show_trakt_watchlist(media_type: str = "") -> None:
|
|||||||
|
|
||||||
_set_content(handle, "tvshows")
|
_set_content(handle, "tvshows")
|
||||||
items = client.get_watchlist(token, media_type=media_type)
|
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:
|
for item in items:
|
||||||
label = f"{item.title} ({item.year})" if item.year else item.title
|
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: dict[str, object] = dict(tmdb_info)
|
||||||
info_labels["title"] = label
|
info_labels["title"] = label
|
||||||
info_labels["tvshowtitle"] = item.title
|
info_labels["tvshowtitle"] = item.title
|
||||||
@@ -4921,16 +4926,7 @@ def _show_trakt_watchlist(media_type: str = "") -> None:
|
|||||||
info_labels["year"] = item.year
|
info_labels["year"] = item.year
|
||||||
info_labels["mediatype"] = "tvshow"
|
info_labels["mediatype"] = "tvshow"
|
||||||
|
|
||||||
match = _trakt_find_in_plugins(item.title)
|
_add_directory_item(handle, label, "search", {"query": item.title}, is_folder=True, info_labels=info_labels, art=art)
|
||||||
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)
|
|
||||||
if not items:
|
if not items:
|
||||||
xbmcgui.Dialog().notification("Trakt", "Watchlist ist leer.", xbmcgui.NOTIFICATION_INFO, 3000)
|
xbmcgui.Dialog().notification("Trakt", "Watchlist ist leer.", xbmcgui.NOTIFICATION_INFO, 3000)
|
||||||
xbmcplugin.endOfDirectory(handle)
|
xbmcplugin.endOfDirectory(handle)
|
||||||
@@ -4949,6 +4945,7 @@ def _show_trakt_history(page: int = 1) -> None:
|
|||||||
_set_content(handle, "episodes")
|
_set_content(handle, "episodes")
|
||||||
|
|
||||||
items = client.get_history(token, page=page, limit=LIST_PAGE_SIZE)
|
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:
|
for item in items:
|
||||||
is_episode = item.media_type == "episode" and item.season and item.episode
|
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
|
art["fanart"] = item.show_fanart
|
||||||
if item.show_poster:
|
if item.show_poster:
|
||||||
art["poster"] = 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():
|
for _k, _v in tmdb_art.items():
|
||||||
art.setdefault(_k, _v)
|
art.setdefault(_k, _v)
|
||||||
|
|
||||||
@@ -4996,24 +4993,7 @@ def _show_trakt_history(page: int = 1) -> None:
|
|||||||
f"RunPlugin({sys.argv[0]}?{wl_params})"))
|
f"RunPlugin({sys.argv[0]}?{wl_params})"))
|
||||||
|
|
||||||
# Navigation: Episoden direkt abspielen, Serien zur Staffelauswahl
|
# Navigation: Episoden direkt abspielen, Serien zur Staffelauswahl
|
||||||
match = _trakt_find_in_plugins(item.title)
|
_add_directory_item(handle, label, "search", {"query": item.title}, is_folder=True, info_labels=info_labels, art=art, context_menu=ctx or None)
|
||||||
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)
|
|
||||||
|
|
||||||
if len(items) >= LIST_PAGE_SIZE:
|
if len(items) >= LIST_PAGE_SIZE:
|
||||||
_add_directory_item(handle, "Naechste Seite >>", "trakt_history", {"page": str(page + 1)}, is_folder=True)
|
_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
|
pass
|
||||||
dated_items.append((airdate, item))
|
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
|
last_date: _date | None = None
|
||||||
for airdate, item in dated_items:
|
for airdate, item in dated_items:
|
||||||
# Datums-Ueberschrift einfuegen
|
# Datums-Ueberschrift einfuegen
|
||||||
@@ -5117,22 +5101,12 @@ def _show_trakt_upcoming() -> None:
|
|||||||
art["fanart"] = item.episode_thumb
|
art["fanart"] = item.episode_thumb
|
||||||
elif item.show_fanart:
|
elif item.show_fanart:
|
||||||
art["fanart"] = 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():
|
for _k, _v in tmdb_art.items():
|
||||||
art.setdefault(_k, _v)
|
art.setdefault(_k, _v)
|
||||||
|
|
||||||
match = _trakt_find_in_plugins(item.show_title)
|
action = "search"
|
||||||
if match:
|
params: dict[str, str] = {"query": item.show_title}
|
||||||
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}
|
|
||||||
|
|
||||||
_add_directory_item(handle, label, action, params, is_folder=True, info_labels=info_labels, art=art)
|
_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)
|
xbmcplugin.endOfDirectory(handle)
|
||||||
return
|
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():
|
for last in seen.values():
|
||||||
next_season = last.season
|
next_season = last.season
|
||||||
next_ep = last.episode + 1
|
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}"
|
label = f"{last.title} \u2013 S{next_season:02d}E{next_ep:02d}"
|
||||||
sub = f"(zuletzt: S{last.season:02d}E{last.episode:02d})"
|
sub = f"(zuletzt: S{last.season:02d}E{last.episode:02d})"
|
||||||
display_label = f"{label} {sub}"
|
display_label = f"{label} {sub}"
|
||||||
|
|
||||||
info_labels = {
|
info_labels: dict[str, object] = {
|
||||||
"title": display_label,
|
"title": display_label,
|
||||||
"tvshowtitle": last.title,
|
"tvshowtitle": last.title,
|
||||||
"season": next_season,
|
"season": next_season,
|
||||||
@@ -5221,14 +5166,8 @@ def _show_trakt_continue_watching() -> None:
|
|||||||
if last.year:
|
if last.year:
|
||||||
info_labels["year"] = last.year
|
info_labels["year"] = last.year
|
||||||
|
|
||||||
_, art, _ = _tmdb_labels_and_art(last.title)
|
_, 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)
|
||||||
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)
|
|
||||||
|
|
||||||
xbmcplugin.endOfDirectory(handle)
|
xbmcplugin.endOfDirectory(handle)
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,6 @@ else: # pragma: no cover
|
|||||||
|
|
||||||
|
|
||||||
SETTING_BASE_URL = "serienstream_base_url"
|
SETTING_BASE_URL = "serienstream_base_url"
|
||||||
SETTING_CATALOG_SEARCH = "serienstream_catalog_search"
|
|
||||||
DEFAULT_BASE_URL = "https://s.to"
|
DEFAULT_BASE_URL = "https://s.to"
|
||||||
DEFAULT_PREFERRED_HOSTERS = ["voe"]
|
DEFAULT_PREFERRED_HOSTERS = ["voe"]
|
||||||
DEFAULT_TIMEOUT = 20
|
DEFAULT_TIMEOUT = 20
|
||||||
@@ -80,10 +79,7 @@ HEADERS = {
|
|||||||
SESSION_CACHE_TTL_SECONDS = 300
|
SESSION_CACHE_TTL_SECONDS = 300
|
||||||
SESSION_CACHE_PREFIX = "viewit.serienstream"
|
SESSION_CACHE_PREFIX = "viewit.serienstream"
|
||||||
SESSION_CACHE_MAX_TITLE_URLS = 800
|
SESSION_CACHE_MAX_TITLE_URLS = 800
|
||||||
CATALOG_SEARCH_TTL_SECONDS = 600
|
|
||||||
CATALOG_SEARCH_CACHE_KEY = "catalog_index"
|
|
||||||
GENRE_LIST_PAGE_SIZE = 20
|
GENRE_LIST_PAGE_SIZE = 20
|
||||||
_CATALOG_INDEX_MEMORY: tuple[float, list["SeriesResult"]] = (0.0, [])
|
|
||||||
ProgressCallback = Optional[Callable[[str, int | None], Any]]
|
ProgressCallback = Optional[Callable[[str, int | None], Any]]
|
||||||
|
|
||||||
|
|
||||||
@@ -575,8 +571,8 @@ def _search_series_server(query: str) -> list[SeriesResult]:
|
|||||||
if not query:
|
if not query:
|
||||||
return []
|
return []
|
||||||
base = _get_base_url()
|
base = _get_base_url()
|
||||||
search_url = f"{base}/search?q={quote(query)}"
|
search_url = f"{base}/suche?term={quote(query)}"
|
||||||
alt_url = f"{base}/suche?q={quote(query)}"
|
alt_url = f"{base}/search?term={quote(query)}"
|
||||||
for url in (search_url, alt_url):
|
for url in (search_url, alt_url):
|
||||||
try:
|
try:
|
||||||
body = _get_html_simple(url)
|
body = _get_html_simple(url)
|
||||||
@@ -606,158 +602,30 @@ def _search_series_server(query: str) -> list[SeriesResult]:
|
|||||||
continue
|
continue
|
||||||
seen_urls.add(url_abs)
|
seen_urls.add(url_abs)
|
||||||
results.append(SeriesResult(title=title, description="", url=url_abs))
|
results.append(SeriesResult(title=title, description="", url=url_abs))
|
||||||
|
filtered = [r for r in results if _matches_query(query, title=r.title)]
|
||||||
|
if filtered:
|
||||||
|
return filtered
|
||||||
if results:
|
if results:
|
||||||
return results
|
return results
|
||||||
api_results = _search_series_api(query)
|
|
||||||
if api_results:
|
|
||||||
return api_results
|
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
|
||||||
def _extract_catalog_index_from_html(body: str, *, progress_callback: ProgressCallback = None) -> list[SeriesResult]:
|
|
||||||
items: list[SeriesResult] = []
|
|
||||||
if not body:
|
|
||||||
return items
|
|
||||||
seen_urls: set[str] = set()
|
|
||||||
item_re = re.compile(
|
|
||||||
r"<li[^>]*class=[\"'][^\"']*series-item[^\"']*[\"'][^>]*>(.*?)</li>",
|
|
||||||
re.IGNORECASE | re.DOTALL,
|
|
||||||
)
|
|
||||||
anchor_re = re.compile(r"<a[^>]+href=[\"']([^\"']+)[\"'][^>]*>(.*?)</a>", re.IGNORECASE | re.DOTALL)
|
|
||||||
data_search_re = re.compile(r"data-search=[\"']([^\"']*)[\"']", re.IGNORECASE)
|
|
||||||
for idx, match in enumerate(item_re.finditer(body), start=1):
|
|
||||||
if idx == 1 or idx % 200 == 0:
|
|
||||||
_emit_progress(progress_callback, f"Katalog parsen {idx}", 62)
|
|
||||||
block = match.group(0)
|
|
||||||
inner = match.group(1) or ""
|
|
||||||
anchor_match = anchor_re.search(inner)
|
|
||||||
if not anchor_match:
|
|
||||||
continue
|
|
||||||
href = (anchor_match.group(1) or "").strip()
|
|
||||||
url = _absolute_url(href)
|
|
||||||
if not url or "/serie/" not in url or "/staffel-" in url or "/episode-" in url:
|
|
||||||
continue
|
|
||||||
if url in seen_urls:
|
|
||||||
continue
|
|
||||||
seen_urls.add(url)
|
|
||||||
title_raw = anchor_match.group(2) or ""
|
|
||||||
title = unescape(re.sub(r"\s+", " ", _strip_tags(title_raw))).strip()
|
|
||||||
if not title:
|
|
||||||
continue
|
|
||||||
search_match = data_search_re.search(block)
|
|
||||||
description = (search_match.group(1) or "").strip() if search_match else ""
|
|
||||||
items.append(SeriesResult(title=title, description=description, url=url))
|
|
||||||
return items
|
|
||||||
|
|
||||||
|
|
||||||
def _catalog_index_from_soup(soup: BeautifulSoupT) -> list[SeriesResult]:
|
|
||||||
items: list[SeriesResult] = []
|
|
||||||
if not soup:
|
|
||||||
return items
|
|
||||||
seen_urls: set[str] = set()
|
|
||||||
for item in soup.select("li.series-item"):
|
|
||||||
anchor = item.find("a", href=True)
|
|
||||||
if not anchor:
|
|
||||||
continue
|
|
||||||
href = (anchor.get("href") or "").strip()
|
|
||||||
url = _absolute_url(href)
|
|
||||||
if not url or "/serie/" not in url or "/staffel-" in url or "/episode-" in url:
|
|
||||||
continue
|
|
||||||
if url in seen_urls:
|
|
||||||
continue
|
|
||||||
seen_urls.add(url)
|
|
||||||
title = (anchor.get_text(" ", strip=True) or "").strip()
|
|
||||||
if not title:
|
|
||||||
continue
|
|
||||||
description = (item.get("data-search") or "").strip()
|
|
||||||
items.append(SeriesResult(title=title, description=description, url=url))
|
|
||||||
return items
|
|
||||||
|
|
||||||
|
|
||||||
def _load_catalog_index_from_cache() -> Optional[list[SeriesResult]]:
|
|
||||||
global _CATALOG_INDEX_MEMORY
|
|
||||||
expires_at, cached = _CATALOG_INDEX_MEMORY
|
|
||||||
if cached and expires_at > time.time():
|
|
||||||
return list(cached)
|
|
||||||
raw = _session_cache_get(CATALOG_SEARCH_CACHE_KEY)
|
|
||||||
if not isinstance(raw, list):
|
|
||||||
return None
|
|
||||||
items: list[SeriesResult] = []
|
|
||||||
for entry in raw:
|
|
||||||
if not isinstance(entry, list) or len(entry) < 2:
|
|
||||||
continue
|
|
||||||
title = str(entry[0] or "").strip()
|
|
||||||
url = str(entry[1] or "").strip()
|
|
||||||
description = str(entry[2] or "") if len(entry) > 2 else ""
|
|
||||||
cover = str(entry[3] or "").strip() if len(entry) > 3 else ""
|
|
||||||
if title and url:
|
|
||||||
items.append(SeriesResult(title=title, description=description, url=url, cover=cover))
|
|
||||||
if items:
|
|
||||||
_CATALOG_INDEX_MEMORY = (time.time() + CATALOG_SEARCH_TTL_SECONDS, list(items))
|
|
||||||
return items or None
|
|
||||||
|
|
||||||
|
|
||||||
def _store_catalog_index_in_cache(items: list[SeriesResult]) -> None:
|
|
||||||
global _CATALOG_INDEX_MEMORY
|
|
||||||
if not items:
|
|
||||||
return
|
|
||||||
_CATALOG_INDEX_MEMORY = (time.time() + CATALOG_SEARCH_TTL_SECONDS, list(items))
|
|
||||||
payload: list[list[str]] = []
|
|
||||||
for entry in items:
|
|
||||||
if not entry.title or not entry.url:
|
|
||||||
continue
|
|
||||||
payload.append([entry.title, entry.url, entry.description, entry.cover])
|
|
||||||
_session_cache_set(CATALOG_SEARCH_CACHE_KEY, payload, ttl_seconds=CATALOG_SEARCH_TTL_SECONDS)
|
|
||||||
|
|
||||||
|
|
||||||
def search_series(query: str, *, progress_callback: ProgressCallback = None) -> list[SeriesResult]:
|
def search_series(query: str, *, progress_callback: ProgressCallback = None) -> list[SeriesResult]:
|
||||||
"""Sucht Serien. Katalog-Suche (vollstaendig) oder API-Suche (max 10) je nach Setting."""
|
"""Sucht Serien. Server-Suche (/suche?term=) zuerst, API als Fallback."""
|
||||||
_ensure_requests()
|
_ensure_requests()
|
||||||
if not _normalize_search_text(query):
|
if not _normalize_search_text(query):
|
||||||
return []
|
return []
|
||||||
|
|
||||||
use_catalog = _get_setting_bool(SETTING_CATALOG_SEARCH, default=True)
|
# 1. Server-Suche (schnell, vollstaendig, direkte HTML-Suche)
|
||||||
|
_emit_progress(progress_callback, "Suche", 20)
|
||||||
if use_catalog:
|
|
||||||
_emit_progress(progress_callback, "Pruefe Such-Cache", 15)
|
|
||||||
cached = _load_catalog_index_from_cache()
|
|
||||||
if cached is not None:
|
|
||||||
matched_from_cache = [entry for entry in cached if entry.title and _matches_query(query, title=entry.title)]
|
|
||||||
_emit_progress(progress_callback, f"Cache-Treffer: {len(cached)}", 35)
|
|
||||||
if matched_from_cache:
|
|
||||||
return matched_from_cache
|
|
||||||
|
|
||||||
_emit_progress(progress_callback, "Lade Katalogseite", 42)
|
|
||||||
catalog_url = f"{_get_base_url()}/serien?by=genre"
|
|
||||||
items: list[SeriesResult] = []
|
|
||||||
try:
|
|
||||||
soup = _get_soup_simple(catalog_url)
|
|
||||||
items = _catalog_index_from_soup(soup)
|
|
||||||
except Exception:
|
|
||||||
body = _get_html_simple(catalog_url)
|
|
||||||
items = _extract_catalog_index_from_html(body, progress_callback=progress_callback)
|
|
||||||
if not items:
|
|
||||||
_emit_progress(progress_callback, "Fallback-Parser", 58)
|
|
||||||
soup = BeautifulSoup(body, "html.parser")
|
|
||||||
items = _catalog_index_from_soup(soup)
|
|
||||||
if items:
|
|
||||||
_store_catalog_index_in_cache(items)
|
|
||||||
_emit_progress(progress_callback, f"Filtere Treffer ({len(items)})", 70)
|
|
||||||
return [entry for entry in items if entry.title and _matches_query(query, title=entry.title)]
|
|
||||||
|
|
||||||
# API-Suche (primaer wenn Katalog deaktiviert, Fallback wenn Katalog leer)
|
|
||||||
_emit_progress(progress_callback, "API-Suche", 60)
|
|
||||||
api_results = _search_series_api(query)
|
|
||||||
if api_results:
|
|
||||||
_emit_progress(progress_callback, f"API-Treffer: {len(api_results)}", 80)
|
|
||||||
return api_results
|
|
||||||
|
|
||||||
_emit_progress(progress_callback, "Server-Suche", 85)
|
|
||||||
server_results = _search_series_server(query)
|
server_results = _search_series_server(query)
|
||||||
if server_results:
|
if server_results:
|
||||||
_emit_progress(progress_callback, f"Server-Treffer: {len(server_results)}", 95)
|
return server_results
|
||||||
return [entry for entry in server_results if entry.title and _matches_query(query, title=entry.title)]
|
|
||||||
return []
|
# 2. API-Suche (Fallback, max 10 Ergebnisse)
|
||||||
|
_emit_progress(progress_callback, "API-Suche", 60)
|
||||||
|
return _search_series_api(query)
|
||||||
|
|
||||||
|
|
||||||
def parse_series_catalog(soup: BeautifulSoupT) -> dict[str, list[SeriesResult]]:
|
def parse_series_catalog(soup: BeautifulSoupT) -> dict[str, list[SeriesResult]]:
|
||||||
@@ -1252,7 +1120,7 @@ class SerienstreamPlugin(BasisPlugin):
|
|||||||
except Exception:
|
except Exception:
|
||||||
continue
|
continue
|
||||||
url = str(item.get("url") or "").strip()
|
url = str(item.get("url") or "").strip()
|
||||||
if number <= 0 or not url:
|
if number < 0 or not url:
|
||||||
continue
|
continue
|
||||||
seasons.append(SeasonInfo(number=number, url=url, episodes=[]))
|
seasons.append(SeasonInfo(number=number, url=url, episodes=[]))
|
||||||
if not seasons:
|
if not seasons:
|
||||||
@@ -1794,6 +1662,8 @@ class SerienstreamPlugin(BasisPlugin):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _season_label(number: int) -> str:
|
def _season_label(number: int) -> str:
|
||||||
|
if number == 0:
|
||||||
|
return "Filme"
|
||||||
return f"Staffel {number}"
|
return f"Staffel {number}"
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
@@ -1808,6 +1678,8 @@ class SerienstreamPlugin(BasisPlugin):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _parse_season_number(label: str) -> int | None:
|
def _parse_season_number(label: str) -> int | None:
|
||||||
|
if (label or "").strip().casefold() == "filme":
|
||||||
|
return 0
|
||||||
digits = "".join(ch for ch in label if ch.isdigit())
|
digits = "".join(ch for ch in label if ch.isdigit())
|
||||||
if not digits:
|
if not digits:
|
||||||
return None
|
return None
|
||||||
|
|||||||
@@ -2,8 +2,7 @@
|
|||||||
<settings>
|
<settings>
|
||||||
<category label="Quellen">
|
<category label="Quellen">
|
||||||
<setting id="serienstream_base_url" type="text" label="SerienStream Basis-URL" default="https://s.to" />
|
<setting id="serienstream_base_url" type="text" label="SerienStream Basis-URL" default="https://s.to" />
|
||||||
<setting id="serienstream_catalog_search" type="bool" label="SerienStream: Katalog-Suche (mehr Ergebnisse, langsamer)" default="true" />
|
<setting id="aniworld_base_url" type="text" label="AniWorld Basis-URL" default="https://aniworld.to" />
|
||||||
<setting id="aniworld_base_url" type="text" label="AniWorld Basis-URL" default="https://aniworld.to" />
|
|
||||||
<setting id="topstream_base_url" type="text" label="TopStream Basis-URL" default="https://topstreamfilm.live" />
|
<setting id="topstream_base_url" type="text" label="TopStream Basis-URL" default="https://topstreamfilm.live" />
|
||||||
<setting id="einschalten_base_url" type="text" label="Einschalten Basis-URL" default="https://einschalten.in" />
|
<setting id="einschalten_base_url" type="text" label="Einschalten Basis-URL" default="https://einschalten.in" />
|
||||||
<setting id="filmpalast_base_url" type="text" label="Filmpalast Basis-URL" default="https://filmpalast.to" />
|
<setting id="filmpalast_base_url" type="text" label="Filmpalast Basis-URL" default="https://filmpalast.to" />
|
||||||
@@ -87,40 +86,40 @@
|
|||||||
</category>
|
</category>
|
||||||
|
|
||||||
<category label="Debug Global">
|
<category label="Debug Global">
|
||||||
<setting id="debug_log_urls" type="bool" label="URLs mitschreiben (global)" default="false" />
|
<setting id="debug_log_urls" type="bool" label="URLs mitschreiben (global)" default="false" level="3" />
|
||||||
<setting id="debug_dump_html" type="bool" label="HTML speichern (global)" default="false" />
|
<setting id="debug_dump_html" type="bool" label="HTML speichern (global)" default="false" level="3" />
|
||||||
<setting id="debug_show_url_info" type="bool" label="Aktuelle URL anzeigen (global)" default="false" />
|
<setting id="debug_show_url_info" type="bool" label="Aktuelle URL anzeigen (global)" default="false" level="3" />
|
||||||
<setting id="debug_log_errors" type="bool" label="Fehler mitschreiben (global)" default="false" />
|
<setting id="debug_log_errors" type="bool" label="Fehler mitschreiben (global)" default="false" level="3" />
|
||||||
<setting id="log_max_mb" type="number" label="URL-Log: maximale Dateigroesse (MB)" default="5" />
|
<setting id="log_max_mb" type="number" label="URL-Log: maximale Dateigroesse (MB)" default="5" level="3" />
|
||||||
<setting id="log_max_files" type="number" label="URL-Log: Anzahl alter Dateien" default="3" />
|
<setting id="log_max_files" type="number" label="URL-Log: Anzahl alter Dateien" default="3" level="3" />
|
||||||
<setting id="dump_max_files" type="number" label="HTML: maximale Dateien pro Plugin" default="200" />
|
<setting id="dump_max_files" type="number" label="HTML: maximale Dateien pro Plugin" default="200" level="3" />
|
||||||
</category>
|
</category>
|
||||||
|
|
||||||
<category label="Debug Quellen">
|
<category label="Debug Quellen">
|
||||||
<setting id="log_urls_serienstream" type="bool" label="SerienStream: URLs mitschreiben" default="false" />
|
<setting id="log_urls_serienstream" type="bool" label="SerienStream: URLs mitschreiben" default="false" level="3" />
|
||||||
<setting id="dump_html_serienstream" type="bool" label="SerienStream: HTML speichern" default="false" />
|
<setting id="dump_html_serienstream" type="bool" label="SerienStream: HTML speichern" default="false" level="3" />
|
||||||
<setting id="show_url_info_serienstream" type="bool" label="SerienStream: Aktuelle URL anzeigen" default="false" />
|
<setting id="show_url_info_serienstream" type="bool" label="SerienStream: Aktuelle URL anzeigen" default="false" level="3" />
|
||||||
<setting id="log_errors_serienstream" type="bool" label="SerienStream: Fehler mitschreiben" default="false" />
|
<setting id="log_errors_serienstream" type="bool" label="SerienStream: Fehler mitschreiben" default="false" level="3" />
|
||||||
|
|
||||||
<setting id="log_urls_aniworld" type="bool" label="AniWorld: URLs mitschreiben" default="false" />
|
<setting id="log_urls_aniworld" type="bool" label="AniWorld: URLs mitschreiben" default="false" level="3" />
|
||||||
<setting id="dump_html_aniworld" type="bool" label="AniWorld: HTML speichern" default="false" />
|
<setting id="dump_html_aniworld" type="bool" label="AniWorld: HTML speichern" default="false" level="3" />
|
||||||
<setting id="show_url_info_aniworld" type="bool" label="AniWorld: Aktuelle URL anzeigen" default="false" />
|
<setting id="show_url_info_aniworld" type="bool" label="AniWorld: Aktuelle URL anzeigen" default="false" level="3" />
|
||||||
<setting id="log_errors_aniworld" type="bool" label="AniWorld: Fehler mitschreiben" default="false" />
|
<setting id="log_errors_aniworld" type="bool" label="AniWorld: Fehler mitschreiben" default="false" level="3" />
|
||||||
|
|
||||||
<setting id="log_urls_topstreamfilm" type="bool" label="TopStream: URLs mitschreiben" default="false" />
|
<setting id="log_urls_topstreamfilm" type="bool" label="TopStream: URLs mitschreiben" default="false" level="3" />
|
||||||
<setting id="dump_html_topstreamfilm" type="bool" label="TopStream: HTML speichern" default="false" />
|
<setting id="dump_html_topstreamfilm" type="bool" label="TopStream: HTML speichern" default="false" level="3" />
|
||||||
<setting id="show_url_info_topstreamfilm" type="bool" label="TopStream: Aktuelle URL anzeigen" default="false" />
|
<setting id="show_url_info_topstreamfilm" type="bool" label="TopStream: Aktuelle URL anzeigen" default="false" level="3" />
|
||||||
<setting id="log_errors_topstreamfilm" type="bool" label="TopStream: Fehler mitschreiben" default="false" />
|
<setting id="log_errors_topstreamfilm" type="bool" label="TopStream: Fehler mitschreiben" default="false" level="3" />
|
||||||
|
|
||||||
<setting id="log_urls_einschalten" type="bool" label="Einschalten: URLs mitschreiben" default="false" />
|
<setting id="log_urls_einschalten" type="bool" label="Einschalten: URLs mitschreiben" default="false" level="3" />
|
||||||
<setting id="dump_html_einschalten" type="bool" label="Einschalten: HTML speichern" default="false" />
|
<setting id="dump_html_einschalten" type="bool" label="Einschalten: HTML speichern" default="false" level="3" />
|
||||||
<setting id="show_url_info_einschalten" type="bool" label="Einschalten: Aktuelle URL anzeigen" default="false" />
|
<setting id="show_url_info_einschalten" type="bool" label="Einschalten: Aktuelle URL anzeigen" default="false" level="3" />
|
||||||
<setting id="log_errors_einschalten" type="bool" label="Einschalten: Fehler mitschreiben" default="false" />
|
<setting id="log_errors_einschalten" type="bool" label="Einschalten: Fehler mitschreiben" default="false" level="3" />
|
||||||
|
|
||||||
<setting id="log_urls_filmpalast" type="bool" label="Filmpalast: URLs mitschreiben" default="false" />
|
<setting id="log_urls_filmpalast" type="bool" label="Filmpalast: URLs mitschreiben" default="false" level="3" />
|
||||||
<setting id="dump_html_filmpalast" type="bool" label="Filmpalast: HTML speichern" default="false" />
|
<setting id="dump_html_filmpalast" type="bool" label="Filmpalast: HTML speichern" default="false" level="3" />
|
||||||
<setting id="show_url_info_filmpalast" type="bool" label="Filmpalast: Aktuelle URL anzeigen" default="false" />
|
<setting id="show_url_info_filmpalast" type="bool" label="Filmpalast: Aktuelle URL anzeigen" default="false" level="3" />
|
||||||
<setting id="log_errors_filmpalast" type="bool" label="Filmpalast: Fehler mitschreiben" default="false" />
|
<setting id="log_errors_filmpalast" type="bool" label="Filmpalast: Fehler mitschreiben" default="false" level="3" />
|
||||||
</category>
|
</category>
|
||||||
<category label="YouTube">
|
<category label="YouTube">
|
||||||
<setting id="youtube_quality" type="enum" label="YouTube Videoqualitaet" default="0" values="Beste|1080p|720p|480p|360p" />
|
<setting id="youtube_quality" type="enum" label="YouTube Videoqualitaet" default="0" values="Beste|1080p|720p|480p|360p" />
|
||||||
|
|||||||
Reference in New Issue
Block a user