Compare commits
43 Commits
v0.1.46
...
backup/mai
| Author | SHA1 | Date | |
|---|---|---|---|
| 699d2dca22 | |||
| bd0bf34ae5 | |||
| d9e338c9b6 | |||
| 9f2f9a6e7b | |||
| d5a1125e03 | |||
| d414fac022 | |||
| 1ee15cd104 | |||
| b56757f42a | |||
| 7a330c9bc0 | |||
| f8d180bcb5 | |||
| d71adcfac7 | |||
| 81750ad148 | |||
| 4409f9432c | |||
| 307df97d74 | |||
| 537f0e23e1 | |||
| ed1f59d3f2 | |||
| a37c45e2ef | |||
| 7f5924b850 | |||
| b370afe167 | |||
| 09d2fc850d | |||
| 6ce1bf71c1 | |||
| c7d848385f | |||
| 280a82f08b | |||
| 9aedbee083 | |||
| 4c3f90233d | |||
| 9e15212a66 | |||
| 951e99cb4c | |||
| 4f7b0eba0c | |||
| ae3cff7528 | |||
| db61bb67ba | |||
| 4521d9fb1d | |||
| ca362f80fe | |||
| 372d443cb2 | |||
| 1e3c6ffdf6 | |||
| 28da41123f | |||
| dbcd9598a9 | |||
| 09c6a32043 | |||
| 3689aedd23 | |||
| fe79cca818 | |||
| 4d74755e20 | |||
| 9df80240c4 | |||
| da83ed02be | |||
| cd2e8e2b15 |
14
.gitignore
vendored
14
.gitignore
vendored
@@ -6,3 +6,17 @@
|
||||
|
||||
# Build outputs
|
||||
/dist/
|
||||
|
||||
# Local tests (not committed)
|
||||
/tests/
|
||||
/TESTING/
|
||||
/.pytest_cache/
|
||||
/pytest.ini
|
||||
|
||||
# Python artifacts
|
||||
__pycache__/
|
||||
*.pyc
|
||||
.coverage
|
||||
|
||||
# Plugin runtime caches
|
||||
/addon/plugins/*_cache.json
|
||||
|
||||
7
.vscode/settings.json
vendored
Normal file
7
.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"python.testing.pytestArgs": [
|
||||
"tests"
|
||||
],
|
||||
"python.testing.unittestEnabled": false,
|
||||
"python.testing.pytestEnabled": true
|
||||
}
|
||||
52
README.md
52
README.md
@@ -2,23 +2,51 @@
|
||||
|
||||
<img src="addon/resources/logo.png" alt="ViewIT Logo" width="220" />
|
||||
|
||||
ViewIT ist ein Kodi‑Addon zum Durchsuchen und Abspielen von Inhalten der unterstützten Anbieter.
|
||||
ViewIT ist ein Kodi Addon.
|
||||
Es durchsucht Provider und startet Streams.
|
||||
|
||||
## Projektstruktur
|
||||
- `addon/` Kodi‑Addon Quellcode
|
||||
- `scripts/` Build‑Scripts (arbeiten mit `addon/` + `dist/`)
|
||||
- `dist/` Build‑Ausgaben (ZIPs)
|
||||
- `docs/`, `tests/`
|
||||
- `addon/` Kodi Addon Quellcode
|
||||
- `scripts/` Build Scripts
|
||||
- `dist/` Build Ausgaben
|
||||
- `docs/` Doku
|
||||
- `tests/` Tests
|
||||
|
||||
## Build & Release
|
||||
- Addon‑Ordner bauen: `./scripts/build_install_addon.sh` → `dist/<addon_id>/`
|
||||
- Kodi‑ZIP bauen: `./scripts/build_kodi_zip.sh` → `dist/<addon_id>-<version>.zip`
|
||||
- Addon‑Version in `addon/addon.xml`
|
||||
## Build und Release
|
||||
- Addon Ordner bauen: `./scripts/build_install_addon.sh`
|
||||
- Kodi ZIP bauen: `./scripts/build_kodi_zip.sh`
|
||||
- Version pflegen: `addon/addon.xml`
|
||||
- Reproduzierbares ZIP: `SOURCE_DATE_EPOCH` optional setzen
|
||||
|
||||
## Entwicklung (kurz)
|
||||
- Hauptlogik: `addon/default.py`
|
||||
## Lokales Kodi Repository
|
||||
- Repository bauen: `./scripts/build_local_kodi_repo.sh`
|
||||
- Repository starten: `./scripts/serve_local_kodi_repo.sh`
|
||||
- Standard URL: `http://127.0.0.1:8080/repo/addons.xml`
|
||||
- Eigene URL beim Build: `REPO_BASE_URL=http://<host>:<port>/repo ./scripts/build_local_kodi_repo.sh`
|
||||
|
||||
## Entwicklung
|
||||
- Router: `addon/default.py`
|
||||
- Plugins: `addon/plugins/*_plugin.py`
|
||||
- Einstellungen: `addon/resources/settings.xml`
|
||||
- Settings: `addon/resources/settings.xml`
|
||||
|
||||
## TMDB API Key einrichten
|
||||
- TMDB Account anlegen und API Key (v3) erstellen: `https://www.themoviedb.org/settings/api`
|
||||
- In Kodi das ViewIT Addon oeffnen: `Einstellungen -> TMDB`
|
||||
- `TMDB aktivieren` einschalten
|
||||
- `TMDB API Key` eintragen
|
||||
- Optional `TMDB Sprache` setzen (z. B. `de-DE`)
|
||||
- Optional die Anzeige-Optionen aktivieren/deaktivieren:
|
||||
- `TMDB Beschreibung anzeigen`
|
||||
- `TMDB Poster und Vorschaubild anzeigen`
|
||||
- `TMDB Fanart/Backdrop anzeigen`
|
||||
- `TMDB Bewertung anzeigen`
|
||||
- `TMDB Stimmen anzeigen`
|
||||
- `TMDB Besetzung anzeigen`
|
||||
|
||||
## Tests
|
||||
- Dev Pakete installieren: `./.venv/bin/pip install -r requirements-dev.txt`
|
||||
- Tests starten: `./.venv/bin/pytest`
|
||||
- XML Report: `./.venv/bin/pytest --cov-report=xml`
|
||||
|
||||
## Dokumentation
|
||||
Siehe `docs/`.
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<addon id="plugin.video.viewit" name="ViewIt" version="0.1.46" provider-name="ViewIt">
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<addon id="plugin.video.viewit" name="ViewIt" version="0.1.58" provider-name="ViewIt">
|
||||
<requires>
|
||||
<import addon="xbmc.python" version="3.0.0" />
|
||||
<import addon="script.module.requests" />
|
||||
@@ -10,8 +10,8 @@
|
||||
<provides>video</provides>
|
||||
</extension>
|
||||
<extension point="xbmc.addon.metadata">
|
||||
<summary>ViewIt Kodi Plugin</summary>
|
||||
<description>Streaming-Addon für Streamingseiten: Suche, Staffeln/Episoden und Wiedergabe.</description>
|
||||
<summary>Suche und Wiedergabe fuer mehrere Quellen</summary>
|
||||
<description>Findet Titel in unterstuetzten Quellen und startet Filme oder Episoden direkt in Kodi.</description>
|
||||
<assets>
|
||||
<icon>icon.png</icon>
|
||||
</assets>
|
||||
|
||||
2251
addon/default.py
2251
addon/default.py
File diff suppressed because it is too large
Load Diff
@@ -32,3 +32,12 @@ def get_requests_session(key: str, *, headers: Optional[dict[str, str]] = None):
|
||||
pass
|
||||
return session
|
||||
|
||||
|
||||
def close_all_sessions() -> None:
|
||||
"""Close and clear all pooled sessions."""
|
||||
for session in list(_SESSIONS.values()):
|
||||
try:
|
||||
session.close()
|
||||
except Exception:
|
||||
pass
|
||||
_SESSIONS.clear()
|
||||
|
||||
93
addon/metadata_utils.py
Normal file
93
addon/metadata_utils.py
Normal file
@@ -0,0 +1,93 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
|
||||
from plugin_interface import BasisPlugin
|
||||
from tmdb import TmdbCastMember
|
||||
|
||||
METADATA_MODE_AUTO = 0
|
||||
METADATA_MODE_SOURCE = 1
|
||||
METADATA_MODE_TMDB = 2
|
||||
METADATA_MODE_MIX = 3
|
||||
|
||||
|
||||
def metadata_setting_id(plugin_name: str) -> str:
|
||||
safe = re.sub(r"[^a-z0-9]+", "_", (plugin_name or "").strip().casefold()).strip("_")
|
||||
return f"{safe}_metadata_source" if safe else "metadata_source"
|
||||
|
||||
|
||||
def plugin_supports_metadata(plugin: BasisPlugin) -> bool:
|
||||
try:
|
||||
return plugin.__class__.metadata_for is not BasisPlugin.metadata_for
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
|
||||
def metadata_policy(
|
||||
plugin_name: str,
|
||||
plugin: BasisPlugin,
|
||||
*,
|
||||
allow_tmdb: bool,
|
||||
get_setting_int=None,
|
||||
) -> tuple[bool, bool, bool]:
|
||||
if not callable(get_setting_int):
|
||||
return plugin_supports_metadata(plugin), allow_tmdb, bool(getattr(plugin, "prefer_source_metadata", False))
|
||||
mode = get_setting_int(metadata_setting_id(plugin_name), default=METADATA_MODE_AUTO)
|
||||
supports_source = plugin_supports_metadata(plugin)
|
||||
if mode == METADATA_MODE_SOURCE:
|
||||
return supports_source, False, True
|
||||
if mode == METADATA_MODE_TMDB:
|
||||
return False, allow_tmdb, False
|
||||
if mode == METADATA_MODE_MIX:
|
||||
return supports_source, allow_tmdb, True
|
||||
prefer_source = bool(getattr(plugin, "prefer_source_metadata", False))
|
||||
return supports_source, allow_tmdb, prefer_source
|
||||
|
||||
|
||||
def collect_plugin_metadata(
|
||||
plugin: BasisPlugin,
|
||||
titles: list[str],
|
||||
) -> dict[str, tuple[dict[str, str], dict[str, str], list[TmdbCastMember] | None]]:
|
||||
getter = getattr(plugin, "metadata_for", None)
|
||||
if not callable(getter):
|
||||
return {}
|
||||
collected: dict[str, tuple[dict[str, str], dict[str, str], list[TmdbCastMember] | None]] = {}
|
||||
for title in titles:
|
||||
try:
|
||||
labels, art, cast = getter(title)
|
||||
except Exception:
|
||||
continue
|
||||
if isinstance(labels, dict) or isinstance(art, dict) or cast:
|
||||
label_map = {str(k): str(v) for k, v in dict(labels or {}).items() if v}
|
||||
art_map = {str(k): str(v) for k, v in dict(art or {}).items() if v}
|
||||
collected[title] = (label_map, art_map, cast if isinstance(cast, list) else None)
|
||||
return collected
|
||||
|
||||
|
||||
def needs_tmdb(labels: dict[str, str], art: dict[str, str], *, want_plot: bool, want_art: bool) -> bool:
|
||||
if want_plot and not labels.get("plot"):
|
||||
return True
|
||||
if want_art and not (art.get("thumb") or art.get("poster") or art.get("fanart") or art.get("landscape")):
|
||||
return True
|
||||
return False
|
||||
|
||||
|
||||
def merge_metadata(
|
||||
title: str,
|
||||
tmdb_labels: dict[str, str] | None,
|
||||
tmdb_art: dict[str, str] | None,
|
||||
tmdb_cast: list[TmdbCastMember] | None,
|
||||
plugin_meta: tuple[dict[str, str], dict[str, str], list[TmdbCastMember] | None] | None,
|
||||
) -> tuple[dict[str, str], dict[str, str], list[TmdbCastMember] | None]:
|
||||
labels = dict(tmdb_labels or {})
|
||||
art = dict(tmdb_art or {})
|
||||
cast = tmdb_cast
|
||||
if plugin_meta is not None:
|
||||
meta_labels, meta_art, meta_cast = plugin_meta
|
||||
labels.update({k: str(v) for k, v in dict(meta_labels or {}).items() if v})
|
||||
art.update({k: str(v) for k, v in dict(meta_art or {}).items() if v})
|
||||
if meta_cast is not None:
|
||||
cast = meta_cast
|
||||
if "title" not in labels:
|
||||
labels["title"] = title
|
||||
return labels, art, cast
|
||||
@@ -15,7 +15,9 @@ from __future__ import annotations
|
||||
from datetime import datetime
|
||||
import hashlib
|
||||
import os
|
||||
import re
|
||||
from typing import Optional
|
||||
from urllib.parse import parse_qsl, urlencode
|
||||
|
||||
try: # pragma: no cover - Kodi runtime
|
||||
import xbmcaddon # type: ignore[import-not-found]
|
||||
@@ -54,10 +56,39 @@ def get_setting_bool(addon_id: str, setting_id: str, *, default: bool = False) -
|
||||
return default
|
||||
|
||||
|
||||
def notify_url(addon_id: str, *, heading: str, url: str, enabled_setting_id: str) -> None:
|
||||
def get_setting_int(addon_id: str, setting_id: str, *, default: int = 0) -> int:
|
||||
if xbmcaddon is None:
|
||||
return default
|
||||
try:
|
||||
addon = xbmcaddon.Addon(addon_id)
|
||||
getter = getattr(addon, "getSettingInt", None)
|
||||
if getter is not None:
|
||||
return int(getter(setting_id))
|
||||
raw = addon.getSetting(setting_id)
|
||||
return int(str(raw).strip())
|
||||
except Exception:
|
||||
return default
|
||||
|
||||
|
||||
def _is_logging_enabled(addon_id: str, *, global_setting_id: str, plugin_setting_id: Optional[str]) -> bool:
|
||||
if not get_setting_bool(addon_id, global_setting_id, default=False):
|
||||
return False
|
||||
if plugin_setting_id:
|
||||
return get_setting_bool(addon_id, plugin_setting_id, default=False)
|
||||
return True
|
||||
|
||||
|
||||
def notify_url(
|
||||
addon_id: str,
|
||||
*,
|
||||
heading: str,
|
||||
url: str,
|
||||
enabled_setting_id: str,
|
||||
plugin_setting_id: Optional[str] = None,
|
||||
) -> None:
|
||||
if xbmcgui is None:
|
||||
return
|
||||
if not get_setting_bool(addon_id, enabled_setting_id, default=False):
|
||||
if not _is_logging_enabled(addon_id, global_setting_id=enabled_setting_id, plugin_setting_id=plugin_setting_id):
|
||||
return
|
||||
try:
|
||||
xbmcgui.Dialog().notification(heading, url, xbmcgui.NOTIFICATION_INFO, 3000)
|
||||
@@ -96,16 +127,92 @@ def _append_text_file(path: str, content: str) -> None:
|
||||
return
|
||||
|
||||
|
||||
def log_url(addon_id: str, *, enabled_setting_id: str, log_filename: str, url: str, kind: str = "VISIT") -> None:
|
||||
if not get_setting_bool(addon_id, enabled_setting_id, default=False):
|
||||
def _rotate_log_file(path: str, *, max_bytes: int, max_files: int) -> None:
|
||||
if max_bytes <= 0 or max_files <= 0:
|
||||
return
|
||||
try:
|
||||
if not os.path.exists(path) or os.path.getsize(path) <= max_bytes:
|
||||
return
|
||||
except Exception:
|
||||
return
|
||||
try:
|
||||
for index in range(max_files - 1, 0, -1):
|
||||
older = f"{path}.{index}"
|
||||
newer = f"{path}.{index + 1}"
|
||||
if os.path.exists(older):
|
||||
if index + 1 > max_files:
|
||||
os.remove(older)
|
||||
else:
|
||||
os.replace(older, newer)
|
||||
os.replace(path, f"{path}.1")
|
||||
except Exception:
|
||||
return
|
||||
|
||||
|
||||
def _prune_dump_files(directory: str, *, prefix: str, max_files: int) -> None:
|
||||
if not directory or max_files <= 0:
|
||||
return
|
||||
try:
|
||||
entries = [
|
||||
os.path.join(directory, name)
|
||||
for name in os.listdir(directory)
|
||||
if name.startswith(prefix) and name.endswith(".html")
|
||||
]
|
||||
if len(entries) <= max_files:
|
||||
return
|
||||
entries.sort(key=lambda path: os.path.getmtime(path))
|
||||
for path in entries[: len(entries) - max_files]:
|
||||
try:
|
||||
os.remove(path)
|
||||
except Exception:
|
||||
pass
|
||||
except Exception:
|
||||
return
|
||||
|
||||
|
||||
def log_url(
|
||||
addon_id: str,
|
||||
*,
|
||||
enabled_setting_id: str,
|
||||
log_filename: str,
|
||||
url: str,
|
||||
kind: str = "VISIT",
|
||||
request_id: Optional[str] = None,
|
||||
plugin_setting_id: Optional[str] = None,
|
||||
max_mb_setting_id: str = "log_max_mb",
|
||||
max_files_setting_id: str = "log_max_files",
|
||||
) -> None:
|
||||
if not _is_logging_enabled(addon_id, global_setting_id=enabled_setting_id, plugin_setting_id=plugin_setting_id):
|
||||
return
|
||||
timestamp = datetime.utcnow().isoformat(timespec="seconds") + "Z"
|
||||
line = f"{timestamp}\t{kind}\t{url}\n"
|
||||
request_part = f"\t{request_id}" if request_id else ""
|
||||
line = f"{timestamp}\t{kind}{request_part}\t{url}\n"
|
||||
log_dir = _profile_logs_dir(addon_id)
|
||||
if log_dir:
|
||||
_append_text_file(os.path.join(log_dir, log_filename), line)
|
||||
return
|
||||
_append_text_file(os.path.join(os.path.dirname(__file__), log_filename), line)
|
||||
path = os.path.join(log_dir, log_filename) if log_dir else os.path.join(os.path.dirname(__file__), log_filename)
|
||||
max_mb = get_setting_int(addon_id, max_mb_setting_id, default=5)
|
||||
max_files = get_setting_int(addon_id, max_files_setting_id, default=3)
|
||||
_rotate_log_file(path, max_bytes=max_mb * 1024 * 1024, max_files=max_files)
|
||||
_append_text_file(path, line)
|
||||
|
||||
|
||||
def log_error(
|
||||
addon_id: str,
|
||||
*,
|
||||
enabled_setting_id: str,
|
||||
log_filename: str,
|
||||
message: str,
|
||||
request_id: Optional[str] = None,
|
||||
plugin_setting_id: Optional[str] = None,
|
||||
) -> None:
|
||||
log_url(
|
||||
addon_id,
|
||||
enabled_setting_id=enabled_setting_id,
|
||||
plugin_setting_id=plugin_setting_id,
|
||||
log_filename=log_filename,
|
||||
url=message,
|
||||
kind="ERROR",
|
||||
request_id=request_id,
|
||||
)
|
||||
|
||||
|
||||
def dump_response_html(
|
||||
@@ -115,14 +222,57 @@ def dump_response_html(
|
||||
url: str,
|
||||
body: str,
|
||||
filename_prefix: str,
|
||||
request_id: Optional[str] = None,
|
||||
plugin_setting_id: Optional[str] = None,
|
||||
max_files_setting_id: str = "dump_max_files",
|
||||
) -> None:
|
||||
if not get_setting_bool(addon_id, enabled_setting_id, default=False):
|
||||
if not _is_logging_enabled(addon_id, global_setting_id=enabled_setting_id, plugin_setting_id=plugin_setting_id):
|
||||
return
|
||||
timestamp = datetime.utcnow().strftime("%Y%m%d_%H%M%S_%f")
|
||||
digest = hashlib.md5(url.encode("utf-8")).hexdigest() # nosec - filename only
|
||||
filename = f"{filename_prefix}_{timestamp}_{digest}.html"
|
||||
log_dir = _profile_logs_dir(addon_id)
|
||||
path = os.path.join(log_dir, filename) if log_dir else os.path.join(os.path.dirname(__file__), filename)
|
||||
content = f"<!-- {url} -->\n{body or ''}"
|
||||
request_line = f" request_id={request_id}" if request_id else ""
|
||||
content = f"<!-- {url}{request_line} -->\n{body or ''}"
|
||||
if log_dir:
|
||||
max_files = get_setting_int(addon_id, max_files_setting_id, default=200)
|
||||
_prune_dump_files(log_dir, prefix=filename_prefix, max_files=max_files)
|
||||
_append_text_file(path, content)
|
||||
|
||||
|
||||
def normalize_resolved_stream_url(final_url: str, *, source_url: str = "") -> str:
|
||||
"""Normalisiert hoster-spezifische Header im finalen Stream-Link.
|
||||
|
||||
`final_url` kann ein Kodi-Header-Suffix enthalten: `url|Key=Value&...`.
|
||||
Die Funktion passt nur bekannte Problemfaelle an und laesst sonst alles unveraendert.
|
||||
"""
|
||||
|
||||
url = (final_url or "").strip()
|
||||
if not url:
|
||||
return ""
|
||||
normalized = _normalize_supervideo_serversicuro(url, source_url=source_url)
|
||||
return normalized
|
||||
|
||||
|
||||
def _normalize_supervideo_serversicuro(final_url: str, *, source_url: str = "") -> str:
|
||||
if "serversicuro.cc/hls/" not in final_url.casefold() or "|" not in final_url:
|
||||
return final_url
|
||||
|
||||
source = (source_url or "").strip()
|
||||
code_match = re.search(
|
||||
r"supervideo\.(?:tv|cc)/(?:e/)?([a-z0-9]+)(?:\\.html)?",
|
||||
source,
|
||||
flags=re.IGNORECASE,
|
||||
)
|
||||
if not code_match:
|
||||
return final_url
|
||||
|
||||
code = (code_match.group(1) or "").strip()
|
||||
if not code:
|
||||
return final_url
|
||||
|
||||
media_url, header_suffix = final_url.split("|", 1)
|
||||
headers = dict(parse_qsl(header_suffix, keep_blank_values=True))
|
||||
headers["Referer"] = f"https://supervideo.cc/e/{code}"
|
||||
return f"{media_url}|{urlencode(headers)}"
|
||||
|
||||
@@ -4,16 +4,22 @@
|
||||
from __future__ import annotations
|
||||
|
||||
from abc import ABC, abstractmethod
|
||||
from typing import List, Optional, Set
|
||||
from typing import Any, Callable, Dict, List, Optional, Set, Tuple
|
||||
|
||||
|
||||
class BasisPlugin(ABC):
|
||||
"""Abstrakte Basisklasse fuer alle Integrationen."""
|
||||
|
||||
name: str
|
||||
version: str = "0.0.0"
|
||||
prefer_source_metadata: bool = False
|
||||
|
||||
@abstractmethod
|
||||
async def search_titles(self, query: str) -> List[str]:
|
||||
async def search_titles(
|
||||
self,
|
||||
query: str,
|
||||
progress_callback: Optional[Callable[[str, Optional[int]], Any]] = None,
|
||||
) -> List[str]:
|
||||
"""Liefert eine Liste aller Treffer fuer die Suche."""
|
||||
|
||||
@abstractmethod
|
||||
@@ -28,6 +34,10 @@ class BasisPlugin(ABC):
|
||||
"""Optional: Liefert den Stream-Link fuer eine konkrete Folge."""
|
||||
return None
|
||||
|
||||
def metadata_for(self, title: str) -> Tuple[Dict[str, str], Dict[str, str], Optional[List[Any]]]:
|
||||
"""Optional: Liefert Info-Labels, Art und Cast fuer einen Titel."""
|
||||
return {}, {}, None
|
||||
|
||||
def resolve_stream_link(self, link: str) -> Optional[str]:
|
||||
"""Optional: Folgt einem Stream-Link und liefert die finale URL."""
|
||||
return None
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -9,7 +9,7 @@ Zum Verwenden:
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
from typing import TYPE_CHECKING, Any, List, Optional, TypeAlias
|
||||
from typing import TYPE_CHECKING, Any, Callable, List, Optional
|
||||
|
||||
try: # pragma: no cover - optional dependency
|
||||
import requests
|
||||
@@ -34,8 +34,8 @@ if TYPE_CHECKING: # pragma: no cover
|
||||
from requests import Session as RequestsSession
|
||||
from bs4 import BeautifulSoup as BeautifulSoupT # type: ignore[import-not-found]
|
||||
else: # pragma: no cover
|
||||
RequestsSession: TypeAlias = Any
|
||||
BeautifulSoupT: TypeAlias = Any
|
||||
RequestsSession = Any
|
||||
BeautifulSoupT = Any
|
||||
|
||||
|
||||
ADDON_ID = "plugin.video.viewit"
|
||||
@@ -88,9 +88,13 @@ class TemplatePlugin(BasisPlugin):
|
||||
self._session = session
|
||||
return self._session
|
||||
|
||||
async def search_titles(self, query: str) -> List[str]:
|
||||
async def search_titles(
|
||||
self,
|
||||
query: str,
|
||||
progress_callback: Optional[Callable[[str, Optional[int]], Any]] = None,
|
||||
) -> List[str]:
|
||||
"""TODO: Suche auf der Zielseite implementieren."""
|
||||
_ = query
|
||||
_ = (query, progress_callback)
|
||||
return []
|
||||
|
||||
def seasons_for(self, title: str) -> List[str]:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
499
addon/plugins/dokustreams_plugin.py
Normal file
499
addon/plugins/dokustreams_plugin.py
Normal file
@@ -0,0 +1,499 @@
|
||||
"""Doku-Streams (doku-streams.com) Integration."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from dataclasses import dataclass
|
||||
import re
|
||||
from urllib.parse import quote
|
||||
from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional
|
||||
|
||||
try: # pragma: no cover - optional dependency
|
||||
import requests
|
||||
from bs4 import BeautifulSoup # type: ignore[import-not-found]
|
||||
except ImportError as exc: # pragma: no cover - optional dependency
|
||||
requests = None
|
||||
BeautifulSoup = None
|
||||
REQUESTS_AVAILABLE = False
|
||||
REQUESTS_IMPORT_ERROR = exc
|
||||
else:
|
||||
REQUESTS_AVAILABLE = True
|
||||
REQUESTS_IMPORT_ERROR = None
|
||||
|
||||
from plugin_interface import BasisPlugin
|
||||
from plugin_helpers import dump_response_html, get_setting_bool, get_setting_string, log_error, log_url, notify_url
|
||||
from http_session_pool import get_requests_session
|
||||
|
||||
if TYPE_CHECKING: # pragma: no cover
|
||||
from requests import Session as RequestsSession
|
||||
from bs4 import BeautifulSoup as BeautifulSoupT # type: ignore[import-not-found]
|
||||
else: # pragma: no cover
|
||||
RequestsSession = Any
|
||||
BeautifulSoupT = Any
|
||||
|
||||
|
||||
ADDON_ID = "plugin.video.viewit"
|
||||
SETTING_BASE_URL = "doku_streams_base_url"
|
||||
DEFAULT_BASE_URL = "https://doku-streams.com"
|
||||
MOST_VIEWED_PATH = "/meistgesehene/"
|
||||
DEFAULT_TIMEOUT = 20
|
||||
GLOBAL_SETTING_LOG_URLS = "debug_log_urls"
|
||||
GLOBAL_SETTING_DUMP_HTML = "debug_dump_html"
|
||||
GLOBAL_SETTING_SHOW_URL_INFO = "debug_show_url_info"
|
||||
GLOBAL_SETTING_LOG_ERRORS = "debug_log_errors"
|
||||
SETTING_LOG_URLS = "log_urls_dokustreams"
|
||||
SETTING_DUMP_HTML = "dump_html_dokustreams"
|
||||
SETTING_SHOW_URL_INFO = "show_url_info_dokustreams"
|
||||
SETTING_LOG_ERRORS = "log_errors_dokustreams"
|
||||
ProgressCallback = Optional[Callable[[str, Optional[int]], Any]]
|
||||
|
||||
|
||||
def _emit_progress(callback: ProgressCallback, message: str, percent: Optional[int] = None) -> None:
|
||||
if not callable(callback):
|
||||
return
|
||||
try:
|
||||
callback(str(message or ""), None if percent is None else int(percent))
|
||||
except Exception:
|
||||
return
|
||||
HEADERS = {
|
||||
"User-Agent": "Mozilla/5.0 (Kodi; ViewIt) AppleWebKit/537.36 (KHTML, like Gecko)",
|
||||
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
|
||||
"Accept-Language": "de-DE,de;q=0.9,en;q=0.8",
|
||||
"Connection": "keep-alive",
|
||||
}
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class SearchHit:
|
||||
title: str
|
||||
url: str
|
||||
plot: str = ""
|
||||
poster: str = ""
|
||||
|
||||
|
||||
def _extract_last_page(soup: BeautifulSoupT) -> int:
|
||||
max_page = 1
|
||||
if not soup:
|
||||
return max_page
|
||||
for anchor in soup.select("nav.navigation a[href], nav.pagination a[href], a.page-numbers[href]"):
|
||||
text = (anchor.get_text(" ", strip=True) or "").strip()
|
||||
for candidate in (text, (anchor.get("href") or "").strip()):
|
||||
for value in re.findall(r"/page/(\\d+)/", candidate):
|
||||
try:
|
||||
max_page = max(max_page, int(value))
|
||||
except Exception:
|
||||
continue
|
||||
for value in re.findall(r"(\\d+)", candidate):
|
||||
try:
|
||||
max_page = max(max_page, int(value))
|
||||
except Exception:
|
||||
continue
|
||||
return max_page
|
||||
|
||||
|
||||
def _extract_summary_and_poster(article: BeautifulSoupT) -> tuple[str, str]:
|
||||
summary = ""
|
||||
if article:
|
||||
summary_box = article.select_one("div.entry-summary")
|
||||
if summary_box is not None:
|
||||
for p in summary_box.find_all("p"):
|
||||
text = (p.get_text(" ", strip=True) or "").strip()
|
||||
if text:
|
||||
summary = text
|
||||
break
|
||||
poster = ""
|
||||
if article:
|
||||
img = article.select_one("div.entry-thumb img")
|
||||
if img is not None:
|
||||
poster = (img.get("data-src") or "").strip() or (img.get("src") or "").strip()
|
||||
if "lazy_placeholder" in poster and img.get("data-src"):
|
||||
poster = (img.get("data-src") or "").strip()
|
||||
poster = _absolute_url(poster)
|
||||
return summary, poster
|
||||
|
||||
|
||||
def _parse_listing_hits(soup: BeautifulSoupT, *, query: str = "") -> List[SearchHit]:
|
||||
hits: List[SearchHit] = []
|
||||
if not soup:
|
||||
return hits
|
||||
seen_titles: set[str] = set()
|
||||
seen_urls: set[str] = set()
|
||||
for article in soup.select("article[id^='post-']"):
|
||||
anchor = article.select_one("h2.entry-title a[href]")
|
||||
if anchor is None:
|
||||
continue
|
||||
href = (anchor.get("href") or "").strip()
|
||||
title = (anchor.get_text(" ", strip=True) or "").strip()
|
||||
if not href or not title:
|
||||
continue
|
||||
if query and not _matches_query(query, title=title):
|
||||
continue
|
||||
url = _absolute_url(href).split("#", 1)[0].split("?", 1)[0].rstrip("/")
|
||||
title_key = title.casefold()
|
||||
url_key = url.casefold()
|
||||
if title_key in seen_titles or url_key in seen_urls:
|
||||
continue
|
||||
seen_titles.add(title_key)
|
||||
seen_urls.add(url_key)
|
||||
_log_url_event(url, kind="PARSE")
|
||||
summary, poster = _extract_summary_and_poster(article)
|
||||
hits.append(SearchHit(title=title, url=url, plot=summary, poster=poster))
|
||||
return hits
|
||||
|
||||
|
||||
def _get_base_url() -> str:
|
||||
base = get_setting_string(ADDON_ID, SETTING_BASE_URL, default=DEFAULT_BASE_URL).strip()
|
||||
if not base:
|
||||
base = DEFAULT_BASE_URL
|
||||
return base.rstrip("/")
|
||||
|
||||
|
||||
def _absolute_url(url: str) -> str:
|
||||
url = (url or "").strip()
|
||||
if not url:
|
||||
return ""
|
||||
if url.startswith("http://") or url.startswith("https://"):
|
||||
return url
|
||||
if url.startswith("//"):
|
||||
return f"https:{url}"
|
||||
if url.startswith("/"):
|
||||
return f"{_get_base_url()}{url}"
|
||||
return f"{_get_base_url()}/{url.lstrip('/')}"
|
||||
|
||||
|
||||
def _normalize_search_text(value: str) -> str:
|
||||
value = (value or "").casefold()
|
||||
value = re.sub(r"[^a-z0-9]+", " ", value)
|
||||
value = re.sub(r"\s+", " ", value).strip()
|
||||
return value
|
||||
|
||||
|
||||
def _matches_query(query: str, *, title: str) -> bool:
|
||||
normalized_query = _normalize_search_text(query)
|
||||
if not normalized_query:
|
||||
return False
|
||||
haystack = f" {_normalize_search_text(title)} "
|
||||
return f" {normalized_query} " in haystack
|
||||
|
||||
|
||||
def _log_url_event(url: str, *, kind: str = "VISIT") -> None:
|
||||
log_url(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_URLS,
|
||||
plugin_setting_id=SETTING_LOG_URLS,
|
||||
log_filename="dokustreams_urls.log",
|
||||
url=url,
|
||||
kind=kind,
|
||||
)
|
||||
|
||||
|
||||
def _log_visit(url: str) -> None:
|
||||
_log_url_event(url, kind="VISIT")
|
||||
notify_url(
|
||||
ADDON_ID,
|
||||
heading="Doku-Streams",
|
||||
url=url,
|
||||
enabled_setting_id=GLOBAL_SETTING_SHOW_URL_INFO,
|
||||
plugin_setting_id=SETTING_SHOW_URL_INFO,
|
||||
)
|
||||
|
||||
|
||||
def _log_response_html(url: str, body: str) -> None:
|
||||
dump_response_html(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_DUMP_HTML,
|
||||
plugin_setting_id=SETTING_DUMP_HTML,
|
||||
url=url,
|
||||
body=body,
|
||||
filename_prefix="dokustreams_response",
|
||||
)
|
||||
|
||||
|
||||
def _log_error_message(message: str) -> None:
|
||||
log_error(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_ERRORS,
|
||||
plugin_setting_id=SETTING_LOG_ERRORS,
|
||||
log_filename="dokustreams_errors.log",
|
||||
message=message,
|
||||
)
|
||||
|
||||
|
||||
def _get_soup(url: str, *, session: Optional[RequestsSession] = None) -> BeautifulSoupT:
|
||||
if requests is None or BeautifulSoup is None:
|
||||
raise RuntimeError("requests/bs4 sind nicht verfuegbar.")
|
||||
_log_visit(url)
|
||||
sess = session or get_requests_session("dokustreams", headers=HEADERS)
|
||||
response = None
|
||||
try:
|
||||
response = sess.get(url, headers=HEADERS, timeout=DEFAULT_TIMEOUT)
|
||||
response.raise_for_status()
|
||||
except Exception as exc:
|
||||
_log_error_message(f"GET {url} failed: {exc}")
|
||||
raise
|
||||
try:
|
||||
final_url = (response.url or url) if response is not None else url
|
||||
body = (response.text or "") if response is not None else ""
|
||||
if final_url != url:
|
||||
_log_url_event(final_url, kind="REDIRECT")
|
||||
_log_response_html(url, body)
|
||||
return BeautifulSoup(body, "html.parser")
|
||||
finally:
|
||||
if response is not None:
|
||||
try:
|
||||
response.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
class DokuStreamsPlugin(BasisPlugin):
|
||||
name = "Doku-Streams"
|
||||
version = "1.0.0"
|
||||
prefer_source_metadata = True
|
||||
|
||||
def __init__(self) -> None:
|
||||
self._title_to_url: Dict[str, str] = {}
|
||||
self._category_to_url: Dict[str, str] = {}
|
||||
self._category_page_count_cache: Dict[str, int] = {}
|
||||
self._popular_cache: Optional[List[SearchHit]] = None
|
||||
self._title_meta: Dict[str, tuple[str, str]] = {}
|
||||
self._requests_available = REQUESTS_AVAILABLE
|
||||
self.is_available = True
|
||||
self.unavailable_reason: Optional[str] = None
|
||||
if not self._requests_available: # pragma: no cover - optional dependency
|
||||
self.is_available = False
|
||||
self.unavailable_reason = (
|
||||
"requests/bs4 fehlen. Installiere 'requests' und 'beautifulsoup4'."
|
||||
)
|
||||
if REQUESTS_IMPORT_ERROR:
|
||||
print(f"DokuStreamsPlugin Importfehler: {REQUESTS_IMPORT_ERROR}")
|
||||
|
||||
async def search_titles(self, query: str, progress_callback: ProgressCallback = None) -> List[str]:
|
||||
_emit_progress(progress_callback, "Doku-Streams Suche", 15)
|
||||
hits = self._search_hits(query)
|
||||
_emit_progress(progress_callback, f"Treffer verarbeiten ({len(hits)})", 70)
|
||||
self._title_to_url = {hit.title: hit.url for hit in hits if hit.title and hit.url}
|
||||
for hit in hits:
|
||||
if hit.title:
|
||||
self._title_meta[hit.title] = (hit.plot, hit.poster)
|
||||
titles = [hit.title for hit in hits if hit.title]
|
||||
titles.sort(key=lambda value: value.casefold())
|
||||
_emit_progress(progress_callback, f"Fertig: {len(titles)} Treffer", 95)
|
||||
return titles
|
||||
|
||||
def _search_hits(self, query: str) -> List[SearchHit]:
|
||||
query = (query or "").strip()
|
||||
if not query or not self._requests_available:
|
||||
return []
|
||||
search_url = _absolute_url(f"/?s={quote(query)}")
|
||||
session = get_requests_session("dokustreams", headers=HEADERS)
|
||||
try:
|
||||
soup = _get_soup(search_url, session=session)
|
||||
except Exception:
|
||||
return []
|
||||
return _parse_listing_hits(soup, query=query)
|
||||
|
||||
def capabilities(self) -> set[str]:
|
||||
return {"genres", "popular_series"}
|
||||
|
||||
def _categories_url(self) -> str:
|
||||
return _absolute_url("/kategorien/")
|
||||
|
||||
def _parse_categories(self, soup: BeautifulSoupT) -> Dict[str, str]:
|
||||
categories: Dict[str, str] = {}
|
||||
if not soup:
|
||||
return categories
|
||||
root = soup.select_one("ul.nested-category-list")
|
||||
if root is None:
|
||||
return categories
|
||||
|
||||
def clean_name(value: str) -> str:
|
||||
value = (value or "").strip()
|
||||
return re.sub(r"\\s*\\(\\d+\\)\\s*$", "", value).strip()
|
||||
|
||||
def walk(ul, parents: List[str]) -> None:
|
||||
for li in ul.find_all("li", recursive=False):
|
||||
anchor = li.find("a", href=True)
|
||||
if anchor is None:
|
||||
continue
|
||||
name = clean_name(anchor.get_text(" ", strip=True) or "")
|
||||
href = (anchor.get("href") or "").strip()
|
||||
if not name or not href:
|
||||
continue
|
||||
child_ul = li.find("ul", class_="nested-category-list")
|
||||
if child_ul is not None:
|
||||
walk(child_ul, parents + [name])
|
||||
else:
|
||||
if parents:
|
||||
label = " \u2192 ".join(parents + [name])
|
||||
categories[label] = _absolute_url(href)
|
||||
|
||||
walk(root, [])
|
||||
return categories
|
||||
|
||||
def _parse_top_categories(self, soup: BeautifulSoupT) -> Dict[str, str]:
|
||||
categories: Dict[str, str] = {}
|
||||
if not soup:
|
||||
return categories
|
||||
root = soup.select_one("ul.nested-category-list")
|
||||
if root is None:
|
||||
return categories
|
||||
for li in root.find_all("li", recursive=False):
|
||||
anchor = li.find("a", href=True)
|
||||
if anchor is None:
|
||||
continue
|
||||
name = (anchor.get_text(" ", strip=True) or "").strip()
|
||||
href = (anchor.get("href") or "").strip()
|
||||
if not name or not href:
|
||||
continue
|
||||
categories[name] = _absolute_url(href)
|
||||
return categories
|
||||
|
||||
def genres(self) -> List[str]:
|
||||
if not self._requests_available:
|
||||
return []
|
||||
if self._category_to_url:
|
||||
return sorted(self._category_to_url.keys(), key=lambda value: value.casefold())
|
||||
try:
|
||||
soup = _get_soup(self._categories_url(), session=get_requests_session("dokustreams", headers=HEADERS))
|
||||
except Exception:
|
||||
return []
|
||||
parsed = self._parse_categories(soup)
|
||||
if parsed:
|
||||
self._category_to_url = dict(parsed)
|
||||
return sorted(self._category_to_url.keys(), key=lambda value: value.casefold())
|
||||
|
||||
def categories(self) -> List[str]:
|
||||
if not self._requests_available:
|
||||
return []
|
||||
try:
|
||||
soup = _get_soup(self._categories_url(), session=get_requests_session("dokustreams", headers=HEADERS))
|
||||
except Exception:
|
||||
return []
|
||||
parsed = self._parse_top_categories(soup)
|
||||
if parsed:
|
||||
for key, value in parsed.items():
|
||||
self._category_to_url.setdefault(key, value)
|
||||
return list(parsed.keys())
|
||||
|
||||
def genre_page_count(self, genre: str) -> int:
|
||||
genre = (genre or "").strip()
|
||||
if not genre:
|
||||
return 1
|
||||
if genre in self._category_page_count_cache:
|
||||
return max(1, int(self._category_page_count_cache.get(genre, 1)))
|
||||
if not self._category_to_url:
|
||||
self.genres()
|
||||
base_url = self._category_to_url.get(genre, "")
|
||||
if not base_url:
|
||||
return 1
|
||||
try:
|
||||
soup = _get_soup(base_url, session=get_requests_session("dokustreams", headers=HEADERS))
|
||||
except Exception:
|
||||
return 1
|
||||
pages = _extract_last_page(soup)
|
||||
self._category_page_count_cache[genre] = max(1, pages)
|
||||
return self._category_page_count_cache[genre]
|
||||
|
||||
def titles_for_genre_page(self, genre: str, page: int) -> List[str]:
|
||||
genre = (genre or "").strip()
|
||||
if not genre or not self._requests_available:
|
||||
return []
|
||||
if not self._category_to_url:
|
||||
self.genres()
|
||||
base_url = self._category_to_url.get(genre, "")
|
||||
if not base_url:
|
||||
return []
|
||||
page = max(1, int(page or 1))
|
||||
url = base_url if page == 1 else f"{base_url.rstrip('/')}/page/{page}/"
|
||||
try:
|
||||
soup = _get_soup(url, session=get_requests_session("dokustreams", headers=HEADERS))
|
||||
except Exception:
|
||||
return []
|
||||
hits = _parse_listing_hits(soup)
|
||||
for hit in hits:
|
||||
if hit.title:
|
||||
self._title_meta[hit.title] = (hit.plot, hit.poster)
|
||||
titles = [hit.title for hit in hits if hit.title]
|
||||
self._title_to_url.update({hit.title: hit.url for hit in hits if hit.title and hit.url})
|
||||
return titles
|
||||
|
||||
def titles_for_genre(self, genre: str) -> List[str]:
|
||||
titles = self.titles_for_genre_page(genre, 1)
|
||||
titles.sort(key=lambda value: value.casefold())
|
||||
return titles
|
||||
|
||||
def _most_viewed_url(self) -> str:
|
||||
return _absolute_url(MOST_VIEWED_PATH)
|
||||
|
||||
def popular_series(self) -> List[str]:
|
||||
if not self._requests_available:
|
||||
return []
|
||||
if self._popular_cache is not None:
|
||||
titles = [hit.title for hit in self._popular_cache if hit.title]
|
||||
titles.sort(key=lambda value: value.casefold())
|
||||
return titles
|
||||
try:
|
||||
soup = _get_soup(self._most_viewed_url(), session=get_requests_session("dokustreams", headers=HEADERS))
|
||||
except Exception:
|
||||
return []
|
||||
hits = _parse_listing_hits(soup)
|
||||
self._popular_cache = list(hits)
|
||||
self._title_to_url.update({hit.title: hit.url for hit in hits if hit.title and hit.url})
|
||||
for hit in hits:
|
||||
if hit.title:
|
||||
self._title_meta[hit.title] = (hit.plot, hit.poster)
|
||||
titles = [hit.title for hit in hits if hit.title]
|
||||
titles.sort(key=lambda value: value.casefold())
|
||||
return titles
|
||||
|
||||
def metadata_for(self, title: str) -> tuple[dict[str, str], dict[str, str], list[object] | None]:
|
||||
title = (title or "").strip()
|
||||
if not title:
|
||||
return {}, {}, None
|
||||
plot, poster = self._title_meta.get(title, ("", ""))
|
||||
info: dict[str, str] = {"title": title}
|
||||
if plot:
|
||||
info["plot"] = plot
|
||||
art: dict[str, str] = {}
|
||||
if poster:
|
||||
art = {"thumb": poster, "poster": poster}
|
||||
return info, art, None
|
||||
|
||||
def seasons_for(self, title: str) -> List[str]:
|
||||
title = (title or "").strip()
|
||||
if not title or title not in self._title_to_url:
|
||||
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:
|
||||
return []
|
||||
return [title]
|
||||
|
||||
def stream_link_for(self, title: str, season: str, episode: str) -> Optional[str]:
|
||||
title = (title or "").strip()
|
||||
if not title:
|
||||
return None
|
||||
url = self._title_to_url.get(title)
|
||||
if not url:
|
||||
return None
|
||||
if not self._requests_available:
|
||||
return None
|
||||
try:
|
||||
soup = _get_soup(url, session=get_requests_session("dokustreams", headers=HEADERS))
|
||||
except Exception:
|
||||
return None
|
||||
iframe = soup.select_one("div.fluid-width-video-wrapper iframe[src]")
|
||||
if iframe is None:
|
||||
iframe = soup.select_one("iframe[src*='youtube'], iframe[src*='vimeo'], iframe[src]")
|
||||
if iframe is None:
|
||||
return None
|
||||
src = (iframe.get("src") or "").strip()
|
||||
if not src:
|
||||
return None
|
||||
return _absolute_url(src)
|
||||
|
||||
|
||||
# Alias für die automatische Plugin-Erkennung.
|
||||
Plugin = DokuStreamsPlugin
|
||||
@@ -11,7 +11,7 @@ from __future__ import annotations
|
||||
import json
|
||||
import re
|
||||
from dataclasses import dataclass
|
||||
from typing import Any, Dict, List, Optional, Set
|
||||
from typing import Any, Callable, Dict, List, Optional, Set
|
||||
from urllib.parse import urlencode, urljoin, urlsplit
|
||||
|
||||
try: # pragma: no cover - optional dependency (Kodi dependency)
|
||||
@@ -30,21 +30,20 @@ except ImportError: # pragma: no cover - allow running outside Kodi
|
||||
xbmcaddon = None
|
||||
|
||||
from plugin_interface import BasisPlugin
|
||||
from plugin_helpers import dump_response_html, get_setting_bool, log_url, notify_url
|
||||
from plugin_helpers import dump_response_html, get_setting_bool, log_error, log_url, notify_url
|
||||
|
||||
ADDON_ID = "plugin.video.viewit"
|
||||
SETTING_BASE_URL = "einschalten_base_url"
|
||||
SETTING_INDEX_PATH = "einschalten_index_path"
|
||||
SETTING_NEW_TITLES_PATH = "einschalten_new_titles_path"
|
||||
SETTING_SEARCH_PATH = "einschalten_search_path"
|
||||
SETTING_GENRES_PATH = "einschalten_genres_path"
|
||||
SETTING_ENABLE_PLAYBACK = "einschalten_enable_playback"
|
||||
SETTING_WATCH_PATH_TEMPLATE = "einschalten_watch_path_template"
|
||||
GLOBAL_SETTING_LOG_URLS = "debug_log_urls"
|
||||
GLOBAL_SETTING_DUMP_HTML = "debug_dump_html"
|
||||
GLOBAL_SETTING_SHOW_URL_INFO = "debug_show_url_info"
|
||||
GLOBAL_SETTING_LOG_ERRORS = "debug_log_errors"
|
||||
SETTING_LOG_URLS = "log_urls_einschalten"
|
||||
SETTING_DUMP_HTML = "dump_html_einschalten"
|
||||
SETTING_SHOW_URL_INFO = "show_url_info_einschalten"
|
||||
SETTING_LOG_ERRORS = "log_errors_einschalten"
|
||||
|
||||
DEFAULT_BASE_URL = ""
|
||||
DEFAULT_BASE_URL = "https://einschalten.in"
|
||||
DEFAULT_INDEX_PATH = "/"
|
||||
DEFAULT_NEW_TITLES_PATH = "/movies/new"
|
||||
DEFAULT_SEARCH_PATH = "/search"
|
||||
@@ -57,6 +56,16 @@ HEADERS = {
|
||||
"Accept-Language": "de-DE,de;q=0.9,en;q=0.8",
|
||||
"Connection": "keep-alive",
|
||||
}
|
||||
ProgressCallback = Optional[Callable[[str, Optional[int]], Any]]
|
||||
|
||||
|
||||
def _emit_progress(callback: ProgressCallback, message: str, percent: Optional[int] = None) -> None:
|
||||
if not callable(callback):
|
||||
return
|
||||
try:
|
||||
callback(str(message or ""), None if percent is None else int(percent))
|
||||
except Exception:
|
||||
return
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
@@ -153,16 +162,36 @@ def _extract_ng_state_payload(html: str) -> Dict[str, Any]:
|
||||
|
||||
|
||||
def _notify_url(url: str) -> None:
|
||||
notify_url(ADDON_ID, heading="einschalten", url=url, enabled_setting_id=GLOBAL_SETTING_SHOW_URL_INFO)
|
||||
notify_url(
|
||||
ADDON_ID,
|
||||
heading="Einschalten",
|
||||
url=url,
|
||||
enabled_setting_id=GLOBAL_SETTING_SHOW_URL_INFO,
|
||||
plugin_setting_id=SETTING_SHOW_URL_INFO,
|
||||
)
|
||||
|
||||
|
||||
def _log_url(url: str, *, kind: str = "VISIT") -> None:
|
||||
log_url(ADDON_ID, enabled_setting_id=GLOBAL_SETTING_LOG_URLS, log_filename="einschalten_urls.log", url=url, kind=kind)
|
||||
log_url(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_URLS,
|
||||
plugin_setting_id=SETTING_LOG_URLS,
|
||||
log_filename="einschalten_urls.log",
|
||||
url=url,
|
||||
kind=kind,
|
||||
)
|
||||
|
||||
|
||||
def _log_debug_line(message: str) -> None:
|
||||
try:
|
||||
log_url(ADDON_ID, enabled_setting_id=GLOBAL_SETTING_LOG_URLS, log_filename="einschalten_debug.log", url=message, kind="DEBUG")
|
||||
log_url(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_URLS,
|
||||
plugin_setting_id=SETTING_LOG_URLS,
|
||||
log_filename="einschalten_debug.log",
|
||||
url=message,
|
||||
kind="DEBUG",
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
@@ -174,6 +203,7 @@ def _log_titles(items: list[MovieItem], *, context: str) -> None:
|
||||
log_url(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_URLS,
|
||||
plugin_setting_id=SETTING_LOG_URLS,
|
||||
log_filename="einschalten_titles.log",
|
||||
url=f"{context}:count={len(items)}",
|
||||
kind="TITLE",
|
||||
@@ -182,6 +212,7 @@ def _log_titles(items: list[MovieItem], *, context: str) -> None:
|
||||
log_url(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_URLS,
|
||||
plugin_setting_id=SETTING_LOG_URLS,
|
||||
log_filename="einschalten_titles.log",
|
||||
url=f"{context}:id={item.id} title={item.title}",
|
||||
kind="TITLE",
|
||||
@@ -194,11 +225,22 @@ def _log_response_html(url: str, body: str) -> None:
|
||||
dump_response_html(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_DUMP_HTML,
|
||||
plugin_setting_id=SETTING_DUMP_HTML,
|
||||
url=url,
|
||||
body=body,
|
||||
filename_prefix="einschalten_response",
|
||||
)
|
||||
|
||||
|
||||
def _log_error(message: str) -> None:
|
||||
log_error(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_ERRORS,
|
||||
plugin_setting_id=SETTING_LOG_ERRORS,
|
||||
log_filename="einschalten_errors.log",
|
||||
message=message,
|
||||
)
|
||||
|
||||
def _u_matches(value: Any, expected_path: str) -> bool:
|
||||
raw = (value or "").strip()
|
||||
if not raw:
|
||||
@@ -474,7 +516,8 @@ def _parse_ng_state_genres(payload: Dict[str, Any]) -> Dict[str, int]:
|
||||
class EinschaltenPlugin(BasisPlugin):
|
||||
"""Metadata-Plugin für eine autorisierte Quelle."""
|
||||
|
||||
name = "einschalten"
|
||||
name = "Einschalten"
|
||||
version = "1.0.0"
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.is_available = REQUESTS_AVAILABLE
|
||||
@@ -493,6 +536,34 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
self._session = requests.Session()
|
||||
return self._session
|
||||
|
||||
def _http_get_text(self, url: str, *, timeout: int = 20) -> tuple[str, str]:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
response = None
|
||||
try:
|
||||
response = sess.get(url, headers=HEADERS, timeout=timeout)
|
||||
response.raise_for_status()
|
||||
final_url = (response.url or url) if response is not None else url
|
||||
body = (response.text or "") if response is not None else ""
|
||||
_log_url(final_url, kind="OK")
|
||||
_log_response_html(final_url, body)
|
||||
return final_url, body
|
||||
finally:
|
||||
if response is not None:
|
||||
try:
|
||||
response.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def _http_get_json(self, url: str, *, timeout: int = 20) -> tuple[str, Any]:
|
||||
final_url, body = self._http_get_text(url, timeout=timeout)
|
||||
try:
|
||||
payload = json.loads(body or "{}")
|
||||
except Exception:
|
||||
payload = {}
|
||||
return final_url, payload
|
||||
|
||||
def _get_base_url(self) -> str:
|
||||
base = _get_setting_text(SETTING_BASE_URL, default=DEFAULT_BASE_URL).strip()
|
||||
return base.rstrip("/")
|
||||
@@ -501,21 +572,21 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
base = self._get_base_url()
|
||||
if not base:
|
||||
return ""
|
||||
path = _get_setting_text(SETTING_INDEX_PATH, default=DEFAULT_INDEX_PATH).strip() or "/"
|
||||
path = DEFAULT_INDEX_PATH
|
||||
return urljoin(base + "/", path.lstrip("/"))
|
||||
|
||||
def _new_titles_url(self) -> str:
|
||||
base = self._get_base_url()
|
||||
if not base:
|
||||
return ""
|
||||
path = _get_setting_text(SETTING_NEW_TITLES_PATH, default=DEFAULT_NEW_TITLES_PATH).strip() or "/movies/new"
|
||||
path = DEFAULT_NEW_TITLES_PATH
|
||||
return urljoin(base + "/", path.lstrip("/"))
|
||||
|
||||
def _genres_url(self) -> str:
|
||||
base = self._get_base_url()
|
||||
if not base:
|
||||
return ""
|
||||
path = _get_setting_text(SETTING_GENRES_PATH, default=DEFAULT_GENRES_PATH).strip() or "/genres"
|
||||
path = DEFAULT_GENRES_PATH
|
||||
return urljoin(base + "/", path.lstrip("/"))
|
||||
|
||||
def _api_genres_url(self) -> str:
|
||||
@@ -528,7 +599,7 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
base = self._get_base_url()
|
||||
if not base:
|
||||
return ""
|
||||
path = _get_setting_text(SETTING_SEARCH_PATH, default=DEFAULT_SEARCH_PATH).strip() or "/search"
|
||||
path = DEFAULT_SEARCH_PATH
|
||||
url = urljoin(base + "/", path.lstrip("/"))
|
||||
return f"{url}?{urlencode({'query': query})}"
|
||||
|
||||
@@ -570,9 +641,7 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
base = self._get_base_url()
|
||||
if not base:
|
||||
return ""
|
||||
template = _get_setting_text(SETTING_WATCH_PATH_TEMPLATE, default=DEFAULT_WATCH_PATH_TEMPLATE).strip()
|
||||
if not template:
|
||||
template = DEFAULT_WATCH_PATH_TEMPLATE
|
||||
template = DEFAULT_WATCH_PATH_TEMPLATE
|
||||
try:
|
||||
path = template.format(id=int(movie_id))
|
||||
except Exception:
|
||||
@@ -615,16 +684,11 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if not url:
|
||||
return ""
|
||||
try:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or url, kind="OK")
|
||||
_log_response_html(resp.url or url, resp.text)
|
||||
self._detail_html_by_id[movie_id] = resp.text or ""
|
||||
return resp.text or ""
|
||||
except Exception:
|
||||
_, body = self._http_get_text(url, timeout=20)
|
||||
self._detail_html_by_id[movie_id] = body
|
||||
return body
|
||||
except Exception as exc:
|
||||
_log_error(f"GET {url} failed: {exc}")
|
||||
return ""
|
||||
|
||||
def _fetch_watch_payload(self, movie_id: int) -> dict[str, object]:
|
||||
@@ -635,17 +699,10 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if not url:
|
||||
return {}
|
||||
try:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or url, kind="OK")
|
||||
# Some backends may return JSON with a JSON content-type; for debugging we still dump text.
|
||||
_log_response_html(resp.url or url, resp.text)
|
||||
data = resp.json()
|
||||
return dict(data) if isinstance(data, dict) else {}
|
||||
except Exception:
|
||||
_, data = self._http_get_json(url, timeout=20)
|
||||
return data
|
||||
except Exception as exc:
|
||||
_log_error(f"GET {url} failed: {exc}")
|
||||
return {}
|
||||
|
||||
def _watch_stream_url(self, movie_id: int) -> str:
|
||||
@@ -708,14 +765,8 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if not url:
|
||||
return []
|
||||
try:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or url, kind="OK")
|
||||
_log_response_html(resp.url or url, resp.text)
|
||||
payload = _extract_ng_state_payload(resp.text)
|
||||
_, body = self._http_get_text(url, timeout=20)
|
||||
payload = _extract_ng_state_payload(body)
|
||||
return _parse_ng_state_movies(payload)
|
||||
except Exception:
|
||||
return []
|
||||
@@ -726,14 +777,8 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if not url:
|
||||
return []
|
||||
try:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or url, kind="OK")
|
||||
_log_response_html(resp.url or url, resp.text)
|
||||
payload = _extract_ng_state_payload(resp.text)
|
||||
_, body = self._http_get_text(url, timeout=20)
|
||||
payload = _extract_ng_state_payload(body)
|
||||
movies = _parse_ng_state_movies(payload)
|
||||
_log_debug_line(f"parse_ng_state_movies:count={len(movies)}")
|
||||
if movies:
|
||||
@@ -751,14 +796,8 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if page > 1:
|
||||
url = f"{url}?{urlencode({'page': str(page)})}"
|
||||
try:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or url, kind="OK")
|
||||
_log_response_html(resp.url or url, resp.text)
|
||||
payload = _extract_ng_state_payload(resp.text)
|
||||
_, body = self._http_get_text(url, timeout=20)
|
||||
payload = _extract_ng_state_payload(body)
|
||||
movies, has_more, current_page = _parse_ng_state_movies_with_pagination(payload)
|
||||
_log_debug_line(f"parse_ng_state_movies_page:page={page} count={len(movies)}")
|
||||
if has_more is not None:
|
||||
@@ -811,14 +850,8 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if not url:
|
||||
return []
|
||||
try:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or url, kind="OK")
|
||||
_log_response_html(resp.url or url, resp.text)
|
||||
payload = _extract_ng_state_payload(resp.text)
|
||||
_, body = self._http_get_text(url, timeout=20)
|
||||
payload = _extract_ng_state_payload(body)
|
||||
results = _parse_ng_state_search_results(payload)
|
||||
return _filter_movies_by_title(query, results)
|
||||
except Exception:
|
||||
@@ -834,13 +867,7 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
api_url = self._api_genres_url()
|
||||
if api_url:
|
||||
try:
|
||||
_log_url(api_url, kind="GET")
|
||||
_notify_url(api_url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(api_url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or api_url, kind="OK")
|
||||
payload = resp.json()
|
||||
_, payload = self._http_get_json(api_url, timeout=20)
|
||||
if isinstance(payload, list):
|
||||
parsed: Dict[str, int] = {}
|
||||
for item in payload:
|
||||
@@ -867,14 +894,8 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if not url:
|
||||
return
|
||||
try:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or url, kind="OK")
|
||||
_log_response_html(resp.url or url, resp.text)
|
||||
payload = _extract_ng_state_payload(resp.text)
|
||||
_, body = self._http_get_text(url, timeout=20)
|
||||
payload = _extract_ng_state_payload(body)
|
||||
parsed = _parse_ng_state_genres(payload)
|
||||
if parsed:
|
||||
self._genre_id_by_name.clear()
|
||||
@@ -882,7 +903,7 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
except Exception:
|
||||
return
|
||||
|
||||
async def search_titles(self, query: str) -> List[str]:
|
||||
async def search_titles(self, query: str, progress_callback: ProgressCallback = None) -> List[str]:
|
||||
if not REQUESTS_AVAILABLE:
|
||||
return []
|
||||
query = (query or "").strip()
|
||||
@@ -891,9 +912,12 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if not self._get_base_url():
|
||||
return []
|
||||
|
||||
_emit_progress(progress_callback, "Einschalten Suche", 15)
|
||||
movies = self._fetch_search_movies(query)
|
||||
if not movies:
|
||||
_emit_progress(progress_callback, "Fallback: Index filtern", 45)
|
||||
movies = _filter_movies_by_title(query, self._load_movies())
|
||||
_emit_progress(progress_callback, f"Treffer verarbeiten ({len(movies)})", 75)
|
||||
titles: List[str] = []
|
||||
seen: set[str] = set()
|
||||
for movie in movies:
|
||||
@@ -903,6 +927,7 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
self._id_by_title[movie.title] = movie.id
|
||||
titles.append(movie.title)
|
||||
titles.sort(key=lambda value: value.casefold())
|
||||
_emit_progress(progress_callback, f"Fertig: {len(titles)} Treffer", 95)
|
||||
return titles
|
||||
|
||||
def genres(self) -> List[str]:
|
||||
@@ -938,14 +963,8 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
if not url:
|
||||
return []
|
||||
try:
|
||||
_log_url(url, kind="GET")
|
||||
_notify_url(url)
|
||||
sess = self._get_session()
|
||||
resp = sess.get(url, headers=HEADERS, timeout=20)
|
||||
resp.raise_for_status()
|
||||
_log_url(resp.url or url, kind="OK")
|
||||
_log_response_html(resp.url or url, resp.text)
|
||||
payload = _extract_ng_state_payload(resp.text)
|
||||
_, body = self._http_get_text(url, timeout=20)
|
||||
payload = _extract_ng_state_payload(body)
|
||||
except Exception:
|
||||
return []
|
||||
if not isinstance(payload, dict):
|
||||
@@ -996,21 +1015,17 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
movie_id = self._ensure_title_id(title)
|
||||
if movie_id is not None:
|
||||
self._fetch_movie_detail(movie_id)
|
||||
if _get_setting_bool(SETTING_ENABLE_PLAYBACK, default=False):
|
||||
# Playback: expose a single "Stream" folder (inside: 1 playable item = Filmtitel).
|
||||
return ["Stream"]
|
||||
return ["Details"]
|
||||
# Playback: expose a single "Stream" folder (inside: 1 playable item = Filmtitel).
|
||||
return ["Stream"]
|
||||
|
||||
def episodes_for(self, title: str, season: str) -> List[str]:
|
||||
season = (season or "").strip()
|
||||
if season.casefold() == "stream" and _get_setting_bool(SETTING_ENABLE_PLAYBACK, default=False):
|
||||
if season.casefold() == "stream":
|
||||
title = (title or "").strip()
|
||||
return [title] if title else []
|
||||
return []
|
||||
|
||||
def stream_link_for(self, title: str, season: str, episode: str) -> Optional[str]:
|
||||
if not _get_setting_bool(SETTING_ENABLE_PLAYBACK, default=False):
|
||||
return None
|
||||
title = (title or "").strip()
|
||||
season = (season or "").strip()
|
||||
episode = (episode or "").strip()
|
||||
@@ -1050,3 +1065,7 @@ class EinschaltenPlugin(BasisPlugin):
|
||||
return []
|
||||
# Backwards compatible: first page only. UI uses paging via `new_titles_page`.
|
||||
return self.new_titles_page(1)
|
||||
|
||||
|
||||
# Alias für die automatische Plugin-Erkennung.
|
||||
Plugin = EinschaltenPlugin
|
||||
|
||||
1083
addon/plugins/filmpalast_plugin.py
Normal file
1083
addon/plugins/filmpalast_plugin.py
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -19,8 +19,8 @@ import hashlib
|
||||
import os
|
||||
import re
|
||||
import json
|
||||
from typing import TYPE_CHECKING, Any, Dict, List, Optional, TypeAlias
|
||||
from urllib.parse import urlencode, urljoin
|
||||
from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional
|
||||
from urllib.parse import urljoin
|
||||
|
||||
try: # pragma: no cover - optional dependency
|
||||
import requests
|
||||
@@ -44,23 +44,28 @@ except ImportError: # pragma: no cover - allow running outside Kodi
|
||||
xbmcgui = None
|
||||
|
||||
from plugin_interface import BasisPlugin
|
||||
from plugin_helpers import dump_response_html, get_setting_bool, log_url, notify_url
|
||||
from plugin_helpers import dump_response_html, get_setting_bool, log_error, log_url, notify_url
|
||||
from regex_patterns import DIGITS
|
||||
|
||||
if TYPE_CHECKING: # pragma: no cover
|
||||
from requests import Session as RequestsSession
|
||||
from bs4 import BeautifulSoup as BeautifulSoupT # type: ignore[import-not-found]
|
||||
else: # pragma: no cover
|
||||
RequestsSession: TypeAlias = Any
|
||||
BeautifulSoupT: TypeAlias = Any
|
||||
RequestsSession = Any
|
||||
BeautifulSoupT = Any
|
||||
|
||||
|
||||
ADDON_ID = "plugin.video.viewit"
|
||||
SETTING_BASE_URL = "topstream_base_url"
|
||||
DEFAULT_BASE_URL = "https://www.meineseite"
|
||||
DEFAULT_BASE_URL = "https://topstreamfilm.live"
|
||||
GLOBAL_SETTING_LOG_URLS = "debug_log_urls"
|
||||
GLOBAL_SETTING_DUMP_HTML = "debug_dump_html"
|
||||
GLOBAL_SETTING_SHOW_URL_INFO = "debug_show_url_info"
|
||||
GLOBAL_SETTING_LOG_ERRORS = "debug_log_errors"
|
||||
SETTING_LOG_URLS = "log_urls_topstreamfilm"
|
||||
SETTING_DUMP_HTML = "dump_html_topstreamfilm"
|
||||
SETTING_SHOW_URL_INFO = "show_url_info_topstreamfilm"
|
||||
SETTING_LOG_ERRORS = "log_errors_topstreamfilm"
|
||||
SETTING_GENRE_MAX_PAGES = "topstream_genre_max_pages"
|
||||
DEFAULT_TIMEOUT = 20
|
||||
DEFAULT_PREFERRED_HOSTERS = ["supervideo", "dropload", "voe"]
|
||||
@@ -73,6 +78,16 @@ HEADERS = {
|
||||
"Accept-Language": "de-DE,de;q=0.9,en;q=0.8",
|
||||
"Connection": "keep-alive",
|
||||
}
|
||||
ProgressCallback = Optional[Callable[[str, Optional[int]], Any]]
|
||||
|
||||
|
||||
def _emit_progress(callback: ProgressCallback, message: str, percent: Optional[int] = None) -> None:
|
||||
if not callable(callback):
|
||||
return
|
||||
try:
|
||||
callback(str(message or ""), None if percent is None else int(percent))
|
||||
except Exception:
|
||||
return
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
@@ -82,6 +97,7 @@ class SearchHit:
|
||||
title: str
|
||||
url: str
|
||||
description: str = ""
|
||||
poster: str = ""
|
||||
|
||||
|
||||
def _normalize_search_text(value: str) -> str:
|
||||
@@ -101,10 +117,8 @@ def _matches_query(query: str, *, title: str, description: str) -> bool:
|
||||
normalized_query = _normalize_search_text(query)
|
||||
if not normalized_query:
|
||||
return False
|
||||
haystack = _normalize_search_text(title)
|
||||
if not haystack:
|
||||
return False
|
||||
return normalized_query in haystack
|
||||
haystack = f" {_normalize_search_text(title)} "
|
||||
return f" {normalized_query} " in haystack
|
||||
|
||||
|
||||
def _strip_der_film_suffix(title: str) -> str:
|
||||
@@ -119,7 +133,8 @@ def _strip_der_film_suffix(title: str) -> str:
|
||||
class TopstreamfilmPlugin(BasisPlugin):
|
||||
"""Integration fuer eine HTML-basierte Suchseite."""
|
||||
|
||||
name = "TopStreamFilm"
|
||||
name = "Topstreamfilm"
|
||||
version = "1.0.0"
|
||||
|
||||
def __init__(self) -> None:
|
||||
self._session: RequestsSession | None = None
|
||||
@@ -135,6 +150,7 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
self._season_to_episode_numbers: Dict[tuple[str, str], List[int]] = {}
|
||||
self._episode_title_by_number: Dict[tuple[str, int, int], str] = {}
|
||||
self._detail_html_cache: Dict[str, str] = {}
|
||||
self._title_meta: Dict[str, tuple[str, str]] = {}
|
||||
self._popular_cache: List[str] | None = None
|
||||
self._default_preferred_hosters: List[str] = list(DEFAULT_PREFERRED_HOSTERS)
|
||||
self._preferred_hosters: List[str] = list(self._default_preferred_hosters)
|
||||
@@ -348,20 +364,43 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
return default
|
||||
|
||||
def _notify_url(self, url: str) -> None:
|
||||
notify_url(ADDON_ID, heading=self.name, url=url, enabled_setting_id=GLOBAL_SETTING_SHOW_URL_INFO)
|
||||
notify_url(
|
||||
ADDON_ID,
|
||||
heading=self.name,
|
||||
url=url,
|
||||
enabled_setting_id=GLOBAL_SETTING_SHOW_URL_INFO,
|
||||
plugin_setting_id=SETTING_SHOW_URL_INFO,
|
||||
)
|
||||
|
||||
def _log_url(self, url: str, *, kind: str = "VISIT") -> None:
|
||||
log_url(ADDON_ID, enabled_setting_id=GLOBAL_SETTING_LOG_URLS, log_filename="topstream_urls.log", url=url, kind=kind)
|
||||
log_url(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_URLS,
|
||||
plugin_setting_id=SETTING_LOG_URLS,
|
||||
log_filename="topstream_urls.log",
|
||||
url=url,
|
||||
kind=kind,
|
||||
)
|
||||
|
||||
def _log_response_html(self, url: str, body: str) -> None:
|
||||
dump_response_html(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_DUMP_HTML,
|
||||
plugin_setting_id=SETTING_DUMP_HTML,
|
||||
url=url,
|
||||
body=body,
|
||||
filename_prefix="topstream_response",
|
||||
)
|
||||
|
||||
def _log_error(self, message: str) -> None:
|
||||
log_error(
|
||||
ADDON_ID,
|
||||
enabled_setting_id=GLOBAL_SETTING_LOG_ERRORS,
|
||||
plugin_setting_id=SETTING_LOG_ERRORS,
|
||||
log_filename="topstream_errors.log",
|
||||
message=message,
|
||||
)
|
||||
|
||||
def capabilities(self) -> set[str]:
|
||||
return {"genres", "popular_series"}
|
||||
|
||||
@@ -392,6 +431,7 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
continue
|
||||
seen.add(hit.title)
|
||||
self._title_to_url[hit.title] = hit.url
|
||||
self._store_title_meta(hit.title, plot=hit.description, poster=hit.poster)
|
||||
titles.append(hit.title)
|
||||
if titles:
|
||||
self._save_title_url_cache()
|
||||
@@ -450,6 +490,69 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
except Exception:
|
||||
return ""
|
||||
|
||||
def _pick_image_from_node(self, node: Any) -> str:
|
||||
if node is None:
|
||||
return ""
|
||||
image = node.select_one("img")
|
||||
if image is None:
|
||||
return ""
|
||||
for attr in ("data-src", "src"):
|
||||
value = (image.get(attr) or "").strip()
|
||||
if value and "lazy_placeholder" not in value.casefold():
|
||||
return self._absolute_external_url(value, base=self._get_base_url())
|
||||
srcset = (image.get("data-srcset") or image.get("srcset") or "").strip()
|
||||
if srcset:
|
||||
first = srcset.split(",")[0].strip().split(" ", 1)[0].strip()
|
||||
if first:
|
||||
return self._absolute_external_url(first, base=self._get_base_url())
|
||||
return ""
|
||||
|
||||
def _store_title_meta(self, title: str, *, plot: str = "", poster: str = "") -> None:
|
||||
title = (title or "").strip()
|
||||
if not title:
|
||||
return
|
||||
old_plot, old_poster = self._title_meta.get(title, ("", ""))
|
||||
merged_plot = (plot or old_plot or "").strip()
|
||||
merged_poster = (poster or old_poster or "").strip()
|
||||
self._title_meta[title] = (merged_plot, merged_poster)
|
||||
|
||||
def _extract_detail_metadata(self, soup: BeautifulSoupT) -> tuple[str, str]:
|
||||
if not soup:
|
||||
return "", ""
|
||||
plot = ""
|
||||
poster = ""
|
||||
for selector in ("meta[property='og:description']", "meta[name='description']"):
|
||||
node = soup.select_one(selector)
|
||||
if node is None:
|
||||
continue
|
||||
content = (node.get("content") or "").strip()
|
||||
if content:
|
||||
plot = content
|
||||
break
|
||||
if not plot:
|
||||
candidates: list[str] = []
|
||||
for paragraph in soup.select("article p, .TPost p, .Description p, .entry-content p"):
|
||||
text = (paragraph.get_text(" ", strip=True) or "").strip()
|
||||
if len(text) >= 60:
|
||||
candidates.append(text)
|
||||
if candidates:
|
||||
plot = max(candidates, key=len)
|
||||
|
||||
for selector in ("meta[property='og:image']", "meta[name='twitter:image']"):
|
||||
node = soup.select_one(selector)
|
||||
if node is None:
|
||||
continue
|
||||
content = (node.get("content") or "").strip()
|
||||
if content:
|
||||
poster = self._absolute_external_url(content, base=self._get_base_url())
|
||||
break
|
||||
if not poster:
|
||||
for selector in ("article", ".TPost", ".entry-content"):
|
||||
poster = self._pick_image_from_node(soup.select_one(selector))
|
||||
if poster:
|
||||
break
|
||||
return plot, poster
|
||||
|
||||
def _clear_stream_index_for_title(self, title: str) -> None:
|
||||
for key in list(self._season_to_episode_numbers.keys()):
|
||||
if key[0] == title:
|
||||
@@ -557,11 +660,25 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
session = self._get_session()
|
||||
self._log_url(url, kind="VISIT")
|
||||
self._notify_url(url)
|
||||
response = session.get(url, timeout=DEFAULT_TIMEOUT)
|
||||
response.raise_for_status()
|
||||
self._log_url(response.url, kind="OK")
|
||||
self._log_response_html(response.url, response.text)
|
||||
return BeautifulSoup(response.text, "html.parser")
|
||||
response = None
|
||||
try:
|
||||
response = session.get(url, timeout=DEFAULT_TIMEOUT)
|
||||
response.raise_for_status()
|
||||
except Exception as exc:
|
||||
self._log_error(f"GET {url} failed: {exc}")
|
||||
raise
|
||||
try:
|
||||
final_url = (response.url or url) if response is not None else url
|
||||
body = (response.text or "") if response is not None else ""
|
||||
self._log_url(final_url, kind="OK")
|
||||
self._log_response_html(final_url, body)
|
||||
return BeautifulSoup(body, "html.parser")
|
||||
finally:
|
||||
if response is not None:
|
||||
try:
|
||||
response.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
def _get_detail_soup(self, title: str) -> Optional[BeautifulSoupT]:
|
||||
title = (title or "").strip()
|
||||
@@ -670,7 +787,17 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
continue
|
||||
if is_movie_hint:
|
||||
self._movie_title_hint.add(title)
|
||||
hits.append(SearchHit(title=title, url=self._absolute_url(href), description=""))
|
||||
description_tag = item.select_one(".TPMvCn .Description, .Description, .entry-summary")
|
||||
description = (description_tag.get_text(" ", strip=True) or "").strip() if description_tag else ""
|
||||
poster = self._pick_image_from_node(item)
|
||||
hits.append(
|
||||
SearchHit(
|
||||
title=title,
|
||||
url=self._absolute_url(href),
|
||||
description=description,
|
||||
poster=poster,
|
||||
)
|
||||
)
|
||||
return hits
|
||||
|
||||
def is_movie(self, title: str) -> bool:
|
||||
@@ -743,6 +870,7 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
continue
|
||||
seen.add(hit.title)
|
||||
self._title_to_url[hit.title] = hit.url
|
||||
self._store_title_meta(hit.title, plot=hit.description, poster=hit.poster)
|
||||
titles.append(hit.title)
|
||||
if titles:
|
||||
self._save_title_url_cache()
|
||||
@@ -783,7 +911,7 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
# Sonst: Serie via Streams-Accordion parsen (falls vorhanden).
|
||||
self._parse_stream_accordion(soup, title=title)
|
||||
|
||||
async def search_titles(self, query: str) -> List[str]:
|
||||
async def search_titles(self, query: str, progress_callback: ProgressCallback = None) -> List[str]:
|
||||
"""Sucht Titel ueber eine HTML-Suche.
|
||||
|
||||
Erwartetes HTML (Snippet):
|
||||
@@ -796,6 +924,7 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
query = (query or "").strip()
|
||||
if not query:
|
||||
return []
|
||||
_emit_progress(progress_callback, "Topstreamfilm Suche", 15)
|
||||
|
||||
session = self._get_session()
|
||||
url = self._get_base_url() + "/"
|
||||
@@ -803,21 +932,39 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
request_url = f"{url}?{urlencode(params)}"
|
||||
self._log_url(request_url, kind="GET")
|
||||
self._notify_url(request_url)
|
||||
response = session.get(
|
||||
url,
|
||||
params=params,
|
||||
timeout=DEFAULT_TIMEOUT,
|
||||
)
|
||||
response.raise_for_status()
|
||||
self._log_url(response.url, kind="OK")
|
||||
self._log_response_html(response.url, response.text)
|
||||
response = None
|
||||
try:
|
||||
response = session.get(
|
||||
url,
|
||||
params=params,
|
||||
timeout=DEFAULT_TIMEOUT,
|
||||
)
|
||||
response.raise_for_status()
|
||||
except Exception as exc:
|
||||
self._log_error(f"GET {request_url} failed: {exc}")
|
||||
raise
|
||||
try:
|
||||
final_url = (response.url or request_url) if response is not None else request_url
|
||||
body = (response.text or "") if response is not None else ""
|
||||
self._log_url(final_url, kind="OK")
|
||||
self._log_response_html(final_url, body)
|
||||
|
||||
if BeautifulSoup is None:
|
||||
return []
|
||||
soup = BeautifulSoup(response.text, "html.parser")
|
||||
if BeautifulSoup is None:
|
||||
return []
|
||||
soup = BeautifulSoup(body, "html.parser")
|
||||
finally:
|
||||
if response is not None:
|
||||
try:
|
||||
response.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
hits: List[SearchHit] = []
|
||||
for item in soup.select("li.TPostMv"):
|
||||
items = soup.select("li.TPostMv")
|
||||
total_items = max(1, len(items))
|
||||
for idx, item in enumerate(items, start=1):
|
||||
if idx == 1 or idx % 20 == 0:
|
||||
_emit_progress(progress_callback, f"Treffer pruefen {idx}/{total_items}", 55)
|
||||
anchor = item.select_one("a[href]")
|
||||
if not anchor:
|
||||
continue
|
||||
@@ -835,7 +982,8 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
self._movie_title_hint.add(title)
|
||||
description_tag = item.select_one(".TPMvCn .Description")
|
||||
description = description_tag.get_text(" ", strip=True) if description_tag else ""
|
||||
hit = SearchHit(title=title, url=self._absolute_url(href), description=description)
|
||||
poster = self._pick_image_from_node(item)
|
||||
hit = SearchHit(title=title, url=self._absolute_url(href), description=description, poster=poster)
|
||||
if _matches_query(query, title=hit.title, description=hit.description):
|
||||
hits.append(hit)
|
||||
|
||||
@@ -848,10 +996,41 @@ class TopstreamfilmPlugin(BasisPlugin):
|
||||
continue
|
||||
seen.add(hit.title)
|
||||
self._title_to_url[hit.title] = hit.url
|
||||
self._store_title_meta(hit.title, plot=hit.description, poster=hit.poster)
|
||||
titles.append(hit.title)
|
||||
self._save_title_url_cache()
|
||||
_emit_progress(progress_callback, f"Fertig: {len(titles)} Treffer", 95)
|
||||
return titles
|
||||
|
||||
def metadata_for(self, title: str) -> tuple[dict[str, str], dict[str, str], list[object] | None]:
|
||||
title = (title or "").strip()
|
||||
if not title:
|
||||
return {}, {}, None
|
||||
|
||||
info: dict[str, str] = {"title": title}
|
||||
art: dict[str, str] = {}
|
||||
|
||||
cached_plot, cached_poster = self._title_meta.get(title, ("", ""))
|
||||
if cached_plot:
|
||||
info["plot"] = cached_plot
|
||||
if cached_poster:
|
||||
art = {"thumb": cached_poster, "poster": cached_poster}
|
||||
|
||||
if "plot" in info and art:
|
||||
return info, art, None
|
||||
|
||||
soup = self._get_detail_soup(title)
|
||||
if soup is None:
|
||||
return info, art, None
|
||||
|
||||
plot, poster = self._extract_detail_metadata(soup)
|
||||
if plot:
|
||||
info["plot"] = plot
|
||||
if poster:
|
||||
art = {"thumb": poster, "poster": poster}
|
||||
self._store_title_meta(title, plot=plot, poster=poster)
|
||||
return info, art, None
|
||||
|
||||
def genres(self) -> List[str]:
|
||||
if not REQUESTS_AVAILABLE or BeautifulSoup is None:
|
||||
return []
|
||||
|
||||
@@ -1,36 +1,90 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<settings>
|
||||
<category label="Allgemein">
|
||||
<setting id="debug_log_urls" type="bool" label="Debug: URL-Log aktivieren (global)" default="false" />
|
||||
<setting id="debug_dump_html" type="bool" label="Debug: HTML-Antworten speichern (global)" default="false" />
|
||||
<setting id="debug_show_url_info" type="bool" label="Debug: Aufgerufene URL anzeigen (global)" default="false" />
|
||||
<category label="Debug und Logs">
|
||||
<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" />
|
||||
<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" />
|
||||
<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="Topstreamfilm: URLs mitschreiben" default="false" />
|
||||
<setting id="dump_html_topstreamfilm" type="bool" label="Topstreamfilm: HTML speichern" default="false" />
|
||||
<setting id="show_url_info_topstreamfilm" type="bool" label="Topstreamfilm: Aktuelle URL anzeigen" default="false" />
|
||||
<setting id="log_errors_topstreamfilm" type="bool" label="Topstreamfilm: 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="TopStream">
|
||||
<setting id="topstream_base_url" type="text" label="Basis-URL (z.B. https://www.meineseite)" default="https://www.meineseite" />
|
||||
<setting id="topstream_genre_max_pages" type="number" label="Genres: max. Seiten laden (Pagination)" default="20" />
|
||||
<setting id="topstream_base_url" type="text" label="Basis-URL" default="https://topstreamfilm.live" />
|
||||
<setting id="topstreamfilm_metadata_source" type="enum" label="Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
|
||||
<setting id="topstream_genre_max_pages" type="number" label="Genres: max. Seiten laden" default="20" />
|
||||
</category>
|
||||
<category label="SerienStream">
|
||||
<setting id="serienstream_base_url" type="text" label="Basis-URL" default="https://s.to" />
|
||||
<setting id="serienstream_metadata_source" type="enum" label="Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
|
||||
</category>
|
||||
<category label="AniWorld">
|
||||
<setting id="aniworld_base_url" type="text" label="Basis-URL" default="https://aniworld.to" />
|
||||
<setting id="aniworld_metadata_source" type="enum" label="Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
|
||||
</category>
|
||||
<category label="Einschalten">
|
||||
<setting id="einschalten_base_url" type="text" label="Basis-URL (nur eigene/autorisiert betriebene Quelle)" default="" />
|
||||
<setting id="einschalten_index_path" type="text" label="Index-Pfad (z.B. /)" default="/" />
|
||||
<setting id="einschalten_new_titles_path" type="text" label="Neue-Titel-Pfad (z.B. /movies/new)" default="/movies/new" />
|
||||
<setting id="einschalten_search_path" type="text" label="Suche-Pfad (z.B. /search)" default="/search" />
|
||||
<setting id="einschalten_genres_path" type="text" label="Genres-Pfad (z.B. /genres)" default="/genres" />
|
||||
<setting id="einschalten_enable_playback" type="bool" label="Wiedergabe aktivieren (nur autorisierte Quellen)" default="false" />
|
||||
<setting id="einschalten_watch_path_template" type="text" label="Watch-Pfad-Template (z.B. /api/movies/{id}/watch)" default="/api/movies/{id}/watch" />
|
||||
<setting id="einschalten_base_url" type="text" label="Basis-URL" default="https://einschalten.in" />
|
||||
<setting id="einschalten_metadata_source" type="enum" label="Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
|
||||
</category>
|
||||
<category label="Filmpalast">
|
||||
<setting id="filmpalast_base_url" type="text" label="Basis-URL" default="https://filmpalast.to" />
|
||||
<setting id="filmpalast_metadata_source" type="enum" label="Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
|
||||
</category>
|
||||
<category label="Doku-Streams">
|
||||
<setting id="doku_streams_base_url" type="text" label="Basis-URL" default="https://doku-streams.com" />
|
||||
<setting id="doku_streams_metadata_source" type="enum" label="Metadatenquelle" default="0" values="Automatisch|Quelle|TMDB|Mischen" />
|
||||
</category>
|
||||
<category label="TMDB">
|
||||
<setting id="tmdb_enabled" type="bool" label="TMDB aktivieren" default="true" />
|
||||
<setting id="tmdb_api_key" type="text" label="TMDB API Key" default="" />
|
||||
<setting id="tmdb_language" type="text" label="TMDB Sprache (z.B. de-DE)" default="de-DE" />
|
||||
<setting id="tmdb_prefetch_concurrency" type="number" label="TMDB: Parallelität (Prefetch, 1-20)" default="6" />
|
||||
<setting id="tmdb_show_plot" type="bool" label="TMDB Plot anzeigen" default="true" />
|
||||
<setting id="tmdb_show_art" type="bool" label="TMDB Poster/Thumb anzeigen" default="true" />
|
||||
<setting id="tmdb_language" type="text" label="TMDB Sprache (z. B. de-DE)" default="de-DE" />
|
||||
<setting id="tmdb_prefetch_concurrency" type="number" label="TMDB: gleichzeitige Anfragen (1-20)" default="6" />
|
||||
<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 Rating anzeigen" default="true" />
|
||||
<setting id="tmdb_show_votes" type="bool" label="TMDB Vote-Count anzeigen" default="false" />
|
||||
<setting id="tmdb_show_cast" type="bool" label="TMDB Cast anzeigen" default="false" />
|
||||
<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" />
|
||||
<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 Meta in Genre-Liste anzeigen" default="false" />
|
||||
<setting id="tmdb_log_requests" type="bool" label="TMDB API Requests loggen" default="false" />
|
||||
<setting id="tmdb_log_responses" type="bool" label="TMDB API Antworten loggen" 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>
|
||||
<category label="Update">
|
||||
<setting id="update_channel" type="enum" label="Update-Kanal" default="0" values="Main|Nightly|Custom" />
|
||||
<setting id="auto_update_enabled" type="bool" label="Automatische Updates (beim Start pruefen)" default="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" type="text" label="Custom URL (addons.xml)" default="https://gitea.it-drui.de/viewit/ViewIT-Kodi-Repo/raw/branch/main/addons.xml" />
|
||||
<setting id="auto_update_last_ts" type="text" label="Auto-Update letzte Pruefung (intern)" default="0" visible="false" />
|
||||
<setting id="run_update_check" type="action" label="Jetzt nach Updates suchen" action="RunPlugin(plugin://plugin.video.viewit/?action=check_updates)" option="close" />
|
||||
<setting id="update_info" type="text" label="Updates laufen ueber den normalen Kodi-Update-Mechanismus." default="" enable="false" />
|
||||
<setting id="update_version_addon" type="text" label="ViewIT Version" default="-" enable="false" />
|
||||
<setting id="update_version_serienstream" type="text" label="Serienstream Version" default="-" enable="false" />
|
||||
<setting id="update_version_aniworld" type="text" label="Aniworld Version" default="-" enable="false" />
|
||||
<setting id="update_version_einschalten" type="text" label="Einschalten Version" default="-" enable="false" />
|
||||
<setting id="update_version_topstreamfilm" type="text" label="Topstreamfilm Version" default="-" enable="false" />
|
||||
<setting id="update_version_filmpalast" type="text" label="Filmpalast Version" default="-" enable="false" />
|
||||
<setting id="update_version_doku_streams" type="text" label="Doku-Streams Version" default="-" enable="false" />
|
||||
</category>
|
||||
</settings>
|
||||
|
||||
167
addon/tmdb.py
167
addon/tmdb.py
@@ -14,6 +14,7 @@ except ImportError: # pragma: no cover
|
||||
|
||||
TMDB_API_BASE = "https://api.themoviedb.org/3"
|
||||
TMDB_IMAGE_BASE = "https://image.tmdb.org/t/p"
|
||||
MAX_CAST_MEMBERS = 30
|
||||
_TMDB_THREAD_LOCAL = threading.local()
|
||||
|
||||
|
||||
@@ -73,53 +74,17 @@ def _fetch_credits(
|
||||
return []
|
||||
params = {"api_key": api_key, "language": (language or "de-DE").strip()}
|
||||
url = f"{TMDB_API_BASE}/{kind}/{tmdb_id}/credits?{urlencode(params)}"
|
||||
if callable(log):
|
||||
log(f"TMDB GET {url}")
|
||||
try:
|
||||
response = requests.get(url, timeout=timeout)
|
||||
except Exception as exc: # pragma: no cover
|
||||
if callable(log):
|
||||
log(f"TMDB ERROR /{kind}/{{id}}/credits request_failed error={exc!r}")
|
||||
return []
|
||||
status = getattr(response, "status_code", None)
|
||||
status, payload, body_text = _tmdb_get_json(url=url, timeout=timeout, log=log, log_responses=log_responses)
|
||||
if callable(log):
|
||||
log(f"TMDB RESPONSE /{kind}/{{id}}/credits status={status}")
|
||||
if status != 200:
|
||||
if log_responses and payload is None and body_text:
|
||||
log(f"TMDB RESPONSE_BODY /{kind}/{{id}}/credits body={body_text[:2000]}")
|
||||
if status != 200 or not isinstance(payload, dict):
|
||||
return []
|
||||
try:
|
||||
payload = response.json() or {}
|
||||
except Exception:
|
||||
return []
|
||||
if callable(log) and log_responses:
|
||||
try:
|
||||
dumped = json.dumps(payload, ensure_ascii=False)
|
||||
except Exception:
|
||||
dumped = str(payload)
|
||||
log(f"TMDB RESPONSE_BODY /{kind}/{{id}}/credits body={dumped[:2000]}")
|
||||
|
||||
cast_payload = payload.get("cast") or []
|
||||
if callable(log):
|
||||
log(f"TMDB CREDITS /{kind}/{{id}}/credits cast={len(cast_payload)}")
|
||||
with_images: List[TmdbCastMember] = []
|
||||
without_images: List[TmdbCastMember] = []
|
||||
for entry in cast_payload:
|
||||
name = (entry.get("name") or "").strip()
|
||||
role = (entry.get("character") or "").strip()
|
||||
thumb = _image_url(entry.get("profile_path") or "", size="w185")
|
||||
if not name:
|
||||
continue
|
||||
member = TmdbCastMember(name=name, role=role, thumb=thumb)
|
||||
if thumb:
|
||||
with_images.append(member)
|
||||
else:
|
||||
without_images.append(member)
|
||||
|
||||
# Viele Kodi-Skins zeigen bei fehlendem Thumbnail Platzhalter-Köpfe.
|
||||
# Bevorzugt daher Cast-Einträge mit Bild; nur wenn gar keine Bilder existieren,
|
||||
# geben wir Namen ohne Bild zurück.
|
||||
if with_images:
|
||||
return with_images[:30]
|
||||
return without_images[:30]
|
||||
return _parse_cast_payload(cast_payload)
|
||||
|
||||
|
||||
def _parse_cast_payload(cast_payload: object) -> List[TmdbCastMember]:
|
||||
@@ -141,8 +106,8 @@ def _parse_cast_payload(cast_payload: object) -> List[TmdbCastMember]:
|
||||
else:
|
||||
without_images.append(member)
|
||||
if with_images:
|
||||
return with_images[:30]
|
||||
return without_images[:30]
|
||||
return with_images[:MAX_CAST_MEMBERS]
|
||||
return without_images[:MAX_CAST_MEMBERS]
|
||||
|
||||
|
||||
def _tmdb_get_json(
|
||||
@@ -163,23 +128,29 @@ def _tmdb_get_json(
|
||||
if callable(log):
|
||||
log(f"TMDB GET {url}")
|
||||
sess = session or _get_tmdb_session() or requests.Session()
|
||||
response = None
|
||||
try:
|
||||
response = sess.get(url, timeout=timeout)
|
||||
status = getattr(response, "status_code", None)
|
||||
payload: object | None = None
|
||||
body_text = ""
|
||||
try:
|
||||
payload = response.json()
|
||||
except Exception:
|
||||
try:
|
||||
body_text = (response.text or "").strip()
|
||||
except Exception:
|
||||
body_text = ""
|
||||
except Exception as exc: # pragma: no cover
|
||||
if callable(log):
|
||||
log(f"TMDB ERROR request_failed url={url} error={exc!r}")
|
||||
return None, None, ""
|
||||
|
||||
status = getattr(response, "status_code", None)
|
||||
payload: object | None = None
|
||||
body_text = ""
|
||||
try:
|
||||
payload = response.json()
|
||||
except Exception:
|
||||
try:
|
||||
body_text = (response.text or "").strip()
|
||||
except Exception:
|
||||
body_text = ""
|
||||
finally:
|
||||
if response is not None:
|
||||
try:
|
||||
response.close()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if callable(log):
|
||||
log(f"TMDB RESPONSE status={status} url={url}")
|
||||
@@ -214,49 +185,17 @@ def fetch_tv_episode_credits(
|
||||
return []
|
||||
params = {"api_key": api_key, "language": (language or "de-DE").strip()}
|
||||
url = f"{TMDB_API_BASE}/tv/{tmdb_id}/season/{season_number}/episode/{episode_number}/credits?{urlencode(params)}"
|
||||
if callable(log):
|
||||
log(f"TMDB GET {url}")
|
||||
try:
|
||||
response = requests.get(url, timeout=timeout)
|
||||
except Exception as exc: # pragma: no cover
|
||||
if callable(log):
|
||||
log(f"TMDB ERROR /tv/{{id}}/season/{{n}}/episode/{{e}}/credits request_failed error={exc!r}")
|
||||
return []
|
||||
status = getattr(response, "status_code", None)
|
||||
status, payload, body_text = _tmdb_get_json(url=url, timeout=timeout, log=log, log_responses=log_responses)
|
||||
if callable(log):
|
||||
log(f"TMDB RESPONSE /tv/{{id}}/season/{{n}}/episode/{{e}}/credits status={status}")
|
||||
if status != 200:
|
||||
if log_responses and payload is None and body_text:
|
||||
log(f"TMDB RESPONSE_BODY /tv/{{id}}/season/{{n}}/episode/{{e}}/credits body={body_text[:2000]}")
|
||||
if status != 200 or not isinstance(payload, dict):
|
||||
return []
|
||||
try:
|
||||
payload = response.json() or {}
|
||||
except Exception:
|
||||
return []
|
||||
if callable(log) and log_responses:
|
||||
try:
|
||||
dumped = json.dumps(payload, ensure_ascii=False)
|
||||
except Exception:
|
||||
dumped = str(payload)
|
||||
log(f"TMDB RESPONSE_BODY /tv/{{id}}/season/{{n}}/episode/{{e}}/credits body={dumped[:2000]}")
|
||||
|
||||
cast_payload = payload.get("cast") or []
|
||||
if callable(log):
|
||||
log(f"TMDB CREDITS /tv/{{id}}/season/{{n}}/episode/{{e}}/credits cast={len(cast_payload)}")
|
||||
with_images: List[TmdbCastMember] = []
|
||||
without_images: List[TmdbCastMember] = []
|
||||
for entry in cast_payload:
|
||||
name = (entry.get("name") or "").strip()
|
||||
role = (entry.get("character") or "").strip()
|
||||
thumb = _image_url(entry.get("profile_path") or "", size="w185")
|
||||
if not name:
|
||||
continue
|
||||
member = TmdbCastMember(name=name, role=role, thumb=thumb)
|
||||
if thumb:
|
||||
with_images.append(member)
|
||||
else:
|
||||
without_images.append(member)
|
||||
if with_images:
|
||||
return with_images[:30]
|
||||
return without_images[:30]
|
||||
return _parse_cast_payload(cast_payload)
|
||||
|
||||
|
||||
def lookup_tv_show(
|
||||
@@ -546,27 +485,13 @@ def lookup_tv_season_summary(
|
||||
|
||||
params = {"api_key": api_key, "language": (language or "de-DE").strip()}
|
||||
url = f"{TMDB_API_BASE}/tv/{tmdb_id}/season/{season_number}?{urlencode(params)}"
|
||||
if callable(log):
|
||||
log(f"TMDB GET {url}")
|
||||
try:
|
||||
response = requests.get(url, timeout=timeout)
|
||||
except Exception:
|
||||
return None
|
||||
status = getattr(response, "status_code", None)
|
||||
status, payload, body_text = _tmdb_get_json(url=url, timeout=timeout, log=log, log_responses=log_responses)
|
||||
if callable(log):
|
||||
log(f"TMDB RESPONSE /tv/{{id}}/season/{{n}} status={status}")
|
||||
if status != 200:
|
||||
if log_responses and payload is None and body_text:
|
||||
log(f"TMDB RESPONSE_BODY /tv/{{id}}/season/{{n}} body={body_text[:2000]}")
|
||||
if status != 200 or not isinstance(payload, dict):
|
||||
return None
|
||||
try:
|
||||
payload = response.json() or {}
|
||||
except Exception:
|
||||
return None
|
||||
if callable(log) and log_responses:
|
||||
try:
|
||||
dumped = json.dumps(payload, ensure_ascii=False)
|
||||
except Exception:
|
||||
dumped = str(payload)
|
||||
log(f"TMDB RESPONSE_BODY /tv/{{id}}/season/{{n}} body={dumped[:2000]}")
|
||||
|
||||
plot = (payload.get("overview") or "").strip()
|
||||
poster_path = (payload.get("poster_path") or "").strip()
|
||||
@@ -594,27 +519,9 @@ def lookup_tv_season(
|
||||
return None
|
||||
params = {"api_key": api_key, "language": (language or "de-DE").strip()}
|
||||
url = f"{TMDB_API_BASE}/tv/{tmdb_id}/season/{season_number}?{urlencode(params)}"
|
||||
if callable(log):
|
||||
log(f"TMDB GET {url}")
|
||||
try:
|
||||
response = requests.get(url, timeout=timeout)
|
||||
except Exception as exc: # pragma: no cover
|
||||
if callable(log):
|
||||
log(f"TMDB ERROR /tv/{{id}}/season/{{n}} request_failed error={exc!r}")
|
||||
return None
|
||||
|
||||
status = getattr(response, "status_code", None)
|
||||
payload = None
|
||||
body_text = ""
|
||||
try:
|
||||
payload = response.json() or {}
|
||||
except Exception:
|
||||
try:
|
||||
body_text = (response.text or "").strip()
|
||||
except Exception:
|
||||
body_text = ""
|
||||
|
||||
episodes = (payload or {}).get("episodes") or []
|
||||
status, payload, body_text = _tmdb_get_json(url=url, timeout=timeout, log=log, log_responses=log_responses)
|
||||
episodes = (payload or {}).get("episodes") if isinstance(payload, dict) else []
|
||||
episodes = episodes or []
|
||||
if callable(log):
|
||||
log(f"TMDB RESPONSE /tv/{{id}}/season/{{n}} status={status} episodes={len(episodes)}")
|
||||
if log_responses:
|
||||
|
||||
49
docs/DEFAULT_ROUTER.md
Normal file
49
docs/DEFAULT_ROUTER.md
Normal file
@@ -0,0 +1,49 @@
|
||||
# ViewIT Hauptlogik (`addon/default.py`)
|
||||
|
||||
Diese Datei ist der Router des Addons.
|
||||
Sie verbindet Kodi UI, Plugin Calls und Playback.
|
||||
|
||||
## Kernaufgabe
|
||||
- Plugins laden
|
||||
- Menues bauen
|
||||
- Aktionen auf Plugin Methoden mappen
|
||||
- Playback starten
|
||||
- Playstate speichern
|
||||
|
||||
## Ablauf
|
||||
1. Plugin Discovery fuer `addon/plugins/*.py` ohne `_` Prefix.
|
||||
2. Navigation fuer Titel, Staffeln und Episoden.
|
||||
3. Playback: Link holen, optional aufloesen, abspielen.
|
||||
4. Playstate: watched und resume in `playstate.json` schreiben.
|
||||
|
||||
## Routing
|
||||
Der Router liest Query Parameter aus `sys.argv[2]`.
|
||||
Typische Aktionen:
|
||||
- `search`
|
||||
- `seasons`
|
||||
- `episodes`
|
||||
- `play_episode`
|
||||
- `play_movie`
|
||||
- `play_episode_url`
|
||||
|
||||
## Playstate
|
||||
- Speicherort: Addon Profilordner, Datei `playstate.json`
|
||||
- Key: Plugin + Titel + Staffel + Episode
|
||||
- Werte: watched, playcount, resume_position, resume_total
|
||||
|
||||
## Wichtige Helper
|
||||
- Plugin Loader und Discovery
|
||||
- UI Builder fuer ListItems
|
||||
- Playstate Load/Save/Merge
|
||||
- TMDB Merge mit Source Fallback
|
||||
|
||||
## Fehlerverhalten
|
||||
- Importfehler pro Plugin werden isoliert behandelt.
|
||||
- Fehler in einem Plugin sollen das Addon nicht stoppen.
|
||||
- User bekommt kurze Fehlermeldungen in Kodi.
|
||||
|
||||
## Erweiterung
|
||||
Fuer neue Aktion im Router:
|
||||
1. Action im `run()` Handler registrieren.
|
||||
2. ListItem mit passenden Parametern bauen.
|
||||
3. Zielmethode im Plugin bereitstellen.
|
||||
85
docs/PLUGIN_DEVELOPMENT.md
Normal file
85
docs/PLUGIN_DEVELOPMENT.md
Normal file
@@ -0,0 +1,85 @@
|
||||
# ViewIT Plugin Entwicklung (`addon/plugins/*_plugin.py`)
|
||||
|
||||
Diese Datei zeigt, wie Plugins im Projekt aufgebaut sind und wie sie mit dem Router zusammenarbeiten.
|
||||
|
||||
## Grundlagen
|
||||
- Ein Plugin ist eine Python Datei in `addon/plugins/`.
|
||||
- Dateien mit `_` Prefix werden nicht geladen.
|
||||
- Plugin Klasse erbt von `BasisPlugin`.
|
||||
- Optional: `Plugin = <Klasse>` als klarer Einstiegspunkt.
|
||||
|
||||
## Pflichtmethoden
|
||||
Jedes Plugin implementiert:
|
||||
- `async search_titles(query: str) -> list[str]`
|
||||
- `seasons_for(title: str) -> list[str]`
|
||||
- `episodes_for(title: str, season: str) -> list[str]`
|
||||
|
||||
## Wichtige optionale Methoden
|
||||
- `stream_link_for(...)`
|
||||
- `resolve_stream_link(...)`
|
||||
- `metadata_for(...)`
|
||||
- `available_hosters_for(...)`
|
||||
- `series_url_for_title(...)`
|
||||
- `remember_series_url(...)`
|
||||
- `episode_url_for(...)`
|
||||
- `available_hosters_for_url(...)`
|
||||
- `stream_link_for_url(...)`
|
||||
|
||||
## Film Provider Standard
|
||||
Wenn keine echten Staffeln existieren:
|
||||
- `seasons_for(title)` gibt `['Film']`
|
||||
- `episodes_for(title, 'Film')` gibt `['Stream']`
|
||||
|
||||
## Capabilities
|
||||
Ein Plugin kann Features melden ueber `capabilities()`.
|
||||
Bekannte Werte:
|
||||
- `popular_series`
|
||||
- `genres`
|
||||
- `latest_episodes`
|
||||
- `new_titles`
|
||||
- `alpha`
|
||||
- `series_catalog`
|
||||
|
||||
## Suche
|
||||
Aktuelle Regeln fuer Suchtreffer:
|
||||
- Match auf Titel
|
||||
- Wortbasiert
|
||||
- Keine Teilwort Treffer im selben Wort
|
||||
- Beschreibungen nicht fuer Match nutzen
|
||||
|
||||
## Settings
|
||||
Pro Plugin meist `*_base_url`.
|
||||
Beispiele:
|
||||
- `serienstream_base_url`
|
||||
- `aniworld_base_url`
|
||||
- `einschalten_base_url`
|
||||
- `topstream_base_url`
|
||||
- `filmpalast_base_url`
|
||||
- `doku_streams_base_url`
|
||||
|
||||
## Playback Flow
|
||||
1. Episode oder Film auswaehlen.
|
||||
2. Optional Hosterliste anzeigen.
|
||||
3. `stream_link_for` oder `stream_link_for_url` aufrufen.
|
||||
4. `resolve_stream_link` aufrufen.
|
||||
5. Finale URL an Kodi geben.
|
||||
|
||||
## Logging
|
||||
Nutze Helper aus `addon/plugin_helpers.py`:
|
||||
- `log_url(...)`
|
||||
- `dump_response_html(...)`
|
||||
- `notify_url(...)`
|
||||
|
||||
## Build und Checks
|
||||
- ZIP: `./scripts/build_kodi_zip.sh`
|
||||
- Addon Ordner: `./scripts/build_install_addon.sh`
|
||||
- Manifest: `python3 scripts/generate_plugin_manifest.py`
|
||||
- Snapshot Checks: `python3 qa/run_plugin_snapshots.py`
|
||||
|
||||
## Kurze Checkliste
|
||||
- `name` gesetzt und korrekt
|
||||
- `*_base_url` in Settings vorhanden
|
||||
- Suche liefert nur passende Titel
|
||||
- Playback Methoden vorhanden
|
||||
- Fehler und Timeouts behandelt
|
||||
- Cache nur da, wo er Zeit spart
|
||||
104
docs/PLUGIN_MANIFEST.json
Normal file
104
docs/PLUGIN_MANIFEST.json
Normal file
@@ -0,0 +1,104 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"plugins": [
|
||||
{
|
||||
"file": "addon/plugins/aniworld_plugin.py",
|
||||
"module": "aniworld_plugin",
|
||||
"name": "Aniworld",
|
||||
"class": "AniworldPlugin",
|
||||
"version": "1.0.0",
|
||||
"capabilities": [
|
||||
"genres",
|
||||
"latest_episodes",
|
||||
"popular_series"
|
||||
],
|
||||
"prefer_source_metadata": false,
|
||||
"base_url_setting": "aniworld_base_url",
|
||||
"available": true,
|
||||
"unavailable_reason": null,
|
||||
"error": null
|
||||
},
|
||||
{
|
||||
"file": "addon/plugins/dokustreams_plugin.py",
|
||||
"module": "dokustreams_plugin",
|
||||
"name": "Doku-Streams",
|
||||
"class": "DokuStreamsPlugin",
|
||||
"version": "1.0.0",
|
||||
"capabilities": [
|
||||
"genres",
|
||||
"popular_series"
|
||||
],
|
||||
"prefer_source_metadata": true,
|
||||
"base_url_setting": "doku_streams_base_url",
|
||||
"available": true,
|
||||
"unavailable_reason": null,
|
||||
"error": null
|
||||
},
|
||||
{
|
||||
"file": "addon/plugins/einschalten_plugin.py",
|
||||
"module": "einschalten_plugin",
|
||||
"name": "Einschalten",
|
||||
"class": "EinschaltenPlugin",
|
||||
"version": "1.0.0",
|
||||
"capabilities": [
|
||||
"genres",
|
||||
"new_titles"
|
||||
],
|
||||
"prefer_source_metadata": false,
|
||||
"base_url_setting": "einschalten_base_url",
|
||||
"available": true,
|
||||
"unavailable_reason": null,
|
||||
"error": null
|
||||
},
|
||||
{
|
||||
"file": "addon/plugins/filmpalast_plugin.py",
|
||||
"module": "filmpalast_plugin",
|
||||
"name": "Filmpalast",
|
||||
"class": "FilmpalastPlugin",
|
||||
"version": "1.0.0",
|
||||
"capabilities": [
|
||||
"alpha",
|
||||
"genres",
|
||||
"series_catalog"
|
||||
],
|
||||
"prefer_source_metadata": false,
|
||||
"base_url_setting": "filmpalast_base_url",
|
||||
"available": true,
|
||||
"unavailable_reason": null,
|
||||
"error": null
|
||||
},
|
||||
{
|
||||
"file": "addon/plugins/serienstream_plugin.py",
|
||||
"module": "serienstream_plugin",
|
||||
"name": "Serienstream",
|
||||
"class": "SerienstreamPlugin",
|
||||
"version": "1.0.0",
|
||||
"capabilities": [
|
||||
"genres",
|
||||
"latest_episodes",
|
||||
"popular_series"
|
||||
],
|
||||
"prefer_source_metadata": false,
|
||||
"base_url_setting": "serienstream_base_url",
|
||||
"available": true,
|
||||
"unavailable_reason": null,
|
||||
"error": null
|
||||
},
|
||||
{
|
||||
"file": "addon/plugins/topstreamfilm_plugin.py",
|
||||
"module": "topstreamfilm_plugin",
|
||||
"name": "Topstreamfilm",
|
||||
"class": "TopstreamfilmPlugin",
|
||||
"version": "1.0.0",
|
||||
"capabilities": [
|
||||
"genres",
|
||||
"popular_series"
|
||||
],
|
||||
"prefer_source_metadata": false,
|
||||
"base_url_setting": "topstream_base_url",
|
||||
"available": true,
|
||||
"unavailable_reason": null,
|
||||
"error": null
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,91 +1,71 @@
|
||||
## ViewIt Plugin-System
|
||||
# ViewIT Plugin System
|
||||
|
||||
Dieses Dokument beschreibt, wie das Plugin-System von **ViewIt** funktioniert und wie die Community neue Integrationen hinzufügen kann.
|
||||
Dieses Dokument beschreibt Laden, Vertrag und Betrieb der Plugins.
|
||||
|
||||
### Überblick
|
||||
## Ueberblick
|
||||
Der Router laedt Provider Integrationen aus `addon/plugins/*.py`.
|
||||
Aktive Plugins werden instanziiert und im UI genutzt.
|
||||
|
||||
ViewIt lädt Provider-Integrationen dynamisch aus `addon/plugins/*.py`. Jede Datei enthält eine Klasse, die von `BasisPlugin` erbt. Beim Start werden alle Plugins instanziiert und nur aktiv genutzt, wenn sie verfügbar sind.
|
||||
Relevante Dateien:
|
||||
- `addon/default.py`
|
||||
- `addon/plugin_interface.py`
|
||||
- `docs/DEFAULT_ROUTER.md`
|
||||
- `docs/PLUGIN_DEVELOPMENT.md`
|
||||
|
||||
### Aktuelle Plugins
|
||||
## Aktuelle Plugins
|
||||
- `serienstream_plugin.py`
|
||||
- `topstreamfilm_plugin.py`
|
||||
- `einschalten_plugin.py`
|
||||
- `aniworld_plugin.py`
|
||||
- `filmpalast_plugin.py`
|
||||
- `dokustreams_plugin.py`
|
||||
- `_template_plugin.py` (Vorlage)
|
||||
|
||||
- `serienstream_plugin.py` – Serienstream (s.to)
|
||||
- `topstreamfilm_plugin.py` – Topstreamfilm
|
||||
- `einschalten_plugin.py` – Einschalten
|
||||
- `aniworld_plugin.py` – Aniworld
|
||||
- `_template_plugin.py` – Vorlage für neue Plugins
|
||||
## Discovery Ablauf
|
||||
In `addon/default.py`:
|
||||
1. Finde `*.py` in `addon/plugins/`
|
||||
2. Ueberspringe Dateien mit `_` Prefix
|
||||
3. Importiere Modul
|
||||
4. Nutze `Plugin = <Klasse>`, falls vorhanden
|
||||
5. Sonst instanziiere `BasisPlugin` Subklassen deterministisch
|
||||
6. Ueberspringe Plugins mit `is_available = False`
|
||||
|
||||
### Plugin-Discovery (Ladeprozess)
|
||||
## Basis Interface
|
||||
`BasisPlugin` definiert den Kern:
|
||||
- `search_titles`
|
||||
- `seasons_for`
|
||||
- `episodes_for`
|
||||
|
||||
Der Loader in `addon/default.py`:
|
||||
Weitere Methoden sind optional und werden nur genutzt, wenn vorhanden.
|
||||
|
||||
1. Sucht alle `*.py` in `addon/plugins/`
|
||||
2. Überspringt Dateien, die mit `_` beginnen
|
||||
3. Lädt Module dynamisch
|
||||
4. Instanziert Klassen, die von `BasisPlugin` erben
|
||||
5. Ignoriert Plugins mit `is_available = False`
|
||||
## Capabilities
|
||||
Plugins koennen Features aktiv melden.
|
||||
Typische Werte:
|
||||
- `popular_series`
|
||||
- `genres`
|
||||
- `latest_episodes`
|
||||
- `new_titles`
|
||||
- `alpha`
|
||||
- `series_catalog`
|
||||
|
||||
Damit bleiben fehlerhafte Plugins isoliert und blockieren nicht das gesamte Add-on.
|
||||
Das UI zeigt nur Menues fuer aktiv gemeldete Features.
|
||||
|
||||
### BasisPlugin – verpflichtende Methoden
|
||||
## Metadaten Quelle
|
||||
`prefer_source_metadata = True` bedeutet:
|
||||
- Quelle zuerst
|
||||
- TMDB nur Fallback
|
||||
|
||||
Definiert in `addon/plugin_interface.py`:
|
||||
## Stabilitaet
|
||||
- Keine Netz Calls im Import Block.
|
||||
- Fehler im Plugin muessen lokal behandelt werden.
|
||||
- Ein defektes Plugin darf andere Plugins nicht blockieren.
|
||||
|
||||
- `async search_titles(query: str) -> list[str]`
|
||||
- `seasons_for(title: str) -> list[str]`
|
||||
- `episodes_for(title: str, season: str) -> list[str]`
|
||||
## Build
|
||||
Kodi ZIP bauen:
|
||||
|
||||
### Optionale Features (Capabilities)
|
||||
|
||||
Plugins können zusätzliche Features anbieten:
|
||||
|
||||
- `capabilities() -> set[str]`
|
||||
- `popular_series`: liefert beliebte Serien
|
||||
- `genres`: Genre-Liste verfügbar
|
||||
- `latest_episodes`: neue Episoden verfügbar
|
||||
- `popular_series() -> list[str]`
|
||||
- `genres() -> list[str]`
|
||||
- `titles_for_genre(genre: str) -> list[str]`
|
||||
- `latest_episodes(page: int = 1) -> list[LatestEpisode]` (wenn angeboten)
|
||||
|
||||
ViewIt zeigt im UI nur die Features an, die ein Plugin tatsächlich liefert.
|
||||
|
||||
### Plugin-Struktur (empfohlen)
|
||||
|
||||
Eine Integration sollte typischerweise bieten:
|
||||
|
||||
- Konstante `BASE_URL`
|
||||
- `search_titles()` mit Provider-Suche
|
||||
- `seasons_for()` und `episodes_for()` mit HTML-Parsing
|
||||
- `stream_link_for()` optional für direkte Playback-Links
|
||||
- Optional: `available_hosters_for()` oder Provider-spezifische Helfer
|
||||
|
||||
Als Startpunkt dient `addon/plugins/_template_plugin.py`.
|
||||
|
||||
### Community-Erweiterungen (Workflow)
|
||||
|
||||
1. Fork/Branch erstellen
|
||||
2. Neue Datei unter `addon/plugins/` hinzufügen (z. B. `meinprovider_plugin.py`)
|
||||
3. Klasse erstellen, die `BasisPlugin` implementiert
|
||||
4. In Kodi testen (ZIP bauen, installieren)
|
||||
5. PR öffnen
|
||||
|
||||
### Qualitätsrichtlinien
|
||||
|
||||
- Keine Netzwerkzugriffe im Import-Top-Level
|
||||
- Netzwerkzugriffe nur in Methoden (z. B. `search_titles`)
|
||||
- Fehler sauber abfangen und verständliche Fehlermeldungen liefern
|
||||
- Kein globaler Zustand, der across instances überrascht
|
||||
- Provider-spezifische Parser in Helper-Funktionen kapseln
|
||||
|
||||
### Debugging & Logs
|
||||
|
||||
Hilfreiche Logs werden nach `userdata/addon_data/plugin.video.viewit/logs/` geschrieben.
|
||||
Provider sollten URL-Logging optional halten (Settings).
|
||||
|
||||
### ZIP-Build
|
||||
|
||||
```
|
||||
```bash
|
||||
./scripts/build_kodi_zip.sh
|
||||
```
|
||||
|
||||
Das ZIP liegt anschließend unter `dist/plugin.video.viewit-<version>.zip`.
|
||||
Ergebnis:
|
||||
`dist/plugin.video.viewit-<version>.zip`
|
||||
|
||||
44
docs/RELEASE.md
Normal file
44
docs/RELEASE.md
Normal file
@@ -0,0 +1,44 @@
|
||||
# Release Flow (Main + Nightly)
|
||||
|
||||
This project uses two release channels:
|
||||
|
||||
- `nightly`: integration and test channel
|
||||
- `main`: stable channel
|
||||
|
||||
## Rules
|
||||
|
||||
- Feature work goes to `nightly` only.
|
||||
- Promote from `nightly` to `main` with `--squash` only.
|
||||
- `main` version has no suffix (`0.1.60`).
|
||||
- `nightly` version uses `-nightly` and is always at least one patch higher than `main` (`0.1.61-nightly`).
|
||||
- Keep changelogs split:
|
||||
- `CHANGELOG-NIGHTLY.md`
|
||||
- `CHANGELOG.md`
|
||||
|
||||
## Nightly publish
|
||||
|
||||
1) Finish changes on `nightly`.
|
||||
2) Bump addon version in `addon/addon.xml` to `X.Y.Z-nightly`.
|
||||
3) Build and publish nightly repo artifacts.
|
||||
4) Push `nightly`.
|
||||
|
||||
## Promote nightly to main
|
||||
|
||||
```bash
|
||||
git checkout main
|
||||
git pull origin main
|
||||
git merge --squash nightly
|
||||
git commit -m "release: X.Y.Z"
|
||||
```
|
||||
|
||||
Then:
|
||||
|
||||
1) Set `addon/addon.xml` version to `X.Y.Z` (without `-nightly`).
|
||||
2) Build and publish main repo artifacts.
|
||||
3) Push `main`.
|
||||
4) Optional tag: `vX.Y.Z`.
|
||||
|
||||
## Local ZIPs (separated)
|
||||
|
||||
- Main ZIP output: `dist/local_zips/main/`
|
||||
- Nightly ZIP output: `dist/local_zips/nightly/`
|
||||
20
pyproject.toml
Normal file
20
pyproject.toml
Normal file
@@ -0,0 +1,20 @@
|
||||
[tool.pytest.ini_options]
|
||||
addopts = "-q --cov=addon --cov-report=term-missing"
|
||||
python_files = ["test_*.py"]
|
||||
norecursedirs = ["scripts"]
|
||||
markers = [
|
||||
"live: real HTTP requests (set LIVE_TESTS=1 to run)",
|
||||
"perf: performance benchmarks",
|
||||
]
|
||||
|
||||
[tool.coverage.run]
|
||||
source = ["addon"]
|
||||
branch = true
|
||||
omit = [
|
||||
"*/__pycache__/*",
|
||||
"addon/resources/*",
|
||||
]
|
||||
|
||||
[tool.coverage.report]
|
||||
show_missing = true
|
||||
skip_empty = true
|
||||
73
qa/plugin_snapshots.json
Normal file
73
qa/plugin_snapshots.json
Normal file
@@ -0,0 +1,73 @@
|
||||
{
|
||||
"snapshots": {
|
||||
"Serienstream::search_titles::trek": [
|
||||
"Star Trek: Lower Decks",
|
||||
"Star Trek: Prodigy",
|
||||
"Star Trek: The Animated Series",
|
||||
"Inside Star Trek",
|
||||
"Raumschiff Enterprise - Star Trek: The Original Series",
|
||||
"Star Trek: Deep Space Nine",
|
||||
"Star Trek: Discovery",
|
||||
"Star Trek: Enterprise",
|
||||
"Star Trek: Picard",
|
||||
"Star Trek: Raumschiff Voyager",
|
||||
"Star Trek: Short Treks",
|
||||
"Star Trek: Starfleet Academy",
|
||||
"Star Trek: Strange New Worlds",
|
||||
"Star Trek: The Next Generation"
|
||||
],
|
||||
"Aniworld::search_titles::naruto": [
|
||||
"Naruto",
|
||||
"Naruto Shippuden",
|
||||
"Boruto: Naruto Next Generations",
|
||||
"Naruto Spin-Off: Rock Lee & His Ninja Pals"
|
||||
],
|
||||
"Topstreamfilm::search_titles::matrix": [
|
||||
"Darkdrive – Verschollen in der Matrix",
|
||||
"Matrix Reloaded",
|
||||
"Armitage III: Poly Matrix",
|
||||
"Matrix Resurrections",
|
||||
"Matrix",
|
||||
"Matrix Revolutions",
|
||||
"Matrix Fighters"
|
||||
],
|
||||
"Einschalten::new_titles_page::1": [
|
||||
"Miracle: Das Eishockeywunder von 1980",
|
||||
"No Escape - Grizzly Night",
|
||||
"Kidnapped: Der Fall Elizabeth Smart",
|
||||
"The Internship",
|
||||
"The Rip",
|
||||
"Die Toten vom Bodensee – Schicksalsrad",
|
||||
"People We Meet on Vacation",
|
||||
"Anaconda",
|
||||
"Even If This Love Disappears Tonight",
|
||||
"Die Stunde der Mutigen",
|
||||
"10DANCE",
|
||||
"SpongeBob Schwammkopf: Piraten Ahoi!",
|
||||
"Ella McCay",
|
||||
"Merv",
|
||||
"Elmo and Mark Rober's Merry Giftmas",
|
||||
"Als mein Vater Weihnachten rettete 2",
|
||||
"Die Fraggles: Der erste Schnee",
|
||||
"Gregs Tagebuch 3: Jetzt reicht's!",
|
||||
"Not Without Hope",
|
||||
"Five Nights at Freddy's 2"
|
||||
],
|
||||
"Filmpalast::search_titles::trek": [
|
||||
"Star Trek",
|
||||
"Star Trek - Der Film",
|
||||
"Star Trek 2 - Der Zorn des Khan",
|
||||
"Star Trek 9 Der Aufstand",
|
||||
"Star Trek: Nemesis",
|
||||
"Star Trek: Section 31",
|
||||
"Star Trek: Starfleet Academy",
|
||||
"Star Trek: Strange New Worlds"
|
||||
],
|
||||
"Doku-Streams::search_titles::japan": [
|
||||
"Deutsche im Knast - Japan und die Disziplin",
|
||||
"Die Meerfrauen von Japan",
|
||||
"Japan - Land der Moderne und Tradition",
|
||||
"Japan im Zweiten Weltkrieg - Der Fall des Kaiserreichs"
|
||||
]
|
||||
}
|
||||
}
|
||||
153
qa/run_plugin_snapshots.py
Executable file
153
qa/run_plugin_snapshots.py
Executable file
@@ -0,0 +1,153 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Run live snapshot checks for plugins.
|
||||
|
||||
Use --update to refresh stored snapshots.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import argparse
|
||||
import asyncio
|
||||
import importlib.util
|
||||
import inspect
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
ROOT_DIR = Path(__file__).resolve().parents[1]
|
||||
PLUGIN_DIR = ROOT_DIR / "addon" / "plugins"
|
||||
SNAPSHOT_PATH = ROOT_DIR / "qa" / "plugin_snapshots.json"
|
||||
|
||||
sys.path.insert(0, str(ROOT_DIR / "addon"))
|
||||
|
||||
try:
|
||||
from plugin_interface import BasisPlugin # type: ignore
|
||||
except Exception as exc: # pragma: no cover
|
||||
raise SystemExit(f"Failed to import BasisPlugin: {exc}")
|
||||
|
||||
CONFIG = [
|
||||
{"plugin": "Serienstream", "method": "search_titles", "args": ["trek"], "max_items": 20},
|
||||
{"plugin": "Aniworld", "method": "search_titles", "args": ["naruto"], "max_items": 20},
|
||||
{"plugin": "Topstreamfilm", "method": "search_titles", "args": ["matrix"], "max_items": 20},
|
||||
{"plugin": "Einschalten", "method": "new_titles_page", "args": [1], "max_items": 20},
|
||||
{"plugin": "Filmpalast", "method": "search_titles", "args": ["trek"], "max_items": 20},
|
||||
{"plugin": "Doku-Streams", "method": "search_titles", "args": ["japan"], "max_items": 20},
|
||||
]
|
||||
|
||||
|
||||
def _import_module(path: Path):
|
||||
spec = importlib.util.spec_from_file_location(path.stem, path)
|
||||
if spec is None or spec.loader is None:
|
||||
raise ImportError(f"Missing spec for {path}")
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
sys.modules[spec.name] = module
|
||||
spec.loader.exec_module(module)
|
||||
return module
|
||||
|
||||
|
||||
def _discover_plugins() -> dict[str, BasisPlugin]:
|
||||
plugins: dict[str, BasisPlugin] = {}
|
||||
for file_path in sorted(PLUGIN_DIR.glob("*.py")):
|
||||
if file_path.name.startswith("_"):
|
||||
continue
|
||||
module = _import_module(file_path)
|
||||
preferred = getattr(module, "Plugin", None)
|
||||
if inspect.isclass(preferred) and issubclass(preferred, BasisPlugin) and preferred is not BasisPlugin:
|
||||
classes = [preferred]
|
||||
else:
|
||||
classes = [
|
||||
obj
|
||||
for obj in module.__dict__.values()
|
||||
if inspect.isclass(obj) and issubclass(obj, BasisPlugin) and obj is not BasisPlugin
|
||||
]
|
||||
classes.sort(key=lambda cls: cls.__name__.casefold())
|
||||
for cls in classes:
|
||||
instance = cls()
|
||||
name = str(getattr(instance, "name", "") or "").strip()
|
||||
if name and name not in plugins:
|
||||
plugins[name] = instance
|
||||
return plugins
|
||||
|
||||
|
||||
def _normalize_titles(value: Any, max_items: int) -> list[str]:
|
||||
if not value:
|
||||
return []
|
||||
titles = [str(item).strip() for item in list(value) if item and str(item).strip()]
|
||||
seen = set()
|
||||
normalized: list[str] = []
|
||||
for title in titles:
|
||||
key = title.casefold()
|
||||
if key in seen:
|
||||
continue
|
||||
seen.add(key)
|
||||
normalized.append(title)
|
||||
if len(normalized) >= max_items:
|
||||
break
|
||||
return normalized
|
||||
|
||||
|
||||
def _snapshot_key(entry: dict[str, Any]) -> str:
|
||||
args = entry.get("args", [])
|
||||
return f"{entry['plugin']}::{entry['method']}::{','.join(str(a) for a in args)}"
|
||||
|
||||
|
||||
def _call_method(plugin: BasisPlugin, method_name: str, args: list[Any]):
|
||||
method = getattr(plugin, method_name, None)
|
||||
if not callable(method):
|
||||
raise RuntimeError(f"Method missing: {method_name}")
|
||||
result = method(*args)
|
||||
if asyncio.iscoroutine(result):
|
||||
return asyncio.run(result)
|
||||
return result
|
||||
|
||||
|
||||
def main() -> int:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("--update", action="store_true")
|
||||
args = parser.parse_args()
|
||||
|
||||
snapshots: dict[str, Any] = {}
|
||||
if SNAPSHOT_PATH.exists():
|
||||
snapshots = json.loads(SNAPSHOT_PATH.read_text(encoding="utf-8"))
|
||||
data = snapshots.get("snapshots", {}) if isinstance(snapshots, dict) else {}
|
||||
if args.update:
|
||||
data = {}
|
||||
|
||||
plugins = _discover_plugins()
|
||||
errors = []
|
||||
|
||||
for entry in CONFIG:
|
||||
plugin_name = entry["plugin"]
|
||||
plugin = plugins.get(plugin_name)
|
||||
if plugin is None:
|
||||
errors.append(f"Plugin missing: {plugin_name}")
|
||||
continue
|
||||
key = _snapshot_key(entry)
|
||||
try:
|
||||
result = _call_method(plugin, entry["method"], entry.get("args", []))
|
||||
normalized = _normalize_titles(result, entry.get("max_items", 20))
|
||||
except Exception as exc:
|
||||
errors.append(f"Snapshot error: {key} ({exc})")
|
||||
if args.update:
|
||||
data[key] = {"error": str(exc)}
|
||||
continue
|
||||
if args.update:
|
||||
data[key] = normalized
|
||||
else:
|
||||
expected = data.get(key)
|
||||
if expected != normalized:
|
||||
errors.append(f"Snapshot mismatch: {key}\nExpected: {expected}\nActual: {normalized}")
|
||||
|
||||
if args.update:
|
||||
SNAPSHOT_PATH.parent.mkdir(parents=True, exist_ok=True)
|
||||
SNAPSHOT_PATH.write_text(json.dumps({"snapshots": data}, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
|
||||
|
||||
if errors:
|
||||
for err in errors:
|
||||
print(err)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
17
repository.viewit/addon.xml
Normal file
17
repository.viewit/addon.xml
Normal file
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<addon id="repository.viewit" name="ViewIT Repository" version="1.0.0" provider-name="ViewIT">
|
||||
<extension point="xbmc.addon.repository" name="ViewIT Repository">
|
||||
<dir>
|
||||
<info compressed="false">http://127.0.0.1:8080/repo/addons.xml</info>
|
||||
<checksum>http://127.0.0.1:8080/repo/addons.xml.md5</checksum>
|
||||
<datadir zip="true">http://127.0.0.1:8080/repo/</datadir>
|
||||
</dir>
|
||||
</extension>
|
||||
<extension point="xbmc.addon.metadata">
|
||||
<summary lang="de_DE">Lokales Repository fuer ViewIT Updates</summary>
|
||||
<summary lang="en_GB">Local repository for ViewIT updates</summary>
|
||||
<description lang="de_DE">Stellt das ViewIT Addon ueber ein Kodi Repository bereit.</description>
|
||||
<description lang="en_GB">Provides the ViewIT addon via a Kodi repository.</description>
|
||||
<platform>all</platform>
|
||||
</extension>
|
||||
</addon>
|
||||
2
requirements-dev.txt
Normal file
2
requirements-dev.txt
Normal file
@@ -0,0 +1,2 @@
|
||||
pytest>=9,<10
|
||||
pytest-cov>=5,<8
|
||||
Binary file not shown.
Binary file not shown.
@@ -37,6 +37,6 @@ ZIP_PATH="${INSTALL_DIR}/${ZIP_NAME}"
|
||||
ADDON_DIR="$("${ROOT_DIR}/scripts/build_install_addon.sh" >/dev/null; echo "${INSTALL_DIR}/${ADDON_ID}")"
|
||||
|
||||
rm -f "${ZIP_PATH}"
|
||||
(cd "${INSTALL_DIR}" && zip -r "${ZIP_NAME}" "$(basename "${ADDON_DIR}")" >/dev/null)
|
||||
python3 "${ROOT_DIR}/scripts/zip_deterministic.py" "${ZIP_PATH}" "${ADDON_DIR}" >/dev/null
|
||||
|
||||
echo "${ZIP_PATH}"
|
||||
|
||||
126
scripts/build_local_kodi_repo.sh
Executable file
126
scripts/build_local_kodi_repo.sh
Executable file
@@ -0,0 +1,126 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
DIST_DIR="${ROOT_DIR}/dist"
|
||||
REPO_DIR="${DIST_DIR}/repo"
|
||||
PLUGIN_ADDON_XML="${ROOT_DIR}/addon/addon.xml"
|
||||
REPO_SRC_DIR="${ROOT_DIR}/repository.viewit"
|
||||
REPO_ADDON_XML="${REPO_SRC_DIR}/addon.xml"
|
||||
REPO_BASE_URL="${REPO_BASE_URL:-http://127.0.0.1:8080/repo}"
|
||||
|
||||
if [[ ! -f "${PLUGIN_ADDON_XML}" ]]; then
|
||||
echo "Missing: ${PLUGIN_ADDON_XML}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ! -f "${REPO_ADDON_XML}" ]]; then
|
||||
echo "Missing: ${REPO_ADDON_XML}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
mkdir -p "${REPO_DIR}"
|
||||
|
||||
read -r ADDON_ID ADDON_VERSION < <(python3 - "${PLUGIN_ADDON_XML}" <<'PY'
|
||||
import sys
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
root = ET.parse(sys.argv[1]).getroot()
|
||||
print(root.attrib.get("id", "plugin.video.viewit"), root.attrib.get("version", "0.0.0"))
|
||||
PY
|
||||
)
|
||||
|
||||
PLUGIN_ZIP="$("${ROOT_DIR}/scripts/build_kodi_zip.sh")"
|
||||
PLUGIN_ZIP_NAME="$(basename "${PLUGIN_ZIP}")"
|
||||
PLUGIN_ADDON_DIR_IN_REPO="${REPO_DIR}/${ADDON_ID}"
|
||||
mkdir -p "${PLUGIN_ADDON_DIR_IN_REPO}"
|
||||
cp -f "${PLUGIN_ZIP}" "${PLUGIN_ADDON_DIR_IN_REPO}/${PLUGIN_ZIP_NAME}"
|
||||
|
||||
read -r REPO_ADDON_ID REPO_ADDON_VERSION < <(python3 - "${REPO_ADDON_XML}" <<'PY'
|
||||
import sys
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
root = ET.parse(sys.argv[1]).getroot()
|
||||
print(root.attrib.get("id", "repository.viewit"), root.attrib.get("version", "0.0.0"))
|
||||
PY
|
||||
)
|
||||
|
||||
TMP_DIR="$(mktemp -d)"
|
||||
trap 'rm -rf "${TMP_DIR}"' EXIT
|
||||
TMP_REPO_ADDON_DIR="${TMP_DIR}/${REPO_ADDON_ID}"
|
||||
mkdir -p "${TMP_REPO_ADDON_DIR}"
|
||||
|
||||
if command -v rsync >/dev/null 2>&1; then
|
||||
rsync -a --delete "${REPO_SRC_DIR}/" "${TMP_REPO_ADDON_DIR}/"
|
||||
else
|
||||
cp -a "${REPO_SRC_DIR}/." "${TMP_REPO_ADDON_DIR}/"
|
||||
fi
|
||||
|
||||
python3 - "${TMP_REPO_ADDON_DIR}/addon.xml" "${REPO_BASE_URL}" <<'PY'
|
||||
import sys
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
addon_xml = sys.argv[1]
|
||||
base_url = sys.argv[2].rstrip("/")
|
||||
|
||||
tree = ET.parse(addon_xml)
|
||||
root = tree.getroot()
|
||||
dir_node = root.find(".//dir")
|
||||
if dir_node is None:
|
||||
raise SystemExit("Invalid repository addon.xml: missing <dir>")
|
||||
|
||||
info = dir_node.find("info")
|
||||
checksum = dir_node.find("checksum")
|
||||
datadir = dir_node.find("datadir")
|
||||
if info is None or checksum is None or datadir is None:
|
||||
raise SystemExit("Invalid repository addon.xml: missing info/checksum/datadir")
|
||||
|
||||
info.text = f"{base_url}/addons.xml"
|
||||
checksum.text = f"{base_url}/addons.xml.md5"
|
||||
datadir.text = f"{base_url}/"
|
||||
|
||||
tree.write(addon_xml, encoding="utf-8", xml_declaration=True)
|
||||
PY
|
||||
|
||||
REPO_ZIP_NAME="${REPO_ADDON_ID}-${REPO_ADDON_VERSION}.zip"
|
||||
REPO_ZIP_PATH="${REPO_DIR}/${REPO_ZIP_NAME}"
|
||||
rm -f "${REPO_ZIP_PATH}"
|
||||
python3 "${ROOT_DIR}/scripts/zip_deterministic.py" "${REPO_ZIP_PATH}" "${TMP_REPO_ADDON_DIR}" >/dev/null
|
||||
REPO_ADDON_DIR_IN_REPO="${REPO_DIR}/${REPO_ADDON_ID}"
|
||||
mkdir -p "${REPO_ADDON_DIR_IN_REPO}"
|
||||
cp -f "${REPO_ZIP_PATH}" "${REPO_ADDON_DIR_IN_REPO}/${REPO_ZIP_NAME}"
|
||||
|
||||
python3 - "${PLUGIN_ADDON_XML}" "${TMP_REPO_ADDON_DIR}/addon.xml" "${REPO_DIR}/addons.xml" <<'PY'
|
||||
import sys
|
||||
import xml.etree.ElementTree as ET
|
||||
from pathlib import Path
|
||||
|
||||
plugin_xml = Path(sys.argv[1])
|
||||
repo_xml = Path(sys.argv[2])
|
||||
target = Path(sys.argv[3])
|
||||
|
||||
addons = ET.Element("addons")
|
||||
for source in (plugin_xml, repo_xml):
|
||||
root = ET.parse(source).getroot()
|
||||
addons.append(root)
|
||||
|
||||
target.write_text('<?xml version="1.0" encoding="UTF-8"?>\n' + ET.tostring(addons, encoding="unicode"), encoding="utf-8")
|
||||
PY
|
||||
|
||||
python3 - "${REPO_DIR}/addons.xml" "${REPO_DIR}/addons.xml.md5" <<'PY'
|
||||
import hashlib
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
addons_xml = Path(sys.argv[1])
|
||||
md5_file = Path(sys.argv[2])
|
||||
md5 = hashlib.md5(addons_xml.read_bytes()).hexdigest()
|
||||
md5_file.write_text(md5, encoding="ascii")
|
||||
PY
|
||||
|
||||
echo "Repo built:"
|
||||
echo " ${REPO_DIR}/addons.xml"
|
||||
echo " ${REPO_DIR}/addons.xml.md5"
|
||||
echo " ${REPO_ZIP_PATH}"
|
||||
echo " ${PLUGIN_ADDON_DIR_IN_REPO}/${PLUGIN_ZIP_NAME}"
|
||||
echo " ${REPO_ADDON_DIR_IN_REPO}/${REPO_ZIP_NAME}"
|
||||
106
scripts/generate_plugin_manifest.py
Executable file
106
scripts/generate_plugin_manifest.py
Executable file
@@ -0,0 +1,106 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Generate a JSON manifest for addon plugins."""
|
||||
from __future__ import annotations
|
||||
|
||||
import importlib.util
|
||||
import inspect
|
||||
import json
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
ROOT_DIR = Path(__file__).resolve().parents[1]
|
||||
PLUGIN_DIR = ROOT_DIR / "addon" / "plugins"
|
||||
OUTPUT_PATH = ROOT_DIR / "docs" / "PLUGIN_MANIFEST.json"
|
||||
|
||||
sys.path.insert(0, str(ROOT_DIR / "addon"))
|
||||
|
||||
try:
|
||||
from plugin_interface import BasisPlugin # type: ignore
|
||||
except Exception as exc: # pragma: no cover
|
||||
raise SystemExit(f"Failed to import BasisPlugin: {exc}")
|
||||
|
||||
|
||||
def _import_module(path: Path):
|
||||
spec = importlib.util.spec_from_file_location(path.stem, path)
|
||||
if spec is None or spec.loader is None:
|
||||
raise ImportError(f"Missing spec for {path}")
|
||||
module = importlib.util.module_from_spec(spec)
|
||||
sys.modules[spec.name] = module
|
||||
spec.loader.exec_module(module)
|
||||
return module
|
||||
|
||||
|
||||
def _collect_plugins():
|
||||
plugins = []
|
||||
for file_path in sorted(PLUGIN_DIR.glob("*.py")):
|
||||
if file_path.name.startswith("_"):
|
||||
continue
|
||||
entry = {
|
||||
"file": str(file_path.relative_to(ROOT_DIR)),
|
||||
"module": file_path.stem,
|
||||
"name": None,
|
||||
"class": None,
|
||||
"version": None,
|
||||
"capabilities": [],
|
||||
"prefer_source_metadata": False,
|
||||
"base_url_setting": None,
|
||||
"available": None,
|
||||
"unavailable_reason": None,
|
||||
"error": None,
|
||||
}
|
||||
try:
|
||||
module = _import_module(file_path)
|
||||
preferred = getattr(module, "Plugin", None)
|
||||
if inspect.isclass(preferred) and issubclass(preferred, BasisPlugin) and preferred is not BasisPlugin:
|
||||
classes = [preferred]
|
||||
else:
|
||||
classes = [
|
||||
obj
|
||||
for obj in module.__dict__.values()
|
||||
if inspect.isclass(obj) and issubclass(obj, BasisPlugin) and obj is not BasisPlugin
|
||||
]
|
||||
classes.sort(key=lambda cls: cls.__name__.casefold())
|
||||
|
||||
if not classes:
|
||||
entry["error"] = "No plugin classes found"
|
||||
plugins.append(entry)
|
||||
continue
|
||||
|
||||
cls = classes[0]
|
||||
instance = cls()
|
||||
entry["class"] = cls.__name__
|
||||
entry["name"] = str(getattr(instance, "name", "") or "") or None
|
||||
entry["version"] = str(getattr(instance, "version", "0.0.0") or "0.0.0")
|
||||
entry["prefer_source_metadata"] = bool(getattr(instance, "prefer_source_metadata", False))
|
||||
entry["available"] = bool(getattr(instance, "is_available", True))
|
||||
entry["unavailable_reason"] = getattr(instance, "unavailable_reason", None)
|
||||
try:
|
||||
caps = instance.capabilities() # type: ignore[call-arg]
|
||||
entry["capabilities"] = sorted([str(c) for c in caps]) if caps else []
|
||||
except Exception:
|
||||
entry["capabilities"] = []
|
||||
|
||||
entry["base_url_setting"] = getattr(module, "SETTING_BASE_URL", None)
|
||||
except Exception as exc: # pragma: no cover
|
||||
entry["error"] = str(exc)
|
||||
plugins.append(entry)
|
||||
|
||||
plugins.sort(key=lambda item: (item.get("name") or item["module"]).casefold())
|
||||
return plugins
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if not PLUGIN_DIR.exists():
|
||||
raise SystemExit("Plugin directory missing")
|
||||
manifest = {
|
||||
"schema_version": 1,
|
||||
"plugins": _collect_plugins(),
|
||||
}
|
||||
OUTPUT_PATH.parent.mkdir(parents=True, exist_ok=True)
|
||||
OUTPUT_PATH.write_text(json.dumps(manifest, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
|
||||
print(str(OUTPUT_PATH))
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
193
scripts/publish_gitea_release.sh
Executable file
193
scripts/publish_gitea_release.sh
Executable file
@@ -0,0 +1,193 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
ADDON_XML="${ROOT_DIR}/addon/addon.xml"
|
||||
DEFAULT_NOTES="Automatischer Release-Upload aus ViewIT Build."
|
||||
|
||||
TAG=""
|
||||
ASSET_PATH=""
|
||||
TITLE=""
|
||||
NOTES="${DEFAULT_NOTES}"
|
||||
DRY_RUN="0"
|
||||
|
||||
while [[ $# -gt 0 ]]; do
|
||||
case "$1" in
|
||||
--tag)
|
||||
TAG="${2:-}"
|
||||
shift 2
|
||||
;;
|
||||
--asset)
|
||||
ASSET_PATH="${2:-}"
|
||||
shift 2
|
||||
;;
|
||||
--title)
|
||||
TITLE="${2:-}"
|
||||
shift 2
|
||||
;;
|
||||
--notes)
|
||||
NOTES="${2:-}"
|
||||
shift 2
|
||||
;;
|
||||
--dry-run)
|
||||
DRY_RUN="1"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
echo "Unbekanntes Argument: $1" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [[ ! -f "${ADDON_XML}" ]]; then
|
||||
echo "Missing: ${ADDON_XML}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
read -r ADDON_ID ADDON_VERSION < <(python3 - "${ADDON_XML}" <<'PY'
|
||||
import sys
|
||||
import xml.etree.ElementTree as ET
|
||||
root = ET.parse(sys.argv[1]).getroot()
|
||||
print(root.attrib.get("id", "plugin.video.viewit"), root.attrib.get("version", "0.0.0"))
|
||||
PY
|
||||
)
|
||||
|
||||
if [[ -z "${TAG}" ]]; then
|
||||
TAG="v${ADDON_VERSION}"
|
||||
fi
|
||||
|
||||
if [[ -z "${ASSET_PATH}" ]]; then
|
||||
ASSET_PATH="${ROOT_DIR}/dist/${ADDON_ID}-${ADDON_VERSION}.zip"
|
||||
fi
|
||||
|
||||
if [[ ! -f "${ASSET_PATH}" ]]; then
|
||||
echo "Asset nicht gefunden, baue ZIP: ${ASSET_PATH}"
|
||||
"${ROOT_DIR}/scripts/build_kodi_zip.sh" >/dev/null
|
||||
fi
|
||||
|
||||
if [[ ! -f "${ASSET_PATH}" ]]; then
|
||||
echo "Asset fehlt nach Build: ${ASSET_PATH}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ -z "${TITLE}" ]]; then
|
||||
TITLE="ViewIT ${TAG}"
|
||||
fi
|
||||
|
||||
REMOTE_URL="$(git -C "${ROOT_DIR}" remote get-url origin)"
|
||||
|
||||
read -r BASE_URL OWNER REPO < <(python3 - "${REMOTE_URL}" <<'PY'
|
||||
import re
|
||||
import sys
|
||||
u = sys.argv[1].strip()
|
||||
m = re.match(r"^https?://([^/]+)/([^/]+)/([^/.]+)(?:\.git)?/?$", u)
|
||||
if not m:
|
||||
raise SystemExit("Origin-URL muss https://host/owner/repo(.git) sein.")
|
||||
host, owner, repo = m.group(1), m.group(2), m.group(3)
|
||||
print(f"https://{host}", owner, repo)
|
||||
PY
|
||||
)
|
||||
|
||||
API_BASE="${BASE_URL}/api/v1/repos/${OWNER}/${REPO}"
|
||||
ASSET_NAME="$(basename "${ASSET_PATH}")"
|
||||
|
||||
if [[ "${DRY_RUN}" == "1" ]]; then
|
||||
echo "[DRY-RUN] API: ${API_BASE}"
|
||||
echo "[DRY-RUN] Tag: ${TAG}"
|
||||
echo "[DRY-RUN] Asset: ${ASSET_PATH}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ -z "${GITEA_TOKEN:-}" ]]; then
|
||||
echo "Bitte GITEA_TOKEN setzen." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
tmp_json="$(mktemp)"
|
||||
tmp_http="$(mktemp)"
|
||||
trap 'rm -f "${tmp_json}" "${tmp_http}"' EXIT
|
||||
|
||||
urlenc() {
|
||||
python3 - "$1" <<'PY'
|
||||
import sys
|
||||
from urllib.parse import quote
|
||||
print(quote(sys.argv[1], safe=""))
|
||||
PY
|
||||
}
|
||||
|
||||
tag_enc="$(urlenc "${TAG}")"
|
||||
auth_header="Authorization: token ${GITEA_TOKEN}"
|
||||
|
||||
http_code="$(curl -sS -H "${auth_header}" -o "${tmp_json}" -w "%{http_code}" "${API_BASE}/releases/tags/${tag_enc}")"
|
||||
|
||||
if [[ "${http_code}" == "200" ]]; then
|
||||
RELEASE_ID="$(python3 - "${tmp_json}" <<'PY'
|
||||
import json,sys
|
||||
print(json.load(open(sys.argv[1], encoding="utf-8"))["id"])
|
||||
PY
|
||||
)"
|
||||
elif [[ "${http_code}" == "404" ]]; then
|
||||
payload="$(python3 - "${TAG}" "${TITLE}" "${NOTES}" <<'PY'
|
||||
import json,sys
|
||||
print(json.dumps({
|
||||
"tag_name": sys.argv[1],
|
||||
"name": sys.argv[2],
|
||||
"body": sys.argv[3],
|
||||
"draft": False,
|
||||
"prerelease": False
|
||||
}))
|
||||
PY
|
||||
)"
|
||||
http_code_create="$(curl -sS -X POST -H "${auth_header}" -H "Content-Type: application/json" -d "${payload}" -o "${tmp_json}" -w "%{http_code}" "${API_BASE}/releases")"
|
||||
if [[ "${http_code_create}" != "201" ]]; then
|
||||
echo "Release konnte nicht erstellt werden (HTTP ${http_code_create})." >&2
|
||||
cat "${tmp_json}" >&2
|
||||
exit 1
|
||||
fi
|
||||
RELEASE_ID="$(python3 - "${tmp_json}" <<'PY'
|
||||
import json,sys
|
||||
print(json.load(open(sys.argv[1], encoding="utf-8"))["id"])
|
||||
PY
|
||||
)"
|
||||
else
|
||||
echo "Release-Abfrage fehlgeschlagen (HTTP ${http_code})." >&2
|
||||
cat "${tmp_json}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
assets_code="$(curl -sS -H "${auth_header}" -o "${tmp_json}" -w "%{http_code}" "${API_BASE}/releases/${RELEASE_ID}/assets")"
|
||||
if [[ "${assets_code}" == "200" ]]; then
|
||||
EXISTING_ASSET_ID="$(python3 - "${tmp_json}" "${ASSET_NAME}" <<'PY'
|
||||
import json,sys
|
||||
assets=json.load(open(sys.argv[1], encoding="utf-8"))
|
||||
name=sys.argv[2]
|
||||
for a in assets:
|
||||
if a.get("name")==name:
|
||||
print(a.get("id"))
|
||||
break
|
||||
PY
|
||||
)"
|
||||
if [[ -n "${EXISTING_ASSET_ID}" ]]; then
|
||||
del_code="$(curl -sS -X DELETE -H "${auth_header}" -o "${tmp_http}" -w "%{http_code}" "${API_BASE}/releases/${RELEASE_ID}/assets/${EXISTING_ASSET_ID}")"
|
||||
if [[ "${del_code}" != "204" ]]; then
|
||||
echo "Altes Asset konnte nicht geloescht werden (HTTP ${del_code})." >&2
|
||||
cat "${tmp_http}" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
asset_name_enc="$(urlenc "${ASSET_NAME}")"
|
||||
upload_code="$(curl -sS -X POST -H "${auth_header}" -F "attachment=@${ASSET_PATH}" -o "${tmp_json}" -w "%{http_code}" "${API_BASE}/releases/${RELEASE_ID}/assets?name=${asset_name_enc}")"
|
||||
if [[ "${upload_code}" != "201" ]]; then
|
||||
echo "Asset-Upload fehlgeschlagen (HTTP ${upload_code})." >&2
|
||||
cat "${tmp_json}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Release-Asset hochgeladen:"
|
||||
echo " Repo: ${OWNER}/${REPO}"
|
||||
echo " Tag: ${TAG}"
|
||||
echo " Asset: ${ASSET_NAME}"
|
||||
echo " URL: ${BASE_URL}/${OWNER}/${REPO}/releases/tag/${TAG}"
|
||||
17
scripts/serve_local_kodi_repo.sh
Executable file
17
scripts/serve_local_kodi_repo.sh
Executable file
@@ -0,0 +1,17 @@
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
||||
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
DIST_DIR="${ROOT_DIR}/dist"
|
||||
HOST="${HOST:-127.0.0.1}"
|
||||
PORT="${PORT:-8080}"
|
||||
|
||||
if [[ ! -f "${DIST_DIR}/repo/addons.xml" ]]; then
|
||||
echo "Missing ${DIST_DIR}/repo/addons.xml" >&2
|
||||
echo "Run ./scripts/build_local_kodi_repo.sh first." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Serving local Kodi repo from ${DIST_DIR}"
|
||||
echo "Repository URL: http://${HOST}:${PORT}/repo/addons.xml"
|
||||
(cd "${DIST_DIR}" && python3 -m http.server "${PORT}" --bind "${HOST}")
|
||||
73
scripts/zip_deterministic.py
Executable file
73
scripts/zip_deterministic.py
Executable file
@@ -0,0 +1,73 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Create deterministic zip archives.
|
||||
|
||||
Usage:
|
||||
zip_deterministic.py <zip_path> <root_dir>
|
||||
|
||||
The archive will include the root directory itself and all files under it.
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
import zipfile
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def _timestamp() -> tuple[int, int, int, int, int, int]:
|
||||
epoch = os.environ.get("SOURCE_DATE_EPOCH")
|
||||
if epoch:
|
||||
try:
|
||||
value = int(epoch)
|
||||
return time.gmtime(value)[:6]
|
||||
except Exception:
|
||||
pass
|
||||
return (2000, 1, 1, 0, 0, 0)
|
||||
|
||||
|
||||
def _iter_files(root: Path):
|
||||
for dirpath, dirnames, filenames in os.walk(root):
|
||||
dirnames[:] = sorted([d for d in dirnames if d != "__pycache__"])
|
||||
for filename in sorted(filenames):
|
||||
if filename.endswith(".pyc"):
|
||||
continue
|
||||
yield Path(dirpath) / filename
|
||||
|
||||
|
||||
def _add_file(zf: zipfile.ZipFile, file_path: Path, arcname: str) -> None:
|
||||
info = zipfile.ZipInfo(arcname, date_time=_timestamp())
|
||||
info.compress_type = zipfile.ZIP_DEFLATED
|
||||
info.external_attr = (0o644 & 0xFFFF) << 16
|
||||
with file_path.open("rb") as handle:
|
||||
data = handle.read()
|
||||
zf.writestr(info, data, compress_type=zipfile.ZIP_DEFLATED)
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if len(sys.argv) != 3:
|
||||
print("Usage: zip_deterministic.py <zip_path> <root_dir>")
|
||||
return 2
|
||||
|
||||
zip_path = Path(sys.argv[1]).resolve()
|
||||
root = Path(sys.argv[2]).resolve()
|
||||
if not root.exists() or not root.is_dir():
|
||||
print(f"Missing root dir: {root}")
|
||||
return 2
|
||||
|
||||
base = root.parent
|
||||
zip_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
if zip_path.exists():
|
||||
zip_path.unlink()
|
||||
|
||||
with zipfile.ZipFile(zip_path, "w") as zf:
|
||||
for file_path in sorted(_iter_files(root)):
|
||||
arcname = str(file_path.relative_to(base)).replace(os.sep, "/")
|
||||
_add_file(zf, file_path, arcname)
|
||||
|
||||
print(str(zip_path))
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
Reference in New Issue
Block a user