From ff5a07b68726bb4ff08396594e5d9c534f2a2ca1 Mon Sep 17 00:00:00 2001 From: rols1 Date: Sun, 7 Jul 2024 10:35:17 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20/=20Korrekturen=20siehe=20cha?= =?UTF-8?q?ngelog.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addon.xml | 2 +- ardundzdf.py | 9 ++++++--- changelog.txt | 15 ++++++++++++++- resources/images/tagesschau_einfach.png | Bin 0 -> 8408 bytes resources/images/tagesschau_regional.png | Bin 0 -> 9468 bytes resources/lib/TagesschauXL.py | 18 +++++++++++++----- resources/livesenderTV.xml | 10 +++++----- 7 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 resources/images/tagesschau_einfach.png create mode 100644 resources/images/tagesschau_regional.png diff --git a/addon.xml b/addon.xml index f2b073a..94ede56 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/ardundzdf.py b/ardundzdf.py index dc9ec92..39d0b21 100644 --- a/ardundzdf.py +++ b/ardundzdf.py @@ -57,8 +57,8 @@ # VERSION -> addon.xml aktualisieren # 208 # Numerierung für Einzelupdate -VERSION = '5.0.5' -VDATE = '29.06.2024' +VERSION = '5.0.6' +VDATE = '07.07.2024' # (c) 2019 by Roland Scholz, rols1@gmx.de @@ -10820,7 +10820,9 @@ def Parseplaylist(li, url_m3u8, thumb, geoblock, descr, sub_path='', stitle='', PLog('playlist: ' + playlist[:100]) PLog('live: ' + str(live)) skip_list = ["/rbb_brandenburg/", # keine Mehrkanalstreams: Einzelauflösungen mögl. - "/srfsgeo/", "/swrbwd/", "/dwstream" + "/srfsgeo/", "/swrbwd/", "/dwstream", + "/arteliveext.akamaized", + "/tagesschau.akamaized" ] PLog('#EXT-X-MEDIA' in playlist) # live=True: skip 1 Button, Altern.: Merkmal "_sendung_" in url_m3u8 @@ -10830,6 +10832,7 @@ def Parseplaylist(li, url_m3u8, thumb, geoblock, descr, sub_path='', stitle='', if item in url_m3u8: skip=True # i.d.R. ARD-Streams (nicht alle) break + PLog('skip: ' + str(skip)) if skip == False and live: # Mehrkanalstreams: nur 1 Button stitle = "HLS-Stream" diff --git a/changelog.txt b/changelog.txt index 4d6af7b..94b25c5 100644 --- a/changelog.txt +++ b/changelog.txt @@ -10,6 +10,20 @@ CHANGE HISTORY max_col 97 -------------- +07.07.2024 5.0.6 + Haupt-PRG: Prüfung Existenz Cache-Datei ard_streamlinks ergänzt (führte + bei Fehlen zum Startabbruch des Addons). + get_json_content (ARDnew): Verzicht auf Dekodierung von Param. page (str + und py2_decode) - führte bei PY2 zu utf-Errors. + ARDSportWDR: Event-Button Tour de France 2024 hinzugefügt, Anpassungen an + WDR-Änderungen in ARDSportgetPlayer und ARDSportMedia. + TagesschauXL: Hauptmenü erweitert mit "tagesschau in Einfacher Sprache", + "Regionale Nachrichten", neues Icon tagesschau_einfach, tagesschau_regional. + get_VideoAudio (TagesschauXL): leeren Player-Inhalt abgefangen (leer für + Navigationsmenü im Web). + TV-Livestreams: Deutsche Welle (EN) umgestellt (iptv -> livesenderTV.xml, + iptv-Quelle funktioniert nicht mehr). + 23.06.2024 5.0.5 ARDSportMediaPlayer (ARD Sportschau WDR: Anpassung an veränderter Position des Beitrags-Titels. @@ -29,7 +43,6 @@ CHANGE HISTORY (s. kodinerds-Forum 17.06.2024 ff). SenderLiveListe: utf-Behandlung für tagline. - 26.05.2024 5.0.4 AudioStartLive: Fix Variable für RadioPlaylist-Button PlayList statt streamList. diff --git a/resources/images/tagesschau_einfach.png b/resources/images/tagesschau_einfach.png new file mode 100644 index 0000000000000000000000000000000000000000..f4094e0e735e5b33e8df36fa6cb85f2c78737f50 GIT binary patch literal 8408 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 OjJ4(26BWn7g#QI=CU^e; literal 0 HcmV?d00001 diff --git a/resources/images/tagesschau_regional.png b/resources/images/tagesschau_regional.png new file mode 100644 index 0000000000000000000000000000000000000000..8c2eab6e7e6cfaadf6931caa0f4f82000495b8e4 GIT binary patch literal 9468 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 literal 0 HcmV?d00001 diff --git a/resources/lib/TagesschauXL.py b/resources/lib/TagesschauXL.py index 0dba069..1e62d03 100644 --- a/resources/lib/TagesschauXL.py +++ b/resources/lib/TagesschauXL.py @@ -4,7 +4,7 @@ # Modul für für die Inhalte von tagesschau.de ################################################################################ # 15 # Numerierung für Einzelupdate -# Stand: 02.07.2024 +# Stand: 06.07.2024 # # Anpassung Python3: Modul future # Anpassung Python3: Modul kodi_six + manuelle Anpassungen @@ -88,6 +88,8 @@ ICON_DELETE = "icon-delete.png" ICON_EINFACH = "tagesschau_einfach.png" +ICON_REGIONAL = "tagesschau_regional.png" + # Github-Icons zum Nachladen aus Platzgründen GIT_CAL = "https://github.com/rols1/PluginPictures/blob/master/ARDundZDF/KIKA_tivi/icon-calendar.png?raw=true" ICON_MAINXL = 'https://github.com/rols1/PluginPictures/blob/master/ARDundZDF/TagesschauXL/tagesschau.png?raw=true' @@ -173,6 +175,7 @@ def Main_XL(): u"tagesschau24|%s|%s" % (ICON_24, "Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhZ2Vzc2NoYXUyNA"), u"tagesschau in 100 SEKUNDEN|%s|%s" % (ICON_100sec, "Y3JpZDovL2Rhc2Vyc3RlLmRlL3RzMTAwcw"), u"tagesthemen|%s|%s" % (ICON_TTHEMEN, "Y3JpZDovL2Rhc2Vyc3RlLmRlL3RhZ2VzdGhlbWVu"), + u"Regionale Nachrichten|%s|%s" % (R(ICON_REGIONAL), "3mJgQ9gapwqrKZrrF9hTWo:-3801511732729640100"), u"Bericht aus Berlin|%s|%s" % (ICON_BAB, "Y3JpZDovL2Rhc2Vyc3RlLmRlL2JlcmljaHQgYXVzIGJlcmxpbg"), ] for t in T_List: @@ -180,7 +183,7 @@ def Main_XL(): PLog(title); PLog(thumb); PLog(pid) title = "[B]%s[/B]" % title tag = u"mit allen von der ARD angebotenen Stream-Qualitäten" - fparams="&fparams={'title': '%s', 'pid': '%s'}" % (quote(title), pid) + fparams="&fparams={'title': '%s', 'pid': '%s'}" % (quote(title), quote(pid)) addDir(li=li, label=title, action="dirList", dirID="resources.lib.TagesschauXL.XL_Tagesschau", fanart=ICON_MAINXL, thumb=thumb, tagline=tag, fparams=fparams, mediatype="") @@ -225,7 +228,9 @@ def XL_Tagesschau(title, pid): PLog("XL_Tagesschau:") PLog(title); PLog(pid); base="https://api.ardmediathek.de/page-gateway/pages/tagesschau24/grouping/" - path = "%s%s?embedded=true" % (base, pid) + if "Regionale Nachrichten" in title: # abweichender Call + base = "https://api.ardmediathek.de/page-gateway/widgets/ard/editorials/" # alt.: tagesschau24 statt ard + path = "%s%s?embedded=true" % (base, unquote(pid)) # unquote: %3A -> : page, msg = get_page(path) if page == '': @@ -701,7 +706,10 @@ def get_VideoAudio(title, path): # Faktenfinder cnt = 0; url_list=[] for item in content: - cnt = cnt +1 # Satz-Zähler + PLog(item) + if 'data-v="{}"' in item: # leer möglich (hauptnavigation) + continue + cnt = cnt +1 # Satz-Zähler typ,av_typ,title,tag,summ,img,stream = get_content_json(item) title=py2_encode(title); stream=py2_encode(stream); @@ -728,7 +736,7 @@ def get_VideoAudio(title, path): # Faktenfinder # ---------------------------------------------------------------------- # def get_content_json(item): - PLog('get_content_json:') + PLog('get_content_json:') minWidth=700 # .., 768x, 944x diff --git a/resources/livesenderTV.xml b/resources/livesenderTV.xml index 5970db8..d3afa1b 100644 --- a/resources/livesenderTV.xml +++ b/resources/livesenderTV.xml @@ -5,7 +5,7 @@ 49 Grafiken @Arauco (Plex-Forum) - 19.02.2024 rols + 07.07.2024 rols https://www.zdf.de/live-tv Senderübersicht TVToday: https://www.tvtoday.de/programm/standard/sender/ Button:Alle Sender @@ -143,12 +143,12 @@ Deutsche Welle (EN) Deutsche Welle (EN) - Deutsche Welle (EN) - IPTVSource|/jnk22/kodinerds-iptv/blob/master/iptv/kodi/kodi.m3u - tvg-logo + + https://dwamdstream102.akamaized.net/hls/live/2015525/dwstream102/stream02/streamPlaylist.m3u8 + tv-deutsche-welle.png DWTV - 21.01.2024 + 07.07.2024