Compare commits

..

9 Commits

11 changed files with 1780 additions and 482 deletions

View File

@@ -1,3 +1,39 @@
## 0.1.84.5-dev - 2026-03-31
- dev: bump to 0.1.84.0-dev SerienStream Sammlungen mit Poster/Plot, Session-Cache für Sammlungs-URLs
## 0.1.84.0-dev - 2026-03-16
- dev: bump to 0.1.83.5-dev Trakt Weiterschauen via watched/shows, Specials überspringen
## 0.1.83.5-dev - 2026-03-15
- dev: SerienStream Suche via /suche?term=, Staffel 0 als Filme, Katalog-Suche entfernt
## 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
- dev: HDFilme Plot in Rubrik Neuste anzeigen
## 0.1.81.5-dev - 2026-03-14
- dev: YouTube HD via inputstream.adaptive, DokuStreams Suche fix
## 0.1.81.0-dev - 2026-03-14
- dev: YouTube Fixes, Trakt Credentials fest, Upcoming Ansicht, Watchlist Kontextmenue
## 0.1.80.5-dev - 2026-03-13
- dev: YouTube: yt-dlp ZIP-Installation von GitHub, kein yesno-Dialog
## 0.1.80.0-dev - 2026-03-13
- dev: YouTube-Plugin: yt-dlp Suche, Bug-Fix Any-Import

View File

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

View File

@@ -370,6 +370,40 @@ class TraktClient:
return []
return self._parse_history_items(payload)
def get_watched_shows(self, token: str) -> list[TraktItem]:
"""GET /users/me/watched/shows alle Serien mit zuletzt gesehener Episode."""
status, payload = self._get("/users/me/watched/shows", token=token)
if status != 200 or not isinstance(payload, list):
self._do_log(f"get_watched_shows: status={status}")
return []
result: list[TraktItem] = []
for entry in payload:
if not isinstance(entry, dict):
continue
show = entry.get("show") or {}
ids = self._parse_ids((show.get("ids") or {}))
title = str(show.get("title", "") or "")
year = int(show.get("year", 0) or 0)
seasons = entry.get("seasons") or []
last_season = 0
last_episode = 0
for s in seasons:
snum = int((s.get("number") or 0))
if snum == 0: # Specials überspringen
continue
for ep in (s.get("episodes") or []):
enum = int((ep.get("number") or 0))
if snum > last_season or (snum == last_season and enum > last_episode):
last_season = snum
last_episode = enum
if title:
result.append(TraktItem(
title=title, year=year, media_type="episode",
ids=ids, season=last_season, episode=last_episode,
))
self._do_log(f"get_watched_shows: {len(result)} Serien")
return result
# -------------------------------------------------------------------
# Calendar
# -------------------------------------------------------------------

View File

