[plugin.video.sandmann] v2.4.1

sorax · sorax · commit 9ce50b05b37e · 2026-03-23T22:13:25.000+01:00
address issues found by Kodiai Review Summary
diff --git a/plugin.video.sandmann/addon.xml b/plugin.video.sandmann/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="plugin.video.sandmann" name="Sandmann" version="2.4.0" provider-name="sorax">
+<addon id="plugin.video.sandmann" name="Sandmann" version="2.4.1" provider-name="sorax">
   <requires>
     <import addon="xbmc.python" version="3.0.0"></import>
     <import addon="script.module.requests"/>
@@ -24,8 +24,8 @@
       <icon>resources/assets/icon.png</icon>
       <fanart>resources/assets/fanart.jpg</fanart>
     </assets>
-    <news>v2.4.0:
-      - use sandmann.de as the official source for videos and metadata
+    <news>v2.4.1:
+      - improve error handling
     </news>
   </extension>
 </addon>
diff --git a/plugin.video.sandmann/changelog.txt b/plugin.video.sandmann/changelog.txt
@@ -1,3 +1,5 @@
+version 2.4.1:
+ * improve error handling
 version 2.4.0:
  * use sandmann.de as the official source for videos and metadata
 version 2.3.1:
diff --git a/plugin.video.sandmann/libs/network.py b/plugin.video.sandmann/libs/network.py
@@ -17,13 +17,17 @@
 
 import requests
 
+TIMEOUT = 10
+
 
 def fetchHtml(url):
-    r = requests.get(url)
+    r = requests.get(url, timeout=TIMEOUT)
+    r.raise_for_status()
     r.encoding = "utf-8"
     return r.text
 
 
 def fetchJson(url):
-    r = requests.get(url)
+    r = requests.get(url, timeout=TIMEOUT)
+    r.raise_for_status()
     return r.json()
diff --git a/plugin.video.sandmann/libs/sandmann.py b/plugin.video.sandmann/libs/sandmann.py
@@ -15,6 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import xbmc
 import xbmcaddon
 import xbmcgui
 import xbmcplugin
@@ -23,6 +24,7 @@
 import sys
 
 from bs4 import BeautifulSoup
+from requests.exceptions import RequestException
 
 from libs.network import fetchHtml
 from libs.network import fetchJson
@@ -49,7 +51,15 @@ def sandmann():
     li_refresh = xbmcgui.ListItem(label=addon.getLocalizedString(30020))
     xbmcplugin.addDirectoryItem(addon_handle, base_path, li_refresh, True)
 
-    html = fetchWebsite()
+    try:
+        html = fetchWebsite()
+    except RequestException as e:
+        xbmc.log(f"[{addon_name}] Failed to fetch website: {e}", xbmc.LOGERROR)
+        xbmcgui.Dialog().notification(
+            addon_name, addon.getLocalizedString(30200), xbmcgui.NOTIFICATION_ERROR
+        )
+        xbmcplugin.endOfDirectory(addon_handle)
+        return
 
     if dgs == 0:
         episodes = getEpisodes(html, 1)
@@ -60,12 +70,20 @@ def sandmann():
 
     item_list = []
     for episode, description in episodes:
-        path = getEpisodePath(episode)
-        details = fetchEpisodeDetails(path)
+        try:
+            path = getEpisodePath(episode)
+            details = fetchEpisodeDetails(path)
+            item_list.append((details["stream"], getListItem(details, description), False))
+        except (RequestException, KeyError, IndexError, TypeError, ValueError,
+                json.JSONDecodeError) as e:
+            xbmc.log(f"[{addon_name}] Skipping episode: {e}", xbmc.LOGWARNING)
+            continue
+
+    if not item_list:
+        xbmcgui.Dialog().notification(
+            addon_name, addon.getLocalizedString(30201), xbmcgui.NOTIFICATION_WARNING
+        )
 
-        item_list.append((details["stream"], getListItem(details, description), False))
-
-    # xbmcgui.Dialog().ok("DEBUG", f'{item_list[0]}')
     xbmcplugin.addDirectoryItems(addon_handle, item_list, len(item_list))
     xbmcplugin.endOfDirectory(addon_handle)
 
@@ -83,34 +101,67 @@ def getEpisodes(html, count):
     html_descriptions = soup.select(f"#main > .count{count} .manualteasershorttext p")
     descriptions = [p.get_text() for p in html_descriptions]
 
