Skip to content

Commit

Permalink
changes see changelog.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
@rols1
rols1 committed Mar 3, 2024
1 parent 483a447 commit ee4cdfb
Show file tree
Hide file tree
Showing 5 changed files with 47 additions and 25 deletions.
2 changes: 1 addition & 1 deletion addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.ardundzdf" name="ARDundZDF" version="4.9.7+nexus" provider-name="rols1 ([email protected])">
<addon id="plugin.video.ardundzdf" name="ARDundZDF" version="4.9.8+nexus" provider-name="rols1 ([email protected])">
<requires>
<import addon="xbmc.python" version="3.0.1"/>
<import addon="script.module.kodi-six" />
Expand Down
11 changes: 6 additions & 5 deletions ardundzdf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@

# VERSION -> addon.xml aktualisieren
# <nr>179</nr> # Numerierung für Einzelupdate
VERSION = '4.9.7'
VDATE = '23.02.2024'
VERSION = '4.9.8'
VDATE = '03.03.2024'


# (c) 2019 by Roland Scholz, [email protected]
Expand Down Expand Up @@ -548,11 +548,12 @@ def Main():

if call_update == False: # Update-Button "Suche" zeigen
title = 'Addon-Update | akt. Version: ' + VERSION + ' vom ' + VDATE
summ='Suche nach neuen Updates starten'
tag ='Bezugsquelle: ' + repo_url
summ = u'Quelle: github.com/rols1\n\n'
summ = u"%sHinweis: zwischen den Updates sind Einzelupdates in Infos + Tools möglich" % summ
tag = u'Suche nach neuen Updates starten'
fparams="&fparams={'title': 'Addon-Update'}"
addDir(li=li, label=title, action="dirList", dirID="SearchUpdate", fanart=R(FANART),
thumb=R(ICON_MAIN_UPDATER), fparams=fparams, summary=summ)
thumb=R(ICON_MAIN_UPDATER), fparams=fparams, tagline=tag, summary=summ)

summ = '[B]Infos und Tools zu diesem Addon[/B]' # Menü Infos + Tools
summ= u'%s\n- Zuletzt-gesehen-Liste' % summ
Expand Down
21 changes: 19 additions & 2 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,24 @@ CHANGE HISTORY
max_col 97
--------------

18.01.2024 4.9.7
03.03.2024 4.9.8
livesenderTV.xml: SWR Rheinland-Pfalz aus IPTV-Quelle jnk22 ergänzt.
get_foruminfo (Modul tools): Anpassung an Forum-Update
refresh_streamlinks (Modul util): Logausgabe der TV-Quellen ergänzt
(skip_log=False).
ZDF_Rubriken: Einrückung hinter Ausschluss-Filter beseitigt (Folgecode war
nur wirksam mit Filter-Setting).
PlayVideo (Modul util): Berücksichtigung Dash-Streams (*.mpd) bei Direktiven
für das inputstreamaddon.
MVWSearch (Modul yt): Merkliste-Button für Suchergebnisse hinzugefügt
(Startindex 1).
Watch_items (Modul merkliste): Fett-/Farbe aus gespeichertem Titel entfernt
mittels cleanmark entfernt in actions rename und folder.
get_summary_pre (Modul util): Sonderfälle für ARDnew behandelt ('\\n\\n' ->
" | ", '\\n' -> ". ", '\\r\\n\\r\\n' -> " | ").
Main: Hinweis Einzelupdate in Button Addon-Update.

18.02.2024 4.9.7
thread_getpic (util): Anpassung an akt. python-Pillow-Version (draw.textsize
entfernt), Tests OK in Windows11 (Kodi Omega) und Linux (Kodi Nexus, Leia).
TV-Livestreams 3. Bundesliga: Berücksichtigung von 1-3 Sendern (bisher 1-2),
Expand All @@ -21,7 +38,7 @@ CHANGE HISTORY
ergänzt (relevant für python < 3.0).
ShowFavs: Icons für Notification für merkliste/Favoriten angepasst.

04.01.2024 4.9.6
04.02.2024 4.9.6
Main_XL (TagesschauXL): Hinw. auf geringe Videoqualität 480x270 (Investigativ,
Faktenfinder).
XL_BilderClusterSingle (TagesschauXL): Auswertung Slider-Bilder ergänzt.
Expand Down
5 changes: 4 additions & 1 deletion resources/lib/util.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2718,7 +2718,10 @@ def get_ZDFstreamlinks(skip_log=False, force=False):
# ZDF-Links s. get_ZDFstreamlinks
# Aufruf get_sort_playlist (<- EPG_Sender, EPG_ShowAll,
# TVLiveRecordSender), SenderLiveListe, get_playlist_img
#
# Die api-Url's der Senderliste (Block broadcastedOn) enthalten
# nicht alle regionalen Sender (Bsp. BR Nord) - diese werden
# in get_IPTVstreamlinks ermittelt (via Tag IPTVSource in
# livesenderTV.xml.
# 01.12.2021 erweitert um Liste für Untertitel-Links
# 17.02.2021 Auswertung publicationService/name statt
# longTitle
Expand Down
33 changes: 17 additions & 16 deletions resources/livesenderTV.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<channels>
<channels_info>
<ctitle>Kodi-Addon-ARDundZDF Streamlinks</ctitle>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<nr>49</nr>
<thumbnail></thumbnail>
<credits>Grafiken @Arauco (Plex-Forum)</credits>
Expand All @@ -12,9 +12,10 @@
<info2>das &-Zeichen verstößt zwar gegen den xml-Standard, ist aber kompatibel mit den String-Funktionen im PRG</info2>
<info3>hrefsender enthält Sendernamen passend zu www.ardmediathek.de (ARD-Neu)</info3>
<info4>link: Kennung statt Streamurl möglich, z.B. ZDFsource -> get_ZDFstreamlinks</info4>
<info5>Datei livesenderTV.xml: autom. Update im Modul EPG, thread_getepg()</info5>
<info5>Datei livesenderTV.xml: Einzelupdate im Modul EPG, thread_getepg()</info5>
<info6>IPTVSource: https://github.com/jnk22/kodinerds-iptv/blob/e297851866d6af270e69da6d1d60f2e938f72860/iptv/kodi/kodi.m3u</info6>
<info7> Altern.: https://github.com/jnk22/kodinerds-iptv/blob/master/iptv/kodi/kodi.m3u</info7>
<info8> Dash-Streams: https://github.com/jnk22/kodinerds-iptv/tree/master/iptv/dash</info8>
</channels_info>