@@ -205,6 +205,19 @@ def _set_trakt_ids_property(title: str, tmdb_id: int, imdb_id: str = "") -> None
# Trakt-Helfer
# ---------------------------------------------------------------------------
_PREFERRED_HOSTERS_LIST = ["voe", "streamtape", "doodstream", "vidoza", "mixdrop", "supervideo", "dropload"]
def _get_preferred_hoster() -> str:
"""Liest preferred_hoster (enum-Index) und gibt den Hosternamen zurück."""
raw = _get_setting_string("preferred_hoster").strip()
try:
idx = int(raw)
return _PREFERRED_HOSTERS_LIST[idx]
except (ValueError, IndexError):
return raw # Fallback: alten Textwert direkt verwenden
def _trakt_load_token():
"""Laedt den gespeicherten Trakt-Token aus den Addon-Settings."""
access = _get_setting_string("trakt_access_token").strip()
@@ -225,16 +238,17 @@ def _trakt_save_token(token) -> None:
addon.setSetting("trakt_access_token", token.access_token)
addon.setSetting("trakt_refresh_token", token.refresh_token)
addon.setSetting("trakt_token_expires", str(token.expires_at))
addon.setSetting("trakt_status", "Verbunden" if token.access_token else "Nicht verbunden")
TRAKT_CLIENT_ID = "5f1a46be11faa2ef286d6a5d4fbdcdfe3b19c87d3799c11af8cf25dae5b802e9"
TRAKT_CLIENT_SECRET = "7b694c47c13565197c3549c7467e92999f36fb2d118f7c185736ec960af22405"
def _trakt_get_client():
"""Erstellt einen TraktClient falls client_id und client_secret konfiguriert sind."""
client_id = _get_setting_string("trakt_client_id").strip()
client_secret = _get_setting_string("trakt_client_secret").strip()
if not client_id or not client_secret:
return None
"""Erstellt einen TraktClient mit den fest hinterlegten Credentials."""
from core.trakt import TraktClient
return TraktClient(client_id, client_secret, log=lambda m: _log(m, xbmc.LOGDEBUG))
return TraktClient(TRAKT_CLIENT_ID, TRAKT_CLIENT_SECRET, log=lambda m: _log(m, xbmc.LOGDEBUG))
def _trakt_get_valid_token() -> str:
@@ -1167,6 +1181,7 @@ def _add_directory_item(
info_labels: dict[str, str] | None = None,
art: dict[str, str] | None = None,
cast: list[TmdbCastMember] | None = None,
context_menu: list[tuple[str, str]] | None = None,
) -> None:
"""Fuegt einen Eintrag (Folder oder Playable) in die Kodi-Liste ein."""
query: dict[str, str] = {"action": action}
@@ -1187,6 +1202,11 @@ def _add_directory_item(
setter(art)
except Exception:
pass
if context_menu:
try:
item.addContextMenuItems(context_menu)
except Exception:
pass
xbmcplugin.addDirectoryItem(handle=handle, url=url, listitem=item, isFolder=is_folder)
@@ -1536,6 +1556,13 @@ def _sync_update_channel_status_settings() -> None:
_set_setting_string("update_active_channel", _channel_label(channel))
_set_setting_string("update_active_repo_url", selected_info_url)
_set_setting_string("update_available_selected", available_selected)
installed = _get_setting_string("update_installed_version").strip()
has_update = (
bool(available_selected) and available_selected not in ("-", "", "0.0.0")
and bool(installed) and installed not in ("-", "", "0.0.0")
and _version_sort_key(available_selected) > _version_sort_key(installed)
)
_get_addon().setSettingBool("update_available_flag", has_update)
def _repo_addon_xml_path() -> str:
@@ -1805,7 +1832,7 @@ def _show_root_menu() -> None:
# Update-Hinweis ganz oben wenn neuere Version verfügbar
installed = _get_setting_string("update_installed_version").strip()
available = _get_setting_string("update_available_selected").strip()
if installed and available and available not in ("-", "", "0.0.0") and installed != available:
if installed and available and available not in ("-", "", "0.0.0") and _version_sort_key(available) > _version_sort_key(installed):
_add_directory_item(
handle,
f"Update verfuegbar: {installed} -> {available}",
@@ -1932,6 +1959,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(
@@ -2087,8 +2116,17 @@ def _run_async(coro):
"""Fuehrt eine Coroutine aus, auch wenn Kodi bereits einen Event-Loop hat."""
_ensure_windows_selector_policy()
def _run_with_asyncio_run():
return asyncio.run(coro)
def _run_without_asyncio_run():
# asyncio.run() wuerde cancel_all_tasks() aufrufen, was auf Android TV
# wegen eines kaputten _weakrefset.py-Builds zu NameError: 'len' fuehrt.
loop = asyncio.new_event_loop()
try:
return loop.run_until_complete(coro)
finally:
try:
loop.close()
except Exception:
pass
try:
running_loop = asyncio.get_running_loop()
@@ -2101,7 +2139,7 @@ def _run_async(coro):
def _worker() -> None:
try:
result_box["value"] = _run_with_asyncio_run()
result_box["value"] = _run_without_asyncio_run()
except BaseException as exc: # pragma: no cover - defensive
error_box["error"] = exc
@@ -2112,7 +2150,7 @@ def _run_async(coro):
raise error_box["error"]
return result_box.get("value")
return _run_with_asyncio_run()
return _run_without_asyncio_run()
def _series_url_params(plugin: BasisPlugin, title: str) -> dict[str, str]:
@@ -2202,6 +2240,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()
@@ -3959,6 +3999,190 @@ def _resolve_stream_with_retry(plugin: BasisPlugin, link: str) -> str | None:
return final_link
def _is_inputstream_adaptive_available() -> bool:
"""Prueft ob inputstream.adaptive in Kodi installiert ist."""
try:
import xbmcaddon # type: ignore
xbmcaddon.Addon("inputstream.adaptive")
return True
except Exception:
return False
# ---------------------------------------------------------------------------
# Lokaler MPD-Manifest-Server fuer inputstream.adaptive
# ---------------------------------------------------------------------------
_mpd_server_instance = None
_mpd_server_port = 0
def _ensure_mpd_server() -> int:
"""Startet einen lokalen HTTP-Server der MPD-Manifeste serviert.
Gibt den Port zurueck. Der Server laeuft in einem Daemon-Thread.
"""
global _mpd_server_instance, _mpd_server_port
if _mpd_server_instance is not None:
return _mpd_server_port
import http.server
import socketserver
import threading
_pending_manifests: dict[str, str] = {}
class _ManifestHandler(http.server.BaseHTTPRequestHandler):
def do_GET(self) -> None:
if "/manifest" in self.path:
key = self.path.split("key=")[-1].split("&")[0] if "key=" in self.path else ""
content = _pending_manifests.pop(key, "")
if content:
data = content.encode("utf-8")
self.send_response(200)
self.send_header("Content-Type", "application/dash+xml")
self.send_header("Content-Length", str(len(data)))
self.end_headers()
self.wfile.write(data)
return
self.send_error(404)
def log_message(self, *_args: object) -> None:
pass # kein Logging
server = socketserver.TCPServer(("127.0.0.1", 0), _ManifestHandler)
_mpd_server_port = server.server_address[1]
_mpd_server_instance = server
# pending_manifests als Attribut am Server speichern
server._pending_manifests = _pending_manifests # type: ignore[attr-defined]
t = threading.Thread(target=server.serve_forever, daemon=True)
t.start()
_log(f"MPD-Server gestartet auf Port {_mpd_server_port}", xbmc.LOGDEBUG)
return _mpd_server_port
def _register_mpd_manifest(mpd_xml: str) -> str:
"""Registriert ein MPD-Manifest und gibt die lokale URL zurueck."""
import hashlib
port = _ensure_mpd_server()
key = hashlib.md5(mpd_xml.encode()).hexdigest()[:12]
if _mpd_server_instance is not None:
_mpd_server_instance._pending_manifests[key] = mpd_xml # type: ignore[attr-defined]
return f"http://127.0.0.1:{port}/plugin.video.viewit/manifest?key={key}"
def _play_dual_stream(
video_url: str,
audio_url: str,
*,
meta: dict[str, str] | None = None,
display_title: str | None = None,
info_labels: dict[str, str] | None = None,
art: dict[str, str] | None = None,
cast: list[TmdbCastMember] | None = None,
resolve_handle: int | None = None,
trakt_media: dict[str, object] | None = None,
) -> None:
"""Spielt getrennte Video+Audio-Streams via inputstream.adaptive.
Startet einen lokalen HTTP-Server der ein generiertes MPD-Manifest
serviert (gem. inputstream.adaptive Wiki: Integration + Custom Manifest).
Fallback auf Video-only wenn inputstream.adaptive nicht installiert.
"""
if not _is_inputstream_adaptive_available():
_log("inputstream.adaptive nicht verfuegbar Video-only Wiedergabe", xbmc.LOGWARNING)
_play_final_link(
video_url, display_title=display_title, info_labels=info_labels,
art=art, cast=cast, resolve_handle=resolve_handle, trakt_media=trakt_media,
)
return
from xml.sax.saxutils import escape as xml_escape
m = meta or {}
vcodec = m.get("vc", "avc1.640028")
acodec = m.get("ac", "mp4a.40.2")
w = m.get("w", "1920")
h = m.get("h", "1080")
fps = m.get("fps", "25")
vbr = m.get("vbr", "5000000")
abr = m.get("abr", "128000")
asr = m.get("asr", "44100")
ach = m.get("ach", "2")
dur = m.get("dur", "0")
dur_attr = ""
if dur and dur != "0":
dur_attr = f' mediaPresentationDuration="PT{dur}S"'
mpd_xml = (
'<?xml version="1.0" encoding="UTF-8"?>'
'<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" type="static"'
' minBufferTime="PT2S"'
' profiles="urn:mpeg:dash:profile:isoff-on-demand:2011"'
+ dur_attr + '>'
'<Period>'
'<AdaptationSet mimeType="video/mp4" contentType="video" subsegmentAlignment="true">'
'<Representation id="video" bandwidth="' + vbr + '"'
' codecs="' + xml_escape(vcodec) + '"'
' width="' + w + '" height="' + h + '"'
' frameRate="' + fps + '">'
'<BaseURL>' + xml_escape(video_url) + '</BaseURL>'
'</Representation>'
'</AdaptationSet>'
'<AdaptationSet mimeType="audio/mp4" contentType="audio" subsegmentAlignment="true">'
'<Representation id="audio" bandwidth="' + abr + '"'
' codecs="' + xml_escape(acodec) + '"'
' audioSamplingRate="' + asr + '">'
'<AudioChannelConfiguration'
' schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011"'
' value="' + ach + '"/>'
'<BaseURL>' + xml_escape(audio_url) + '</BaseURL>'
'</Representation>'
'</AdaptationSet>'
'</Period>'
'</MPD>'
)
mpd_url = _register_mpd_manifest(mpd_xml)
_log(f"MPD-Manifest URL: {mpd_url}", xbmc.LOGDEBUG)
list_item = xbmcgui.ListItem(label=display_title or "", path=mpd_url)
list_item.setMimeType("application/dash+xml")
list_item.setContentLookup(False)
list_item.setProperty("inputstream", "inputstream.adaptive")
list_item.setProperty("inputstream.adaptive.manifest_type", "mpd")
merged_info: dict[str, object] = dict(info_labels or {})
if display_title:
merged_info["title"] = display_title
_apply_video_info(list_item, merged_info, cast)
if art:
setter = getattr(list_item, "setArt", None)
if callable(setter):
try:
setter(art)
except Exception:
pass
resolved = False
if resolve_handle is not None:
resolver = getattr(xbmcplugin, "setResolvedUrl", None)
if callable(resolver):
try:
resolver(resolve_handle, True, list_item)
resolved = True
except Exception:
pass
if not resolved:
xbmc.Player().play(item=mpd_url, listitem=list_item)
if trakt_media and _get_setting_bool("trakt_enabled", default=False):
_trakt_scrobble_start_async(trakt_media)
_trakt_monitor_playback(trakt_media)
def _play_final_link(
link: str,
*,
@@ -3969,6 +4193,25 @@ def _play_final_link(
resolve_handle: int | None = None,
trakt_media: dict[str, object] | None = None,
) -> None:
# Getrennte Video+Audio-Streams (yt-dlp): via inputstream.adaptive abspielen
audio_url = None
meta: dict[str, str] = {}
try:
from ytdlp_helper import split_video_audio
link, audio_url, meta = split_video_audio(link)
except Exception:
pass
if audio_url:
_play_dual_stream(
link, audio_url,
meta=meta,
display_title=display_title, info_labels=info_labels,
art=art, cast=cast, resolve_handle=resolve_handle,
trakt_media=trakt_media,
)
return
list_item = xbmcgui.ListItem(label=display_title or "", path=link)
try:
list_item.setProperty("IsPlayable", "true")
@@ -4015,21 +4258,27 @@ def _trakt_scrobble_start_async(media: dict[str, object]) -> None:
from core.trakt import TraktClient
except Exception:
return
client_id = _get_setting_string("trakt_client_id").strip()
client_secret = _get_setting_string("trakt_client_secret").strip()
access_token = _get_setting_string("trakt_access_token").strip()
if not client_id or not client_secret or not access_token:
if not access_token:
return
client = TraktClient(client_id, client_secret, log=lambda m: _log(m, xbmc.LOGDEBUG))
client = TraktClient(TRAKT_CLIENT_ID, TRAKT_CLIENT_SECRET, log=lambda m: _log(m, xbmc.LOGDEBUG))
media_type = str(media.get("kind", "movie"))
tmdb_id = int(media.get("tmdb_id", 0))
imdb_id = str(media.get("imdb_id", ""))
client.scrobble_start(
access_token,
media_type=str(media.get("kind", "movie")),
media_type=media_type,
title=str(media.get("title", "")),
tmdb_id=int(media.get("tmdb_id", 0)),
imdb_id=str(media.get("imdb_id", "")),
tmdb_id=tmdb_id,
imdb_id=imdb_id,
season=int(media.get("season", 0)),
episode=int(media.get("episode", 0)),
)
if _get_setting_bool("trakt_auto_watchlist", default=False) and (tmdb_id or imdb_id):
try:
client.add_to_watchlist(access_token, media_type=media_type, tmdb_id=tmdb_id, imdb_id=imdb_id)
except Exception:
pass
threading.Thread(target=_do, daemon=True).start()
@@ -4040,12 +4289,10 @@ def _trakt_scrobble_stop_async(media: dict[str, object], progress: float = 100.0
from core.trakt import TraktClient
except Exception:
return
client_id = _get_setting_string("trakt_client_id").strip()
client_secret = _get_setting_string("trakt_client_secret").strip()
access_token = _get_setting_string("trakt_access_token").strip()
if not client_id or not client_secret or not access_token:
if not access_token:
return
client = TraktClient(client_id, client_secret, log=lambda m: _log(m, xbmc.LOGDEBUG))
client = TraktClient(TRAKT_CLIENT_ID, TRAKT_CLIENT_SECRET, log=lambda m: _log(m, xbmc.LOGDEBUG))
client.scrobble_stop(
access_token,
media_type=str(media.get("kind", "movie")),
@@ -4162,7 +4409,7 @@ def _play_episode(
selected_hoster: str | None = None
forced_hoster = (forced_hoster or "").strip()
autoplay = _get_setting_bool("autoplay_enabled", default=False)
preferred = _get_setting_string("preferred_hoster").strip()
preferred = _get_preferred_hoster()
if available_hosters:
if forced_hoster:
for hoster in available_hosters:
@@ -4197,13 +4444,15 @@ def _play_episode(
preferred_setter([selected_hoster])
try:
link = plugin.stream_link_for(title, season, episode)
with _busy_dialog("Stream wird gesucht..."):
link = plugin.stream_link_for(title, season, episode)
if not link:
_log("Kein Stream gefunden.", xbmc.LOGWARNING)
xbmcgui.Dialog().notification("Wiedergabe", "Kein Stream gefunden.", xbmcgui.NOTIFICATION_INFO, 3000)
return
_log(f"Stream-Link: {link}", xbmc.LOGDEBUG)
final_link = _resolve_stream_with_retry(plugin, link)
with _busy_dialog("Stream wird aufgelöst..."):
final_link = _resolve_stream_with_retry(plugin, link)
if not final_link:
return
finally:
@@ -4279,7 +4528,7 @@ def _play_episode_url(
selected_hoster: str | None = None
autoplay = _get_setting_bool("autoplay_enabled", default=False)
preferred = _get_setting_string("preferred_hoster").strip()
preferred = _get_preferred_hoster()
if available_hosters:
if autoplay and preferred:
pref_lower = preferred.casefold()
@@ -4488,28 +4737,34 @@ def _show_country_titles_page(plugin_name: str, country: str, page: int = 1) ->
xbmcplugin.endOfDirectory(handle)
def _show_collections_menu(plugin_name: str) -> None:
"""Zeigt Sammlungen/Filmreihen eines Plugins (Capability: collections)."""
def _show_collections_menu(plugin_name: str, page: int = 1) -> None:
"""Zeigt Sammlungen/Filmreihen eines Plugins (Capability: collections) - paginiert."""
handle = _get_handle()
plugin = _discover_plugins().get(plugin_name)
if plugin is None:
xbmcgui.Dialog().notification("Sammlungen", "Quelle nicht gefunden.", xbmcgui.NOTIFICATION_INFO, 3000)
xbmcplugin.endOfDirectory(handle)
return
getter = getattr(plugin, "collections", None)
if not callable(getter):
page_getter = getattr(plugin, "_collections_page", None)
if not callable(page_getter):
xbmcplugin.endOfDirectory(handle)
return
xbmcplugin.setPluginCategory(handle, f"{plugin_name}: Sammlungen")
xbmcplugin.setPluginCategory(handle, f"{plugin_name}: Sammlungen (Seite {page})")
try:
cols = list(getter() or [])
cols = list(page_getter(page) or [])
except Exception as exc:
_log(f"Sammlungen konnten nicht geladen werden ({plugin_name}): {exc}", xbmc.LOGWARNING)
_log(f"Sammlungen (Seite {page}) konnten nicht geladen werden ({plugin_name}): {exc}", xbmc.LOGWARNING)
xbmcplugin.endOfDirectory(handle)
return
if page > 1:
_add_directory_item(handle, "Vorherige Seite", "collections_menu",
{"plugin": plugin_name, "page": str(page - 1)}, is_folder=True)
for col in cols:
_add_directory_item(handle, str(col), "collection_titles_page",
{"plugin": plugin_name, "collection": str(col), "page": "1"}, is_folder=True)
if cols:
_add_directory_item(handle, "Naechste Seite", "collections_menu",
{"plugin": plugin_name, "page": str(page + 1)}, is_folder=True)
xbmcplugin.endOfDirectory(handle)
@@ -4537,15 +4792,36 @@ def _show_collection_titles_page(plugin_name: str, collection: str, page: int =
xbmcplugin.endOfDirectory(handle)
return
titles = [str(t).strip() for t in titles if t and str(t).strip()]
direct_play = bool(plugin_name.casefold() == "einschalten"
and _get_setting_bool("einschalten_enable_playback", default=False))
for title in titles:
_add_directory_item(handle, title, "play_movie" if direct_play else "seasons",
{"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
is_folder=not direct_play)
if titles:
_add_directory_item(handle, "Naechste Seite", "collection_titles_page",
{"plugin": plugin_name, "collection": collection, "page": str(page + 1)}, is_folder=True)
use_source, show_tmdb, prefer_source = _metadata_policy(
plugin_name, plugin, allow_tmdb=_tmdb_list_enabled()
)
plugin_meta = _collect_plugin_metadata(plugin, 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(titles) if show_tmdb else []
if show_tmdb and prefer_source and use_source:
tmdb_titles = [
t for t in 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"{collection} wird geladen..."):
tmdb_prefetched = _tmdb_labels_and_art_bulk(tmdb_titles)
for title in titles:
tmdb_info, tmdb_art, tmdb_cast = tmdb_prefetched.get(title, ({}, {}, [])) if show_tmdb else ({}, {}, [])
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", "tvshow")
_add_directory_item(handle, title, "seasons",
{"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
is_folder=True, info_labels=info_labels, art=art, cast=cast)
if getattr(plugin, "_collection_has_more", False):
_add_directory_item(handle, "Naechste Seite", "collection_titles_page",
{"plugin": plugin_name, "collection": collection, "page": str(page + 1)}, is_folder=True)
xbmcplugin.endOfDirectory(handle)
@@ -4598,11 +4874,33 @@ def _show_tag_titles_page(plugin_name: str, tag: str, page: int = 1) -> None:
xbmcplugin.endOfDirectory(handle)
return
titles = [str(t).strip() for t in titles if t and str(t).strip()]
for title in titles:
_add_directory_item(handle, title, "seasons",
{"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
is_folder=True)
if titles:
use_source, show_tmdb, prefer_source = _metadata_policy(
plugin_name, plugin, allow_tmdb=_tmdb_list_enabled()
)
plugin_meta = _collect_plugin_metadata(plugin, 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(titles) if show_tmdb else []
if show_tmdb and prefer_source and use_source:
tmdb_titles = [
t for t in 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("Schlagwort-Liste wird geladen..."):
tmdb_prefetched = _tmdb_labels_and_art_bulk(tmdb_titles)
for title in titles:
tmdb_info, tmdb_art, tmdb_cast = tmdb_prefetched.get(title, ({}, {}, [])) if show_tmdb else ({}, {}, [])
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", "tvshow")
_add_directory_item(handle, title, "seasons",
{"plugin": plugin_name, "title": title, **_series_url_params(plugin, title)},
is_folder=True, info_labels=info_labels, art=art, cast=cast)
_add_directory_item(handle, "Naechste Seite", "tag_titles_page",
{"plugin": plugin_name, "tag": tag, "page": str(page + 1)}, is_folder=True)
xbmcplugin.endOfDirectory(handle)
@@ -4652,13 +4950,11 @@ def _trakt_authorize() -> None:
time.sleep(code.interval)
from core.trakt import TraktClient
# Einzelversuch (kein internes Polling wir steuern die Schleife selbst)
client_id = _get_setting_string("trakt_client_id").strip()
client_secret = _get_setting_string("trakt_client_secret").strip()
tmp_client = TraktClient(client_id, client_secret, log=lambda m: _log(m, xbmc.LOGDEBUG))
tmp_client = TraktClient(TRAKT_CLIENT_ID, TRAKT_CLIENT_SECRET, log=lambda m: _log(m, xbmc.LOGDEBUG))
status, payload = tmp_client._post("/oauth/device/token", {
"code": code.device_code,
"client_id": client_id,
"client_secret": client_secret,
"client_id": TRAKT_CLIENT_ID,
"client_secret": TRAKT_CLIENT_SECRET,
})
if status == 200 and isinstance(payload, dict):
from core.trakt import TraktToken
@@ -4699,10 +4995,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
@@ -4710,19 +5007,10 @@ 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)
xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
def _show_trakt_history(page: int = 1) -> None:
@@ -4738,6 +5026,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
@@ -4758,7 +5047,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)
@@ -4775,31 +5064,23 @@ def _show_trakt_history(page: int = 1) -> None:
info_labels["plot"] = item.episode_overview
info_labels["mediatype"] = "episode" if is_episode else "tvshow"
# Kontextmenue: Zur Watchlist hinzufuegen
ctx: list[tuple[str, str]] = []
if item.ids and (item.ids.tmdb or item.ids.imdb):
wl_type = "movie" if item.media_type == "movie" else "tv"
wl_params = urlencode({"action": "trakt_watchlist_add", "type": wl_type,
"tmdb_id": str(item.ids.tmdb), "imdb_id": item.ids.imdb})
ctx.append(("Zur Trakt-Watchlist hinzufuegen",
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)
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)
else:
_add_directory_item(handle, label, "search", {"query": item.title}, 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, 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)
if not items and page == 1:
xbmcgui.Dialog().notification("Trakt", "Keine History vorhanden.", xbmcgui.NOTIFICATION_INFO, 3000)
xbmcplugin.endOfDirectory(handle)
xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
def _show_trakt_upcoming() -> None:
@@ -4813,7 +5094,7 @@ def _show_trakt_upcoming() -> None:
return
xbmcplugin.setPluginCategory(handle, "Trakt: Upcoming")
_set_content(handle, "episodes")
_set_content(handle, "tvshows")
try:
from core.trakt import TraktCalendarItem as _TCI # noqa: F401
@@ -4829,20 +5110,54 @@ def _show_trakt_upcoming() -> None:
xbmcplugin.endOfDirectory(handle)
return
from datetime import datetime, date as _date
_WEEKDAYS = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"]
today = _date.today()
# Datum pro Item berechnen und nach Datum gruppieren
dated_items: list[tuple[_date, object]] = []
for item in items:
# Datum aufbereiten: ISO -> lesbares Datum
airdate = ""
airdate = today
if item.first_aired:
try:
from datetime import datetime, timezone
dt = datetime.fromisoformat(item.first_aired.replace("Z", "+00:00"))
airdate = dt.astimezone(tz=None).strftime("%d.%m.%Y")
airdate = dt.astimezone(tz=None).date()
except Exception:
airdate = item.first_aired[:10]
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
if airdate != last_date:
last_date = airdate
delta = (airdate - today).days
if delta == 0:
heading = "Heute"
elif delta == 1:
heading = "Morgen"
elif 2 <= delta <= 6:
heading = _WEEKDAYS[airdate.weekday()]
else:
heading = f"{_WEEKDAYS[airdate.weekday()]} {airdate.strftime('%d.%m.')}"
sep = xbmcgui.ListItem(label=f"[B]{heading}[/B]")
sep.setProperty("IsPlayable", "false")
try:
_apply_video_info(sep, {"title": heading, "mediatype": "video"}, None)
except Exception:
pass
xbmcplugin.addDirectoryItem(handle=handle, url="", listitem=sep, isFolder=False)
# Episoden-Label mit Titel
ep_title = item.episode_title or ""
label = f"{item.show_title} \u2013 S{item.season:02d}E{item.episode:02d}"
if airdate:
label = f"{label} ({airdate})"
if ep_title:
label = f"{label}: {ep_title}"
info_labels: dict[str, object] = {
"title": label,
@@ -4855,35 +5170,28 @@ def _show_trakt_upcoming() -> None:
info_labels["year"] = item.show_year
if item.episode_overview:
info_labels["plot"] = item.episode_overview
if ep_title:
info_labels["tagline"] = ep_title
# Artwork: Trakt-Bilder als Basis, TMDB ergänzt fehlende Keys
# Artwork: Trakt-Bilder als Basis, TMDB ergaenzt fehlende Keys
art: dict[str, str] = {}
if item.episode_thumb:
art["thumb"] = item.episode_thumb
if item.show_fanart:
art["fanart"] = item.show_fanart
if item.show_poster:
art["thumb"] = item.show_poster
art["poster"] = item.show_poster
_, tmdb_art, _ = _tmdb_labels_and_art(item.show_title)
if item.episode_thumb:
art["fanart"] = item.episode_thumb
elif item.show_fanart:
art["fanart"] = item.show_fanart
_, 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)
xbmcplugin.endOfDirectory(handle)
xbmcplugin.endOfDirectory(handle, cacheToDisc=False)
def _show_trakt_continue_watching() -> None:
@@ -4900,65 +5208,32 @@ def _show_trakt_continue_watching() -> None:
_set_content(handle, "episodes")
try:
history = client.get_history(token, media_type="episodes", limit=100)
watched = client.get_watched_shows(token)
except Exception as exc:
_log(f"Trakt History fehlgeschlagen: {exc}", xbmc.LOGWARNING)
xbmcgui.Dialog().notification("Trakt", "History konnte nicht geladen werden.", xbmcgui.NOTIFICATION_INFO, 3000)
_log(f"Trakt Watched fehlgeschlagen: {exc}", xbmc.LOGWARNING)
xbmcgui.Dialog().notification("Trakt", "Watched-Liste konnte nicht geladen werden.", xbmcgui.NOTIFICATION_INFO, 3000)
xbmcplugin.endOfDirectory(handle)
return
# Pro Serie nur den zuletzt gesehenen Eintrag behalten (History ist absteigend sortiert)
seen: dict[str, object] = {}
for item in history:
if item.title and item.title not in seen:
seen[item.title] = item
seen: dict[str, object] = {item.title: item for item in watched if item.title}
if not seen:
xbmcgui.Dialog().notification("Trakt", "Keine History vorhanden.", xbmcgui.NOTIFICATION_INFO, 3000)
xbmcgui.Dialog().notification("Trakt", "Keine gesehenen Serien vorhanden.", xbmcgui.NOTIFICATION_INFO, 3000)
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,
@@ -4968,16 +5243,10 @@ def _show_trakt_continue_watching() -> None:
if 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, cacheToDisc=False)
# ---------------------------------------------------------------------------
@@ -5197,7 +5466,10 @@ def _route_country_titles_page(params: dict[str, str]) -> None:
@_router.route("collections_menu")
def _route_collections_menu(params: dict[str, str]) -> None:
_show_collections_menu(params.get("plugin", ""))
_show_collections_menu(
params.get("plugin", ""),
_parse_positive_int(params.get("page", "1"), default=1),
)
@_router.route("collection_titles_page")
@@ -5299,12 +5571,19 @@ def _route_fallback(params: dict[str, str]) -> None:
_show_root_menu()
def _sync_trakt_status_setting() -> None:
"""Setzt trakt_status anhand des gespeicherten Tokens."""
connected = bool(_trakt_load_token())
_get_addon().setSetting("trakt_status", "Verbunden" if connected else "Nicht verbunden")
def run() -> None:
params = _parse_params()
action = params.get("action")
_log(f"Action: {action}", xbmc.LOGDEBUG)
_maybe_run_auto_update_check(action)
_maybe_auto_install_resolveurl(action)
_sync_trakt_status_setting()
_router.dispatch(action=action, params=params)

View File

@@ -286,7 +286,7 @@ class DokuStreamsPlugin(BasisPlugin):
soup = _get_soup(search_url, session=session)
except Exception:
return []
return _parse_listing_hits(soup, query=query)
return _parse_listing_hits(soup)
def capabilities(self) -> set[str]:
return {"genres", "popular_series", "tags", "random"}
@@ -455,15 +455,24 @@ class DokuStreamsPlugin(BasisPlugin):
art = {"thumb": poster, "poster": poster}
return info, art, None
def series_url_for_title(self, title: str) -> Optional[str]:
return self._title_to_url.get((title or "").strip())
def remember_series_url(self, title: str, url: str) -> None:
title = (title or "").strip()
url = (url or "").strip()
if title and url:
self._title_to_url[title] = url
def seasons_for(self, title: str) -> List[str]:
title = (title or "").strip()
if not title or title not in self._title_to_url:
if not title:
return []
return ["Stream"]
def episodes_for(self, title: str, season: str) -> List[str]:
title = (title or "").strip()
if not title or title not in self._title_to_url:
if not title:
return []
return [title]
@@ -537,6 +546,14 @@ class DokuStreamsPlugin(BasisPlugin):
"""Folgt Redirects und versucht ResolveURL fuer Hoster-Links."""
if not link:
return None
# YouTube-URLs via yt-dlp aufloesen
from ytdlp_helper import extract_youtube_id, resolve_youtube_url
yt_id = extract_youtube_id(link)
if yt_id:
resolved = resolve_youtube_url(yt_id)
if resolved:
return resolved
return None
from plugin_helpers import resolve_via_resolveurl
resolved = resolve_via_resolveurl(link, fallback_to_link=False)
if resolved:

View File

@@ -388,7 +388,7 @@ class HdfilmePlugin(BasisPlugin):
info: dict[str, str] = {"title": title}
art: dict[str, str] = {}
# Cache-Hit
# Cache-Hit nur zurückgeben wenn Plot vorhanden (sonst Detailseite laden)
cached = self._title_meta.get(title)
if cached:
plot, poster = cached
@@ -396,7 +396,7 @@ class HdfilmePlugin(BasisPlugin):
info["plot"] = plot
if poster:
art["thumb"] = art["poster"] = poster
if info or art:
if plot:
return info, art, None
# Detailseite laden

View File

@@ -57,7 +57,6 @@ else: # pragma: no cover
SETTING_BASE_URL = "serienstream_base_url"
SETTING_CATALOG_SEARCH = "serienstream_catalog_search"
DEFAULT_BASE_URL = "https://s.to"
DEFAULT_PREFERRED_HOSTERS = ["voe"]
DEFAULT_TIMEOUT = 20
@@ -80,10 +79,7 @@ HEADERS = {
SESSION_CACHE_TTL_SECONDS = 300
SESSION_CACHE_PREFIX = "viewit.serienstream"
SESSION_CACHE_MAX_TITLE_URLS = 800
CATALOG_SEARCH_TTL_SECONDS = 600
CATALOG_SEARCH_CACHE_KEY = "catalog_index"
GENRE_LIST_PAGE_SIZE = 20
_CATALOG_INDEX_MEMORY: tuple[float, list["SeriesResult"]] = (0.0, [])
ProgressCallback = Optional[Callable[[str, int | None], Any]]
@@ -509,6 +505,14 @@ def _strip_tags(value: str) -> str:
return re.sub(r"<[^>]+>", " ", value or "")
def _clean_collection_title(title: str) -> str:
cleaned = "".join(
ch for ch in title
if unicodedata.category(ch) not in ("So", "Sm", "Sk", "Sc", "Cs", "Co", "Cn")
)
return re.sub(r"\s+", " ", cleaned).strip()
def _search_series_api(query: str) -> list[SeriesResult]:
query = (query or "").strip()
if not query:
@@ -575,8 +579,8 @@ def _search_series_server(query: str) -> list[SeriesResult]:
if not query:
return []
base = _get_base_url()
search_url = f"{base}/search?q={quote(query)}"
alt_url = f"{base}/suche?q={quote(query)}"
search_url = f"{base}/suche?term={quote(query)}"
alt_url = f"{base}/search?term={quote(query)}"
for url in (search_url, alt_url):
try:
body = _get_html_simple(url)
@@ -606,158 +610,30 @@ def _search_series_server(query: str) -> list[SeriesResult]:
continue
seen_urls.add(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:
return results
api_results = _search_series_api(query)
if api_results:
return api_results
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]:
"""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()
if not _normalize_search_text(query):
return []
use_catalog = _get_setting_bool(SETTING_CATALOG_SEARCH, default=True)
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)
# 1. Server-Suche (schnell, vollstaendig, direkte HTML-Suche)
_emit_progress(progress_callback, "Suche", 20)
server_results = _search_series_server(query)
if server_results:
_emit_progress(progress_callback, f"Server-Treffer: {len(server_results)}", 95)
return [entry for entry in server_results if entry.title and _matches_query(query, title=entry.title)]
return []
return server_results
# 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]]:
@@ -1159,6 +1035,8 @@ class SerienstreamPlugin(BasisPlugin):
self._latest_hoster_cache: dict[str, list[str]] = {}
self._series_metadata_cache: dict[str, tuple[dict[str, str], dict[str, str]]] = {}
self._series_metadata_full: set[str] = set()
self._collection_url_cache: dict[str, str] = {}
self._collection_has_more: bool = False
self.is_available = True
self.unavailable_reason: str | None = None
if not self._requests_available: # pragma: no cover - optional dependency
@@ -1252,7 +1130,7 @@ class SerienstreamPlugin(BasisPlugin):
except Exception:
continue
url = str(item.get("url") or "").strip()
if number <= 0 or not url:
if number < 0 or not url:
continue
seasons.append(SeasonInfo(number=number, url=url, episodes=[]))
if not seasons:
@@ -1383,7 +1261,63 @@ class SerienstreamPlugin(BasisPlugin):
def capabilities(self) -> set[str]:
"""Meldet unterstützte Features für Router-Menüs."""
return {"popular_series", "genres", "latest_episodes", "alpha"}
return {"popular_series", "genres", "latest_episodes", "alpha", "collections"}
def collections(self) -> list[str]:
"""Liefert Sammlungs-Namen von /sammlungen (Seite 1, für Paginierung)."""
return self._collections_page(1)
def _collections_page(self, page: int = 1) -> list[str]:
"""Liefert eine Seite mit Sammlungs-Namen von /sammlungen (paginiert)."""
if not self._requests_available:
return []
base = _get_base_url()
names: list[str] = []
url_map: dict[str, str] = {}
url = f"{base}/sammlungen" if page == 1 else f"{base}/sammlungen?page={page}"
soup = _get_soup_simple(url)
for a in soup.select('a[href*="/sammlung/"]'):
h2 = a.find("h2")
if not h2:
continue
title = _clean_collection_title(h2.get_text(strip=True))
href = (a.get("href") or "").strip()
if title and href:
url_map[title] = _absolute_url(href)
names.append(title)
if url_map:
existing = _session_cache_get("collection_urls")
if isinstance(existing, dict):
existing.update(url_map)
_session_cache_set("collection_urls", existing)
else:
_session_cache_set("collection_urls", url_map)
names.sort(key=lambda t: t.casefold())
return names
def titles_for_collection(self, collection: str, page: int = 1) -> list[str]:
"""Liefert Serien-Titel einer Sammlung (paginiert)."""
if not self._requests_available:
return []
url_map = _session_cache_get("collection_urls")
if isinstance(url_map, dict):
self._collection_url_cache.update(url_map)
url = self._collection_url_cache.get(collection)
if not url:
return []
if page > 1:
url = f"{url}?page={page}"
base_url = self._collection_url_cache[collection]
soup = _get_soup_simple(url)
titles: list[str] = []
for a in soup.select('h6 a[href*="/serie/"]'):
title = a.get_text(strip=True)
href = (a.get("href") or "").strip()
if title and href:
self._remember_series_result(title, _absolute_url(href), "")
titles.append(title)
self._collection_has_more = bool(soup.select(f'a[href*="?page={page + 1}"]'))
return titles
def popular_series(self) -> list[str]:
"""Liefert die Titel der beliebten Serien (Quelle: `/beliebte-serien`)."""
@@ -1794,6 +1728,8 @@ class SerienstreamPlugin(BasisPlugin):
@staticmethod
def _season_label(number: int) -> str:
if number == 0:
return "Filme"
return f"Staffel {number}"
@staticmethod
@@ -1808,6 +1744,8 @@ class SerienstreamPlugin(BasisPlugin):
@staticmethod
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())
if not digits:
return None

View File

@@ -18,7 +18,14 @@ except ImportError:
requests = None # type: ignore
from plugin_interface import BasisPlugin
from plugin_helpers import log_error
try:
import xbmc # type: ignore
def _log(msg: str) -> None:
xbmc.log(f"[ViewIt][YouTube] {msg}", xbmc.LOGWARNING)
except ImportError:
def _log(msg: str) -> None:
pass
# ---------------------------------------------------------------------------
# Konstanten
@@ -121,13 +128,15 @@ def _videos_from_search_data(data: dict) -> List[str]:
if title and video_id:
results.append(_encode(title, video_id))
except Exception as exc:
log_error(f"[YouTube] _videos_from_search_data Fehler: {exc}")
_log(f"[YouTube] _videos_from_search_data Fehler: {exc}")
return results
def _search_with_ytdlp(query: str, count: int = 20) -> List[str]:
"""Sucht YouTube-Videos via yt-dlp ytsearch-Extraktor."""
if not ensure_ytdlp_in_path():
return []
try:
from yt_dlp import YoutubeDL # type: ignore
except ImportError:
@@ -144,7 +153,7 @@ def _search_with_ytdlp(query: str, count: int = 20) -> List[str]:
if e.get("id") and e.get("title")
]
except Exception as exc:
log_error(f"[YouTube] yt-dlp Suche Fehler: {exc}")
_log(f"[YouTube] yt-dlp Suche Fehler: {exc}")
return []
@@ -161,50 +170,11 @@ def _fetch_search_videos(url: str) -> List[str]:
return []
return _videos_from_search_data(data)
except Exception as exc:
log_error(f"[YouTube] _fetch_search_videos ({url}): {exc}")
_log(f"[YouTube] _fetch_search_videos ({url}): {exc}")
return []
def _resolve_with_ytdlp(video_id: str) -> Optional[str]:
"""Loest Video-ID via yt-dlp zu direkter Stream-URL auf."""
try:
from yt_dlp import YoutubeDL # type: ignore
except ImportError:
log_error("[YouTube] yt-dlp nicht verfuegbar (script.module.yt-dlp fehlt)")
try:
import xbmcgui
xbmcgui.Dialog().notification(
"yt-dlp fehlt",
"Bitte yt-dlp in den ViewIT-Einstellungen installieren.",
xbmcgui.NOTIFICATION_ERROR,
5000,
)
except Exception:
pass
return None
url = f"https://www.youtube.com/watch?v={video_id}"
ydl_opts: Dict[str, Any] = {
"format": "best[ext=mp4]/best",
"quiet": True,
"no_warnings": True,
"extract_flat": False,
}
try:
with YoutubeDL(ydl_opts) as ydl:
info = ydl.extract_info(url, download=False)
if not info:
return None
# Einzelnes Video
direct = info.get("url")
if direct:
return direct
# Formatauswahl
formats = info.get("formats", [])
if formats:
return formats[-1].get("url")
except Exception as exc:
log_error(f"[YouTube] yt-dlp Fehler fuer {video_id}: {exc}")
return None
from ytdlp_helper import ensure_ytdlp_in_path, resolve_youtube_url
# ---------------------------------------------------------------------------
@@ -214,8 +184,7 @@ def _resolve_with_ytdlp(video_id: str) -> Optional[str]:
class YoutubePlugin(BasisPlugin):
name = "YouTube"
# Pseudo-Staffeln: nur Suche Browse-Endpunkte erfordern Login
_SEASONS = ["Suche"]
_SEASONS = ["Stream"]
def capabilities(self) -> Set[str]:
return set()
@@ -241,8 +210,7 @@ class YoutubePlugin(BasisPlugin):
return list(self._SEASONS)
def episodes_for(self, title: str, season: str) -> List[str]:
if season == "Suche":
# Titel ist bereits ein kodierter Eintrag aus der Suche
if season == "Stream":
return [title]
return []
@@ -250,7 +218,7 @@ class YoutubePlugin(BasisPlugin):
video_id = _decode_id(episode) or _decode_id(title)
if not video_id:
return None
return _resolve_with_ytdlp(video_id)
return resolve_youtube_url(video_id)
def resolve_stream_link(self, link: str) -> Optional[str]:
return link # bereits direkte URL

View File

@@ -1,131 +1,861 @@
<?xml version="1.0" encoding="UTF-8"?>
<settings>
<category label="Quellen">
<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="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="filmpalast_base_url" type="text" label="Filmpalast Basis-URL" default="https://filmpalast.to" />
<setting id="doku_streams_base_url" type="text" label="Doku-Streams Basis-URL" default="https://doku-streams.com" />
</category>
<settings version="1">
<section id="plugin.video.viewit">
<category label="Metadaten">
<setting id="serienstream_metadata_source" type="enum" label="SerienStream Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
<setting id="aniworld_metadata_source" type="enum" label="AniWorld Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
<setting id="topstreamfilm_metadata_source" type="enum" label="TopStream Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
<setting id="einschalten_metadata_source" type="enum" label="Einschalten Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
<setting id="filmpalast_metadata_source" type="enum" label="Filmpalast Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
<setting id="doku_streams_metadata_source" type="enum" label="Doku-Streams Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
<setting id="kkiste_metadata_source" type="enum" label="KKiste Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
<setting id="moflix_metadata_source" type="enum" label="Moflix Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
<setting id="tmdb_enabled" type="bool" label="TMDB aktivieren" default="true" />
<setting id="tmdb_language" type="text" label="TMDB Sprache (z. B. de-DE)" default="de-DE" />
<setting id="tmdb_show_plot" type="bool" label="TMDB Beschreibung anzeigen" default="true" />
<setting id="tmdb_show_art" type="bool" label="TMDB Poster und Vorschaubild anzeigen" default="true" />
<setting id="tmdb_show_fanart" type="bool" label="TMDB Fanart/Backdrop anzeigen" default="true" />
<setting id="tmdb_show_rating" type="bool" label="TMDB Bewertung anzeigen" default="true" />
<setting id="tmdb_show_votes" type="bool" label="TMDB Stimmen anzeigen" default="false" />
</category>
<!-- ═══════════════════════════════════════════ Wiedergabe -->
<category id="playback" label="Wiedergabe">
<group id="1">
<setting id="autoplay_enabled" type="boolean" label="Autoplay (bevorzugten Hoster automatisch waehlen)">
<level>0</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="preferred_hoster" type="integer" label="Bevorzugter Hoster">
<level>0</level>
<default>0</default>
<constraints>
<options>
<option label="voe">0</option>
<option label="streamtape">1</option>
<option label="doodstream">2</option>
<option label="vidoza">3</option>
<option label="mixdrop">4</option>
<option label="supervideo">5</option>
<option label="dropload">6</option>
</options>
</constraints>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="autoplay_enabled">true</condition>
</dependency>
</dependencies>
<control type="spinner" format="integer"/>
</setting>
</group>
</category>
<category label="TMDB Erweitert">
<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" />
<setting id="tmdb_genre_metadata" type="bool" label="TMDB Daten in Genre-Listen anzeigen" default="false" />
<setting id="tmdb_log_requests" type="bool" label="TMDB API-Anfragen loggen" default="false" />
<setting id="tmdb_log_responses" type="bool" label="TMDB API-Antworten loggen" default="false" />
</category>
<!-- ═══════════════════════════════════════════ Trakt -->
<category id="trakt" label="Trakt">
<group id="1">
<setting id="trakt_enabled" type="boolean" label="Trakt aktivieren">
<level>0</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="trakt_status" type="string" label="Status">
<level>0</level>
<default>Nicht verbunden</default>
<dependencies>
<dependency type="enable">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string">
<heading>Status</heading>
</control>
</setting>
<setting id="trakt_auth" type="action" label="Trakt autorisieren">
<level>0</level>
<data>RunPlugin(plugin://plugin.video.viewit/?action=trakt_auth)</data>
<control type="button" format="action"/>
</setting>
<setting id="trakt_scrobble" type="boolean" label="Scrobbling aktivieren">
<level>0</level>
<default>true</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="trakt_enabled">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
<setting id="trakt_auto_watchlist" type="boolean" label="Geschaute Serien automatisch zur Watchlist hinzufuegen">
<level>0</level>
<default>false</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="trakt_enabled">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
</group>
<group id="2">
<setting id="trakt_access_token" type="string" label="">
<level>0</level>
<default/>
<dependencies>
<dependency type="visible">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
<setting id="trakt_refresh_token" type="string" label="">
<level>0</level>
<default/>
<dependencies>
<dependency type="visible">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
<setting id="trakt_token_expires" type="string" label="">
<level>0</level>
<default>0</default>
<dependencies>
<dependency type="visible">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
</group>
</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>
<!-- ═══════════════════════════════════════════ Metadaten -->
<category id="metadata" label="Metadaten">
<group id="1">
<setting id="tmdb_enabled" type="boolean" label="TMDB aktivieren">
<level>0</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="tmdb_language" type="string" label="TMDB Sprache (z. B. de-DE)">
<level>0</level>
<default>de-DE</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="tmdb_enabled">true</condition>
</dependency>
</dependencies>
<control type="edit" format="string">
<heading>TMDB Sprache</heading>
</control>
</setting>
<setting id="tmdb_show_plot" type="boolean" label="Beschreibung anzeigen">
<level>0</level>
<default>true</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="tmdb_enabled">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
<setting id="tmdb_show_art" type="boolean" label="Poster und Vorschaubild anzeigen">
<level>0</level>
<default>true</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="tmdb_enabled">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
<setting id="tmdb_show_fanart" type="boolean" label="Fanart/Backdrop anzeigen">
<level>0</level>
<default>true</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="tmdb_enabled">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
<setting id="tmdb_show_rating" type="boolean" label="Bewertung anzeigen">
<level>0</level>
<default>true</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="tmdb_enabled">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
<setting id="tmdb_show_votes" type="boolean" label="Stimmen anzeigen">
<level>0</level>
<default>false</default>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="tmdb_enabled">true</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
</group>
<group id="2">
<setting id="serienstream_metadata_source" type="integer" label="SerienStream Metadatenquelle">
<level>2</level>
<default>0</default>
<constraints>
<options>
<option label="Automatisch">0</option>
<option label="Quelle">1</option>
<option label="TMDB">2</option>
<option label="Mischen">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="aniworld_metadata_source" type="integer" label="AniWorld Metadatenquelle">
<level>2</level>
<default>0</default>
<constraints>
<options>
<option label="Automatisch">0</option>
<option label="Quelle">1</option>
<option label="TMDB">2</option>
<option label="Mischen">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="topstreamfilm_metadata_source" type="integer" label="TopStream Metadatenquelle">
<level>2</level>
<default>0</default>
<constraints>
<options>
<option label="Automatisch">0</option>
<option label="Quelle">1</option>
<option label="TMDB">2</option>
<option label="Mischen">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="einschalten_metadata_source" type="integer" label="Einschalten Metadatenquelle">
<level>2</level>
<default>0</default>
<constraints>
<options>
<option label="Automatisch">0</option>
<option label="Quelle">1</option>
<option label="TMDB">2</option>
<option label="Mischen">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="filmpalast_metadata_source" type="integer" label="Filmpalast Metadatenquelle">
<level>2</level>
<default>0</default>
<constraints>
<options>
<option label="Automatisch">0</option>
<option label="Quelle">1</option>
<option label="TMDB">2</option>
<option label="Mischen">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="doku_streams_metadata_source" type="integer" label="Doku-Streams Metadatenquelle">
<level>2</level>
<default>0</default>
<constraints>
<options>
<option label="Automatisch">0</option>
<option label="Quelle">1</option>
<option label="TMDB">2</option>
<option label="Mischen">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="kkiste_metadata_source" type="integer" label="KKiste Metadatenquelle">
<level>2</level>
<default>0</default>
<constraints>
<options>
<option label="Automatisch">0</option>
<option label="Quelle">1</option>
<option label="TMDB">2</option>
<option label="Mischen">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="moflix_metadata_source" type="integer" label="Moflix Metadatenquelle">
<level>2</level>
<default>0</default>
<constraints>
<options>
<option label="Automatisch">0</option>
<option label="Quelle">1</option>
<option label="TMDB">2</option>
<option label="Mischen">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
</group>
</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" />
</category>
<!-- ═══════════════════════════════════════════ Anzeige -->
<category id="display" label="Anzeige">
<group id="1">
<setting id="filmpalast_max_page_items" type="integer" label="Filmpalast: Max. Eintraege pro Seite">
<level>2</level>
<default>15</default>
<constraints>
<minimum>5</minimum>
<step>5</step>
<maximum>100</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="topstreamfilm_max_page_items" type="integer" label="TopStream: Max. Eintraege pro Seite">
<level>2</level>
<default>15</default>
<constraints>
<minimum>5</minimum>
<step>5</step>
<maximum>100</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="aniworld_max_page_items" type="integer" label="AniWorld: Max. Eintraege pro Seite">
<level>2</level>
<default>15</default>
<constraints>
<minimum>5</minimum>
<step>5</step>
<maximum>100</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="netzkkino_max_page_items" type="integer" label="Netzkino: Max. Eintraege pro Seite">
<level>2</level>
<default>15</default>
<constraints>
<minimum>5</minimum>
<step>5</step>
<maximum>100</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="kkiste_max_page_items" type="integer" label="KKiste: Max. Eintraege pro Seite">
<level>2</level>
<default>15</default>
<constraints>
<minimum>5</minimum>
<step>5</step>
<maximum>100</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="hdfilme_max_page_items" type="integer" label="HDFilme: Max. Eintraege pro Seite">
<level>2</level>
<default>15</default>
<constraints>
<minimum>5</minimum>
<step>5</step>
<maximum>100</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="moflix_max_page_items" type="integer" label="Moflix: Max. Eintraege pro Seite">
<level>2</level>
<default>15</default>
<constraints>
<minimum>5</minimum>
<step>5</step>
<maximum>100</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="einschalten_max_page_items" type="integer" label="Einschalten: Max. Eintraege pro Seite">
<level>2</level>
<default>15</default>
<constraints>
<minimum>5</minimum>
<step>5</step>
<maximum>100</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
</group>
</category>
<category label="Updates">
<setting id="update_channel" type="enum" label="Update-Kanal" default="1" values="Main|Nightly|Custom|Dev" />
<setting id="apply_update_channel" type="action" label="Update-Kanal jetzt anwenden" action="RunPlugin(plugin://plugin.video.viewit/?action=apply_update_channel)" option="close" />
<setting id="auto_update_enabled" type="bool" label="Automatische Updates (beim Start pruefen)" default="false" />
<setting id="auto_update_interval" type="enum" label="Update-Pruefintervall" default="1" values="1 Stunde|6 Stunden|24 Stunden" />
<setting id="select_update_version" type="action" label="Version waehlen und installieren" action="RunPlugin(plugin://plugin.video.viewit/?action=select_update_version)" option="close" />
<setting id="install_resolveurl" type="action" label="ResolveURL installieren/reparieren" action="RunPlugin(plugin://plugin.video.viewit/?action=install_resolveurl)" option="close" />
<setting id="resolveurl_auto_install" type="bool" label="ResolveURL automatisch installieren (beim Start pruefen)" default="true" />
<setting id="update_installed_version" type="text" label="Installierte Version" default="-" enable="false" />
<setting id="update_available_selected" type="text" label="Verfuegbar (gewaehlter Kanal)" default="-" enable="false" />
<setting id="resolveurl_status" type="text" label="ResolveURL Status" default="-" enable="false" />
<setting id="update_active_channel" type="text" label="Aktiver Kanal" default="-" enable="false" />
<setting id="update_active_repo_url" type="text" label="Aktive Repo URL" default="-" enable="false" />
<setting id="update_repo_url_main" type="text" label="Main URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/main/addons.xml" />
<setting id="update_repo_url_nightly" type="text" label="Nightly URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/nightly/addons.xml" />
<setting id="update_repo_url_dev" type="text" label="Dev URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/dev/addons.xml" />
<setting id="update_repo_url" type="text" label="Custom URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/nightly/addons.xml" />
<setting id="auto_update_last_ts" type="text" label="Auto-Update letzte Pruefung (intern)" default="0" visible="false" />
<setting id="resolveurl_last_ts" type="text" label="ResolveURL letzte Pruefung (intern)" default="0" visible="false" />
</category>
<!-- ═══════════════════════════════════════════ Updates -->
<category id="updates" label="Updates">
<group id="1">
<setting id="update_available_flag" type="boolean" label="">
<level>0</level>
<default>false</default>
<dependencies>
<dependency type="visible">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="toggle"/>
</setting>
<setting id="update_installed_version" type="string" label="Installierte Version">
<level>0</level>
<default>-</default>
<dependencies>
<dependency type="enable">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
<setting id="update_available_selected" type="string" label="Neue Version verfuegbar">
<level>0</level>
<default>-</default>
<dependencies>
<dependency type="enable">
<condition on="property" name="InfoBool">false</condition>
</dependency>
<dependency type="visible">
<condition operator="is" setting="update_available_flag">true</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
<setting id="update_channel" type="integer" label="Update-Kanal">
<level>0</level>
<default>1</default>
<constraints>
<options>
<option label="Main">0</option>
<option label="Nightly">1</option>
<option label="Custom">2</option>
<option label="Dev">3</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="apply_update_channel" type="action" label="Update-Kanal jetzt anwenden">
<level>0</level>
<data>RunPlugin(plugin://plugin.video.viewit/?action=apply_update_channel)</data>
<control type="button" format="action"/>
</setting>
<setting id="auto_update_enabled" type="boolean" label="Automatische Updates (beim Start pruefen)">
<level>0</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="auto_update_interval" type="integer" label="Update-Pruefintervall">
<level>0</level>
<default>1</default>
<constraints>
<options>
<option label="1 Stunde">0</option>
<option label="6 Stunden">1</option>
<option label="24 Stunden">2</option>
</options>
</constraints>
<dependencies>
<dependency type="enable">
<condition operator="is" setting="auto_update_enabled">true</condition>
</dependency>
</dependencies>
<control type="spinner" format="integer"/>
</setting>
<setting id="select_update_version" type="action" label="Version waehlen und installieren">
<level>0</level>
<data>RunPlugin(plugin://plugin.video.viewit/?action=select_update_version)</data>
<control type="button" format="action"/>
</setting>
<setting id="install_resolveurl" type="action" label="ResolveURL installieren/reparieren">
<level>0</level>
<data>RunPlugin(plugin://plugin.video.viewit/?action=install_resolveurl)</data>
<control type="button" format="action"/>
</setting>
<setting id="resolveurl_auto_install" type="boolean" label="ResolveURL automatisch installieren (beim Start pruefen)">
<level>0</level>
<default>true</default>
<control type="toggle"/>
</setting>
<setting id="resolveurl_status" type="string" label="ResolveURL Status">
<level>2</level>
<default>-</default>
<dependencies>
<dependency type="enable">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
</group>
<group id="2">
<setting id="update_active_channel" type="string" label="Aktiver Kanal">
<level>3</level>
<default>-</default>
<dependencies>
<dependency type="enable">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
<setting id="update_active_repo_url" type="string" label="Aktive Repo URL">
<level>3</level>
<default>-</default>
<dependencies>
<dependency type="enable">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
<setting id="update_repo_url_main" type="string" label="Main URL (addons.xml)">
<level>3</level>
<default>https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/main/addons.xml</default>
<control type="edit" format="string">
<heading>Main URL</heading>
</control>
</setting>
<setting id="update_repo_url_nightly" type="string" label="Nightly URL (addons.xml)">
<level>3</level>
<default>https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/nightly/addons.xml</default>
<control type="edit" format="string">
<heading>Nightly URL</heading>
</control>
</setting>
<setting id="update_repo_url_dev" type="string" label="Dev URL (addons.xml)">
<level>3</level>
<default>https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/dev/addons.xml</default>
<control type="edit" format="string">
<heading>Dev URL</heading>
</control>
</setting>
<setting id="update_repo_url" type="string" label="Custom URL (addons.xml)">
<level>3</level>
<default>https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/nightly/addons.xml</default>
<control type="edit" format="string">
<heading>Custom URL</heading>
</control>
</setting>
<setting id="auto_update_last_ts" type="string" label="">
<level>0</level>
<default>0</default>
<dependencies>
<dependency type="visible">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
<setting id="resolveurl_last_ts" type="string" label="">
<level>0</level>
<default>0</default>
<dependencies>
<dependency type="visible">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
</group>
</category>
<category label="Trakt">
<setting id="trakt_enabled" type="bool" label="Trakt aktivieren" default="false" />
<setting id="trakt_client_id" type="text" label="Trakt Client ID" default="" />
<setting id="trakt_client_secret" type="text" label="Trakt Client Secret" default="" />
<setting id="trakt_auth" type="action" label="Trakt autorisieren" action="RunPlugin(plugin://plugin.video.viewit/?action=trakt_auth)" option="close" />
<setting id="trakt_scrobble" type="bool" label="Scrobbling aktivieren" default="true" />
<setting id="trakt_access_token" type="text" label="" default="" visible="false" />
<setting id="trakt_refresh_token" type="text" label="" default="" visible="false" />
<setting id="trakt_token_expires" type="text" label="" default="0" visible="false" />
</category>
<!-- ═══════════════════════════════════════════ YouTube -->
<category id="youtube" label="YouTube">
<group id="1">
<setting id="youtube_quality" type="integer" label="YouTube Videoqualitaet">
<level>0</level>
<default>0</default>
<constraints>
<options>
<option label="Beste">0</option>
<option label="1080p">1</option>
<option label="720p">2</option>
<option label="480p">3</option>
<option label="360p">4</option>
</options>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="install_ytdlp" type="action" label="yt-dlp installieren/reparieren">
<level>0</level>
<data>RunPlugin(plugin://plugin.video.viewit/?action=install_ytdlp)</data>
<control type="button" format="action"/>
</setting>
<setting id="ytdlp_status" type="string" label="yt-dlp Status">
<level>2</level>
<default>-</default>
<dependencies>
<dependency type="enable">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
</group>
</category>
<category label="Debug Global">
<setting id="debug_log_urls" type="bool" label="URLs mitschreiben (global)" default="false" />
<setting id="debug_dump_html" type="bool" label="HTML speichern (global)" default="false" />
<setting id="debug_show_url_info" type="bool" label="Aktuelle URL anzeigen (global)" default="false" />
<setting id="debug_log_errors" type="bool" label="Fehler mitschreiben (global)" default="false" />
<setting id="log_max_mb" type="number" label="URL-Log: maximale Dateigroesse (MB)" default="5" />
<setting id="log_max_files" type="number" label="URL-Log: Anzahl alter Dateien" default="3" />
<setting id="dump_max_files" type="number" label="HTML: maximale Dateien pro Plugin" default="200" />
</category>
<!-- ═══════════════════════════════════════════ Quellen -->
<category id="sources" label="Quellen">
<group id="1">
<setting id="serienstream_base_url" type="string" label="SerienStream Basis-URL">
<level>3</level>
<default>https://s.to</default>
<control type="edit" format="string">
<heading>SerienStream URL</heading>
</control>
</setting>
<setting id="aniworld_base_url" type="string" label="AniWorld Basis-URL">
<level>3</level>
<default>https://aniworld.to</default>
<control type="edit" format="string">
<heading>AniWorld URL</heading>
</control>
</setting>
<setting id="topstream_base_url" type="string" label="TopStream Basis-URL">
<level>3</level>
<default>https://topstreamfilm.live</default>
<control type="edit" format="string">
<heading>TopStream URL</heading>
</control>
</setting>
<setting id="einschalten_base_url" type="string" label="Einschalten Basis-URL">
<level>3</level>
<default>https://einschalten.in</default>
<control type="edit" format="string">
<heading>Einschalten URL</heading>
</control>
</setting>
<setting id="filmpalast_base_url" type="string" label="Filmpalast Basis-URL">
<level>3</level>
<default>https://filmpalast.to</default>
<control type="edit" format="string">
<heading>Filmpalast URL</heading>
</control>
</setting>
<setting id="doku_streams_base_url" type="string" label="Doku-Streams Basis-URL">
<level>3</level>
<default>https://doku-streams.com</default>
<control type="edit" format="string">
<heading>Doku-Streams URL</heading>
</control>
</setting>
</group>
</category>
<category label="Debug Quellen">
<setting id="log_urls_serienstream" type="bool" label="SerienStream: URLs mitschreiben" default="false" />
<setting id="dump_html_serienstream" type="bool" label="SerienStream: HTML speichern" default="false" />
<setting id="show_url_info_serienstream" type="bool" label="SerienStream: Aktuelle URL anzeigen" default="false" />
<setting id="log_errors_serienstream" type="bool" label="SerienStream: Fehler mitschreiben" default="false" />
<!-- ═══════════════════════════════════════════ TMDB Erweitert -->
<category id="tmdb_advanced" label="TMDB Erweitert">
<group id="1">
<setting id="tmdb_api_key" type="string" label="TMDB API Key (optional)">
<level>3</level>
<default/>
<constraints>
<allowempty>true</allowempty>
</constraints>
<control type="edit" format="string">
<heading>TMDB API Key</heading>
</control>
</setting>
<setting id="tmdb_api_key_active" type="string" label="Aktiver TMDB API Key">
<level>3</level>
<default/>
<dependencies>
<dependency type="enable">
<condition on="property" name="InfoBool">false</condition>
</dependency>
</dependencies>
<control type="edit" format="string"><heading/></control>
</setting>
<setting id="tmdb_prefetch_concurrency" type="integer" label="TMDB: gleichzeitige Anfragen (1-20)">
<level>3</level>
<default>6</default>
<constraints>
<minimum>1</minimum>
<step>1</step>
<maximum>20</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="tmdb_log_requests" type="boolean" label="TMDB API-Anfragen loggen">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="tmdb_log_responses" type="boolean" label="TMDB API-Antworten loggen">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
</group>
<group id="2">
<setting id="tmdb_show_cast" type="boolean" label="TMDB Besetzung anzeigen">
<level>2</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="tmdb_show_episode_cast" type="boolean" label="TMDB Besetzung pro Episode anzeigen">
<level>2</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="tmdb_genre_metadata" type="boolean" label="TMDB Daten in Genre-Listen anzeigen">
<level>2</level>
<default>false</default>
<control type="toggle"/>
</setting>
</group>
</category>
<setting id="log_urls_aniworld" type="bool" label="AniWorld: URLs mitschreiben" default="false" />
<setting id="dump_html_aniworld" type="bool" label="AniWorld: HTML speichern" default="false" />
<setting id="show_url_info_aniworld" type="bool" label="AniWorld: Aktuelle URL anzeigen" default="false" />
<setting id="log_errors_aniworld" type="bool" label="AniWorld: Fehler mitschreiben" default="false" />
<setting id="log_urls_topstreamfilm" type="bool" label="TopStream: URLs mitschreiben" default="false" />
<setting id="dump_html_topstreamfilm" type="bool" label="TopStream: HTML speichern" default="false" />
<setting id="show_url_info_topstreamfilm" type="bool" label="TopStream: Aktuelle URL anzeigen" default="false" />
<setting id="log_errors_topstreamfilm" type="bool" label="TopStream: Fehler mitschreiben" default="false" />
<setting id="log_urls_einschalten" type="bool" label="Einschalten: URLs mitschreiben" default="false" />
<setting id="dump_html_einschalten" type="bool" label="Einschalten: HTML speichern" default="false" />
<setting id="show_url_info_einschalten" type="bool" label="Einschalten: Aktuelle URL anzeigen" default="false" />
<setting id="log_errors_einschalten" type="bool" label="Einschalten: Fehler mitschreiben" default="false" />
<setting id="log_urls_filmpalast" type="bool" label="Filmpalast: URLs mitschreiben" default="false" />
<setting id="dump_html_filmpalast" type="bool" label="Filmpalast: HTML speichern" default="false" />
<setting id="show_url_info_filmpalast" type="bool" label="Filmpalast: Aktuelle URL anzeigen" default="false" />
<setting id="log_errors_filmpalast" type="bool" label="Filmpalast: Fehler mitschreiben" default="false" />
</category>
<category label="YouTube">
<setting id="install_ytdlp" type="action" label="yt-dlp installieren/reparieren" action="RunPlugin(plugin://plugin.video.viewit/?action=install_ytdlp)" option="close" />
<setting id="ytdlp_status" type="text" label="yt-dlp Status" default="-" enable="false" />
</category>
<!-- ═══════════════════════════════════════════ Debug -->
<category id="debug" label="Debug">
<group id="1">
<setting id="debug_log_urls" type="boolean" label="URLs mitschreiben (global)">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="debug_dump_html" type="boolean" label="HTML speichern (global)">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="debug_show_url_info" type="boolean" label="Aktuelle URL anzeigen (global)">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="debug_log_errors" type="boolean" label="Fehler mitschreiben (global)">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_max_mb" type="integer" label="URL-Log: maximale Dateigroesse (MB)">
<level>3</level>
<default>5</default>
<constraints>
<minimum>1</minimum>
<step>1</step>
<maximum>50</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="log_max_files" type="integer" label="URL-Log: Anzahl alter Dateien">
<level>3</level>
<default>3</default>
<constraints>
<minimum>1</minimum>
<step>1</step>
<maximum>20</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
<setting id="dump_max_files" type="integer" label="HTML: maximale Dateien pro Plugin">
<level>3</level>
<default>200</default>
<constraints>
<minimum>10</minimum>
<step>10</step>
<maximum>1000</maximum>
</constraints>
<control type="spinner" format="integer"/>
</setting>
</group>
<group id="2">
<setting id="log_urls_serienstream" type="boolean" label="SerienStream: URLs mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="dump_html_serienstream" type="boolean" label="SerienStream: HTML speichern">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="show_url_info_serienstream" type="boolean" label="SerienStream: Aktuelle URL anzeigen">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_errors_serienstream" type="boolean" label="SerienStream: Fehler mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_urls_aniworld" type="boolean" label="AniWorld: URLs mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="dump_html_aniworld" type="boolean" label="AniWorld: HTML speichern">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="show_url_info_aniworld" type="boolean" label="AniWorld: Aktuelle URL anzeigen">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_errors_aniworld" type="boolean" label="AniWorld: Fehler mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_urls_topstreamfilm" type="boolean" label="TopStream: URLs mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="dump_html_topstreamfilm" type="boolean" label="TopStream: HTML speichern">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="show_url_info_topstreamfilm" type="boolean" label="TopStream: Aktuelle URL anzeigen">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_errors_topstreamfilm" type="boolean" label="TopStream: Fehler mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_urls_einschalten" type="boolean" label="Einschalten: URLs mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="dump_html_einschalten" type="boolean" label="Einschalten: HTML speichern">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="show_url_info_einschalten" type="boolean" label="Einschalten: Aktuelle URL anzeigen">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_errors_einschalten" type="boolean" label="Einschalten: Fehler mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_urls_filmpalast" type="boolean" label="Filmpalast: URLs mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="dump_html_filmpalast" type="boolean" label="Filmpalast: HTML speichern">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="show_url_info_filmpalast" type="boolean" label="Filmpalast: Aktuelle URL anzeigen">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="log_errors_filmpalast" type="boolean" label="Filmpalast: Fehler mitschreiben">
<level>3</level>
<default>false</default>
<control type="toggle"/>
</setting>
</group>
</category>
</section>
</settings>

185
addon/ytdlp_helper.py Normal file
View File

@@ -0,0 +1,185 @@
"""Gemeinsame yt-dlp Hilfsfunktionen fuer YouTube-Wiedergabe.
Wird von youtube_plugin und dokustreams_plugin genutzt.
"""
from __future__ import annotations
import re
from typing import Any, Dict, Optional
try:
import xbmc # type: ignore
def _log(msg: str) -> None:
xbmc.log(f"[ViewIt][yt-dlp] {msg}", xbmc.LOGWARNING)
except ImportError:
def _log(msg: str) -> None:
pass
_YT_ID_RE = re.compile(
r"(?:youtube(?:-nocookie)?\.com/(?:embed/|v/|watch\?.*?v=)|youtu\.be/)"
r"([A-Za-z0-9_-]{11})"
)
def extract_youtube_id(url: str) -> Optional[str]:
"""Extrahiert eine YouTube Video-ID aus verschiedenen URL-Formaten."""
if not url:
return None
m = _YT_ID_RE.search(url)
return m.group(1) if m else None
def _fix_strptime() -> None:
"""Kodi-Workaround: datetime.strptime Race Condition vermeiden.
Kodi's eingebetteter Python kann in Multi-Thread-Umgebungen dazu fuehren
dass der lazy _strptime-Import fehlschlaegt. Wir importieren das Modul
direkt, damit es beim yt-dlp Aufruf bereits geladen ist.
"""
try:
import _strptime # noqa: F401 erzwingt den internen Import
except Exception:
pass
def ensure_ytdlp_in_path() -> bool:
"""Fuegt script.module.yt-dlp/lib zum sys.path hinzu falls noetig."""
_fix_strptime()
try:
import yt_dlp # type: ignore # noqa: F401
return True
except ImportError:
pass
try:
import sys, os
import xbmcvfs # type: ignore
lib_path = xbmcvfs.translatePath("special://home/addons/script.module.yt-dlp/lib")
if lib_path and os.path.isdir(lib_path) and lib_path not in sys.path:
sys.path.insert(0, lib_path)
import yt_dlp # type: ignore # noqa: F401
return True
except Exception:
pass
return False
def get_quality_format() -> str:
"""Liest YouTube-Qualitaet aus den Addon-Einstellungen."""
_QUALITY_MAP = {
"0": "bestvideo[ext=mp4][vcodec^=avc1]+bestaudio[ext=m4a]/bestvideo[ext=mp4]+bestaudio[ext=m4a]/best[ext=mp4]/best",
"1": "bestvideo[height<=1080][ext=mp4][vcodec^=avc1]+bestaudio[ext=m4a]/bestvideo[height<=1080][ext=mp4]+bestaudio[ext=m4a]/best[height<=1080][ext=mp4]/best",
"2": "bestvideo[height<=720][ext=mp4][vcodec^=avc1]+bestaudio[ext=m4a]/bestvideo[height<=720][ext=mp4]+bestaudio[ext=m4a]/best[height<=720][ext=mp4]/best",
"3": "bestvideo[height<=480][ext=mp4][vcodec^=avc1]+bestaudio[ext=m4a]/bestvideo[height<=480][ext=mp4]+bestaudio[ext=m4a]/best[height<=480][ext=mp4]/best",
"4": "bestvideo[height<=360][ext=mp4][vcodec^=avc1]+bestaudio[ext=m4a]/bestvideo[height<=360][ext=mp4]+bestaudio[ext=m4a]/best[height<=360][ext=mp4]/best",
}
try:
import xbmcaddon # type: ignore
val = xbmcaddon.Addon().getSetting("youtube_quality") or "0"
return _QUALITY_MAP.get(val, _QUALITY_MAP["0"])
except Exception:
return _QUALITY_MAP["0"]
_AUDIO_SEP = "||AUDIO||"
_META_SEP = "||META||"
def resolve_youtube_url(video_id: str) -> Optional[str]:
"""Loest eine YouTube Video-ID via yt-dlp zu einer direkten Stream-URL auf.
Bei getrennten Video+Audio-Streams wird der Rueckgabestring im Format
``video_url||AUDIO||audio_url||META||key=val,key=val,...`` kodiert.
Der Aufrufer kann mit ``split_video_audio()`` alle Teile trennen.
"""
if not ensure_ytdlp_in_path():
_log("yt-dlp nicht verfuegbar (script.module.yt-dlp fehlt)")
try:
import xbmcgui # type: ignore
xbmcgui.Dialog().notification(
"yt-dlp fehlt",
"Bitte yt-dlp in den ViewIT-Einstellungen installieren.",
xbmcgui.NOTIFICATION_ERROR,
5000,
)
except Exception:
pass
return None
try:
from yt_dlp import YoutubeDL # type: ignore
except ImportError:
return None
url = f"https://www.youtube.com/watch?v={video_id}"
fmt = get_quality_format()
ydl_opts: Dict[str, Any] = {
"format": fmt,
"quiet": True,
"no_warnings": True,
"extract_flat": False,
}
try:
with YoutubeDL(ydl_opts) as ydl:
info = ydl.extract_info(url, download=False)
if not info:
return None
duration = int(info.get("duration") or 0)
# Einzelne URL (kombinierter Stream)
direct = info.get("url")
if direct:
return direct
# Getrennte Video+Audio-Streams (hoehere Qualitaet)
rf = info.get("requested_formats")
if rf and len(rf) >= 2:
vf, af = rf[0], rf[1]
video_url = vf.get("url")
audio_url = af.get("url")
if video_url and audio_url:
vcodec = vf.get("vcodec") or "avc1.640028"
acodec = af.get("acodec") or "mp4a.40.2"
w = int(vf.get("width") or 1920)
h = int(vf.get("height") or 1080)
fps = int(vf.get("fps") or 25)
vbr = int((vf.get("tbr") or 5000) * 1000)
abr = int((af.get("tbr") or 128) * 1000)
asr = int(af.get("asr") or 44100)
ach = int(af.get("audio_channels") or 2)
meta = (
f"vc={vcodec},ac={acodec},"
f"w={w},h={h},fps={fps},"
f"vbr={vbr},abr={abr},"
f"asr={asr},ach={ach},dur={duration}"
)
_log(f"Getrennte Streams: {h}p {vcodec} + {acodec}")
return f"{video_url}{_AUDIO_SEP}{audio_url}{_META_SEP}{meta}"
if video_url:
return video_url
# Fallback: letztes Format
formats = info.get("formats", [])
if formats:
return formats[-1].get("url")
except Exception as exc:
_log(f"yt-dlp Fehler fuer {video_id}: {exc}")
return None
def split_video_audio(url: str) -> tuple:
"""Trennt eine URL in (video_url, audio_url, meta_dict).
Falls kein Audio-Teil vorhanden: (url, None, {}).
meta_dict enthaelt Keys: vc, ac, w, h, fps, vbr, abr, asr, ach, dur
"""
if _AUDIO_SEP not in url:
return url, None, {}
parts = url.split(_AUDIO_SEP, 1)
video_url = parts[0]
rest = parts[1]
meta: Dict[str, str] = {}
audio_url = rest
if _META_SEP in rest:
audio_url, meta_str = rest.split(_META_SEP, 1)
for pair in meta_str.split(","):
if "=" in pair:
k, v = pair.split("=", 1)
meta[k] = v
return video_url, audio_url, meta

111
docs/TRAKT.md Normal file
View File

@@ -0,0 +1,111 @@
Trakt in ViewIT Benutzeranleitung
Was ist Trakt?
Trakt (https://trakt.tv) ist ein kostenloser Dienst, der verfolgt welche Serien und Filme du schaust. Damit kannst du:
- Sehen, wo du bei einer Serie aufgehoert hast
- Neue Episoden deiner Serien im Blick behalten
- Deinen kompletten Schauverlauf geraeteuebergreifend synchronisieren
Einrichtung
1) Trakt-Konto erstellen
Falls du noch kein Konto hast, registriere dich kostenlos auf https://trakt.tv/auth/join
2) Trakt in ViewIT aktivieren
- Oeffne ViewIT in Kodi
- Gehe zu Einstellungen (Zahnrad-Symbol oder Kontextmenue)
- Wechsle zur Kategorie "Trakt"
- Setze "Trakt aktivieren" auf An
3) Trakt autorisieren
- Klicke auf "Trakt autorisieren"
- ViewIT zeigt dir einen Code und eine URL an
- Oeffne https://trakt.tv/activate in einem Browser (Handy oder PC)
- Melde dich an und gib den angezeigten Code ein
- Bestaetige die Autorisierung
- ViewIT erkennt die Freigabe automatisch fertig!
Die Autorisierung bleibt dauerhaft gespeichert. Du musst das nur einmal machen.
Einstellungen
- Trakt aktivieren: Schaltet alle Trakt-Funktionen ein oder aus
- Trakt autorisieren: Verbindet ViewIT mit deinem Trakt-Konto
- Scrobbling aktivieren: Sendet automatisch an Trakt, was du gerade schaust
- Geschaute Serien automatisch zur Watchlist hinzufuegen: Fuegt Serien/Filme beim Schauen automatisch zu deiner Trakt-Watchlist hinzu, damit sie bei "Upcoming" erscheinen
Menues im Hauptmenue
Wenn Trakt aktiviert und autorisiert ist, erscheinen im ViewIT-Hauptmenue folgende Eintraege:
Weiterschauen
Zeigt Serien, bei denen du mittendrin aufgehoert hast. Praktisch um schnell dort weiterzumachen, wo du zuletzt warst.
Trakt Upcoming
Zeigt neue Episoden der naechsten 14 Tage fuer alle Serien in deiner Trakt-Watchlist. Die Ansicht ist nach Datum gruppiert:
- Heute Episoden, die heute erscheinen
- Morgen Episoden von morgen
- Wochentag z.B. "Mittwoch", "Donnerstag"
- Wochentag + Datum ab naechster Woche, z.B. "Montag 24.03."
Jeder Eintrag zeigt Serienname, Staffel/Episode und Episodentitel, z.B.:
Game of Thrones S02E05: The Wolf and the Lion
Damit eine Serie hier erscheint, muss sie in deiner Trakt-Watchlist sein. Du kannst Serien auf drei Wegen hinzufuegen:
- Direkt auf trakt.tv
- Ueber das Kontextmenue in der Trakt History (siehe unten)
- Automatisch beim Schauen (Einstellung "Geschaute Serien automatisch zur Watchlist hinzufuegen")
Trakt Watchlist
Zeigt alle Titel in deiner Trakt-Watchlist, unterteilt in Filme und Serien.
Ein Klick auf einen Eintrag fuehrt zur Staffel-/Episodenauswahl in ViewIT.
Trakt History
Zeigt deine zuletzt geschauten Episoden und Filme (seitenweise, neueste zuerst). Jeder Eintrag zeigt Serienname mit Staffel, Episode, Episodentitel und Poster.
Kontextmenue (lange druecken oder Taste "C"):
- "Zur Trakt-Watchlist hinzufuegen" Fuegt die Serie/den Film zu deiner Watchlist hinzu, damit kuenftige Episoden bei "Upcoming" erscheinen
Scrobbling
Scrobbling bedeutet, dass ViewIT automatisch an Trakt meldet was du schaust:
- Du startest eine Episode oder einen Film in ViewIT
- ViewIT sendet "Start" an Trakt (die Episode erscheint als "Watching" in deinem Profil)
- Wenn die Wiedergabe endet, sendet ViewIT "Stop" mit dem Fortschritt
- Hat der Fortschritt mindestens 80% erreicht, markiert Trakt die Episode als gesehen
Das passiert vollautomatisch im Hintergrund du musst nichts tun.
Haeufige Fragen
Warum erscheint eine Serie nicht bei "Upcoming"?
Die Serie muss in deiner Trakt-Watchlist sein. Fuege sie ueber die Trakt History (Kontextmenue) oder direkt auf trakt.tv hinzu.
Warum wird eine Episode nicht als gesehen markiert?
Trakt markiert Episoden erst als gesehen, wenn mindestens ca. 80% geschaut wurden. Wenn du vorher abbrichst, wird sie nicht als gesehen gezaehlt.
Kann ich Trakt auf mehreren Geraeten nutzen?
Ja. Autorisiere ViewIT auf jedem Geraet und alle teilen denselben Schauverlauf ueber dein Trakt-Konto.
Muss ich online sein?
Ja, Trakt benoetigt eine Internetverbindung. Ohne Verbindung funktioniert die Wiedergabe weiterhin, aber Scrobbling und Trakt-Menues sind nicht verfuegbar.