+    if not episodes:
+        xbmc.log(f"[{addon_name}] No episodes found for count{count}", xbmc.LOGWARNING)
+        return []
+
+    if len(episodes) != len(descriptions):
+        xbmc.log(
+            f"[{addon_name}] Episode/description count mismatch: "
+            f"{len(episodes)} episodes vs {len(descriptions)} descriptions",
+            xbmc.LOGWARNING,
+        )
+        descriptions.extend([""] * (len(episodes) - len(descriptions)))
+
     return list(zip(episodes, descriptions))
 
 
 def getEpisodePath(episode):
     jsb_string = episode.get("data-jsb")
+    if not jsb_string:
+        raise ValueError("Missing 'data-jsb' attribute on episode element")
+
     jsb_object = json.loads(jsb_string)
 
+    if "media" not in jsb_object:
+        raise KeyError("Missing 'media' key in episode JSON data")
+
     return jsb_object["media"]
 
 
 def fetchEpisodeDetails(path):
-    json = fetchJson(f"https://www.sandmann.de{path}")
+    data = fetchJson(f"https://www.sandmann.de{path}")
+
+    media_array = data.get("_mediaArray")
+    if not media_array or not media_array[0].get("_mediaStreamArray"):
+        raise KeyError("Missing media stream data in API response")
 
     streams = {}
-    for stream in json["_mediaArray"][0]["_mediaStreamArray"]:
-        streams[stream["_quality"]] = stream["_stream"]
+    for stream in media_array[0]["_mediaStreamArray"]:
+        quality = stream.get("_quality")
+        url = stream.get("_stream")
+        if quality is not None and url:
+            streams[quality] = url
+
+    if "auto" not in streams:
+        raise KeyError("No 'auto' quality stream available")
+
+    title_parts = data.get("rbbtitle", "").split(" | ")
+    date = title_parts[2] if len(title_parts) > 2 else ""
+    name = title_parts[0] if title_parts else ""
+    title = f"{date} | {name}" if date and name else data.get("rbbtitle", "Unbekannt")
 
-    title = json["rbbtitle"].split(" | ")
-    previewImage = "https://www.sandmann.de" + json["_previewImage"].rsplit("/", 1)[0]
+    preview_image = data.get("_previewImage", "")
+    if preview_image:
+        preview_image = "https://www.sandmann.de" + preview_image.rsplit("/", 1)[0]
 
     return {
-        "date": title[2],
-        # "dgs": json["dgs"],
-        "duration": json["_duration"],
-        "fanart": previewImage + "/size=1920x1080.jpg",
+        "date": date,
+        "duration": data.get("_duration", 0),
+        "fanart": f"{preview_image}/size=1920x1080.jpg" if preview_image else "",
         "stream": streams["auto"],
-        "thumb": previewImage + "/size=640x360.jpg",
-        "title": f"{title[2]} | {title[0]}"
+        "thumb": f"{preview_image}/size=640x360.jpg" if preview_image else "",
+        "title": title,
     }
 
 
diff --git a/plugin.video.sandmann/resources/language/resource.language.de_de/strings.po b/plugin.video.sandmann/resources/language/resource.language.de_de/strings.po
@@ -1,6 +1,6 @@
 # Kodi Media Center language file
-# Addon Name: detektor.fm
-# Addon id: plugin.audio.detektorfm
+# Addon Name: Sandmann
+# Addon id: plugin.video.sandmann
 # Addon Provider: sorax
 msgid ""
 msgstr ""
@@ -67,3 +67,11 @@ msgstr "Manuell"
 msgctxt "#30104"
 msgid "On Start"
 msgstr "Nur beim Start"
+
+msgctxt "#30200"
+msgid "Connection error"
+msgstr "Verbindungsfehler"
+
+msgctxt "#30201"
+msgid "No episodes found"
+msgstr "Keine Folgen gefunden"
diff --git a/plugin.video.sandmann/resources/language/resource.language.en_gb/strings.po b/plugin.video.sandmann/resources/language/resource.language.en_gb/strings.po
@@ -1,6 +1,6 @@
 # Kodi Media Center language file
-# Addon Name: detektor.fm
-# Addon id: plugin.audio.detektorfm
+# Addon Name: Sandmann
+# Addon id: plugin.video.sandmann
 # Addon Provider: sorax
 msgid ""
 msgstr ""
@@ -67,3 +67,11 @@ msgstr ""
 msgctxt "#30104"
 msgid "On Start"
 msgstr ""
+
+msgctxt "#30200"
+msgid "Connection error"
+msgstr ""
+
+msgctxt "#30201"
+msgid "No episodes found"
+msgstr ""

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+version 2.4.1:`
	`2`	`+ * improve error handling`
`1`	`3`	`version 2.4.0:`
`2`	`4`	`* use sandmann.de as the official source for videos and metadata`
`3`	`5`	`version 2.3.1:`