<channel>
Expand All @@ -36,7 +37,7 @@
<hrefsender>ZDF</hrefsender>
<link>ZDFsource</link>
<thumbnail>tv-zdf.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>ZDF</EPG_ID>
<date>23.02.2020</date>
<geoblock>ja</geoblock>
Expand All @@ -46,7 +47,7 @@
<hrefsender>KiKA</hrefsender>
<link>ZDFsource</link>
<thumbnail>tv-kika.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>KIKA</EPG_ID>
<date>07.09.2018</date>
<geoblock>ja</geoblock>
Expand All @@ -57,7 +58,7 @@
<link>ARDSource</link>
<info>ARDSource zuverlässiger als ZDFsource</info>
<thumbnail>tv-arte.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>ARTE</EPG_ID>
<date>07.09.2018</date>
<geoblock>ja</geoblock>
Expand All @@ -76,7 +77,7 @@
<hrefsender>3sat</hrefsender>
<link>ZDFsource</link>
<thumbnail>tv-3sat.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>3SAT</EPG_ID>
<date>23.02.2020</date>
<geoblock>ja</geoblock>
Expand All @@ -86,7 +87,7 @@
<hrefsender>ZDFneo</hrefsender>
<link>ZDFsource</link>
<thumbnail>tv-zdf-neo.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>2NEO</EPG_ID>
<date>23.02.2020</date>
<geoblock>ja</geoblock>
Expand All @@ -96,7 +97,7 @@
<hrefsender>ZDFinfo</hrefsender>
<link>ZDFsource</link>
<thumbnail>tv-zdf-info.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>ZINFO</EPG_ID>
<date>11.06.2016</date>
<geoblock>ja</geoblock>
Expand All @@ -106,7 +107,7 @@
<hrefsender></hrefsender>
<link>https://ardevent2.akamaized.net/hls/live/681512/ardevent2_geo/master.m3u8</link>
<thumbnail>tv-ard-sportschau.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID></EPG_ID>
<date>16.04.2019</date>
<geoblock>ja</geoblock>
Expand All @@ -125,7 +126,7 @@
<hrefsender>Phoenix</hrefsender>
<link>ARDSource</link>
<thumbnail>tv-phoenix.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>PHOEN</EPG_ID>
<date>23.02.2020</date>
<geoblock>ja</geoblock>
Expand Down Expand Up @@ -305,7 +306,7 @@
<info>TVToday: SWR/SR gemeinsam</info>
</item>
<item>
<title>SWR Rheinland-Pfalz HD</title>
<title>SWR Rheinland-Pfalz</title>
<hrefsender></hrefsender>
<tvg-name>SWRFernsehen-rp.de</tvg-name>
<link>IPTVSource|/jnk22/kodinerds-iptv/blob/master/iptv/kodi/kodi.m3u</link>
Expand Down Expand Up @@ -379,31 +380,31 @@
<title>n-tv</title>
<link-out>LiveTV_ntv.m3u8</link-out>
<thumbnail>tv-ntv.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>NTV</EPG_ID>
<date>12.10.2018 - verschlüsselt, nicht mehr verfügbar</date>
</item-out>
<item>
<title>QVC_1</title>
<link>https://qvcde-live.akamaized.net/hls/live/2097104/qvc/master.m3u8</link>
<thumbnail>tv-qvc.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>QVC</EPG_ID>
<date>04.01.2024</date>
</item>
<item>
<title>QVC_BEAUTY & STYLE</title>
<link>https://qvcde-live.akamaized.net/hls/live/2097104/qby/master.m3u8</link>
<thumbnail>tv-qvc.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>qvcbs</EPG_ID>
<date>04.01.2024</date>
</item>
<item>
<title>QVC_PLUS</title>
<link>https://qvcde-live.akamaized.net/hls/live/2097104/qps/master.m3u8</link>
<thumbnail>tv-qvc.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID>qvcp</EPG_ID>
<date>04.01.2024</date>
</item>
Expand Down Expand Up @@ -482,7 +483,7 @@
<title>Lausitzwelle Fernsehen</title>
<link>https://h056.video-stream-hosting.de/easycast11-live/_definst_/mp4:livestreamhd2/playlist.m3u8</link>
<thumbnail>tv-livestreams.png</thumbnail>
<imgsource>Arauco</imgsource>
<imgsource></imgsource>
<EPG_ID></>
<date>20.06.2023</date>
</item>
Expand Down

0 comments on commit ee4cdfb

Please sign in to comment.