From 82551b5a970809467f733814bc7b392c615cd712 Mon Sep 17 00:00:00 2001 From: rols1 Date: Sun, 11 Aug 2024 21:42:29 +0200 Subject: [PATCH] Einzelupdate ardundzdf.py und EPG.py --- ardundzdf.py | 11 ++++++----- resources/lib/EPG.py | 8 ++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ardundzdf.py b/ardundzdf.py index 1bd2589..d19ecde 100644 --- a/ardundzdf.py +++ b/ardundzdf.py @@ -56,7 +56,7 @@ # +++++ ARDundZDF - Addon Kodi-Version, migriert von der Plexmediaserver-Version +++++ # VERSION -> addon.xml aktualisieren -# 214 # Numerierung für Einzelupdate +# 215 # Numerierung für Einzelupdate VERSION = '5.0.9' VDATE = '11.08.2024' @@ -6860,9 +6860,8 @@ def EPG_Search(title, query=""): if r in EPG_SearchHits: # Doppel üblich bei Regionalsendern PLog("skip_double: %s | %s" % (ID, starttime)) continue - EPG_SearchHits.append(r) # Treffer-Satz speichern + EPG_SearchHits.append(r) # Treffer-Sender-EPG speichern PLog("query_found: %s | %s" % (query, r[3])) - PLog(str(r)) cnt=cnt+1 #----------------------------------- @@ -6956,8 +6955,9 @@ def EPG_Search2(title, query=""): PLog("wday: %s, img: %s" % (wday, img)) - today_human = "%s, %s" % (day_human, up_low(wday[:2])) # Datum + Wochentag -> tagline, Titel + today_human = u"%s, %s" % (day_human, up_low(wday[:2])) # Datum + Wochentag -> tagline, Titel tag = "[COLOR blue]%s[/COLOR] | [B]%s[/B] | zur Livesendung klicken" % (today_human, vonbis) + sender = py2_decode(sender) summ = "%s | %s" % (sender, summ) Plot = summ.replace("\n", "||") title = "[COLOR blue]%s[/COLOR] | %s" % (day_human, sname) # Datum + Wochentag | Titel @@ -6965,7 +6965,8 @@ def EPG_Search2(title, query=""): PLog("Satz7:") PLog(today_human);PLog(title);PLog(vonbis);PLog(summ[:40]); - title=py2_encode(title); summ=py2_encode(summ); sender_img=py2_encode(sender_img) + title=py2_encode(title); summ=py2_encode(summ); sender_img=py2_encode(sender_img) + Plot=py2_encode(Plot); fparams="&fparams={'url': '%s', 'title': '%s', 'thumb': '%s', 'Plot': '%s', 'live': ''}" %\ (quote_plus(link), quote_plus(title), quote_plus(sender_img), quote_plus(Plot)) addDir(li=li, label=title, action="dirList", dirID="PlayVideo", fanart=sender_img, thumb=img, diff --git a/resources/lib/EPG.py b/resources/lib/EPG.py index 96fa740..bb0a1aa 100644 --- a/resources/lib/EPG.py +++ b/resources/lib/EPG.py @@ -10,8 +10,8 @@ # Sendezeit: data-start-time="", data-end-time="" # # 20.11.2019 Migration Python3 Modul kodi_six + manuelle Anpassungen -# 21 # Numerierung für Einzelupdate -# Stand: 09.07.2024 +# 22 # Numerierung für Einzelupdate +# Stand: 11.08.2024 # from kodi_six import xbmc, xbmcgui, xbmcaddon @@ -338,7 +338,7 @@ def EPG(ID, mode=None, day_offset=None, load_only=False): EPG_dict = get_data_web(page, Dict_ID) # Web -> 2-dim-Array EPG_rec -> Dict else: # EPG_rec = type list EPG_dict = page - PLog(len(str(page))) + # PLog(len(str(page))) # codec-Error python2.* # today.de verwendet Unix-Format, Bsp. 1488830442 now,today,today_5Uhr,nextday,nextday_5Uhr = get_unixtime(day_offset)# lokale Unix-Zeitstempel holen + Offsets @@ -358,7 +358,7 @@ def EPG(ID, mode=None, day_offset=None, load_only=False): # Indices EPG_rec: 0=starttime, 1=href, 2=img, 3=sname, 4=stime, # 5=summ, 6=vonbis, 7=today_human, 8=endtime: starttime=r[0]; href=r[1]; img=r[2]; sname=r[3]; # href=r[1] nicht verwendet - stime=r[4]; summ=r[5]; vonbis=r[6];today_human=r[7]; # today_human=r[8] noch leer + stime=r[4]; summ=r[5]; vonbis=r[6];today_human=r[7]; # today_human=r[7] noch leer endtime=r[8]; s_start = datetime.datetime.fromtimestamp(int(starttime)) # Zeit-Konvertierung UTC-Startzeit