Skip to content

Commit

Permalink
Änderungen / Korrekturen siehe changelog.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
rols1 committed Jul 16, 2023
1 parent 4d8dfde commit ddaa65b
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 9 deletions.
4 changes: 2 additions & 2 deletions addon.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.ardundzdf" name="ARDundZDF" version="4.7.7+matrix" provider-name="rols1 (rols1@gmx.de)">
<addon id="plugin.video.ardundzdf" name="ARDundZDF" version="4.7.8+nexus" provider-name="rols1 (rols1@gmx.de)">
<requires>
<import addon="xbmc.python" version="3.0.0"/>
<import addon="xbmc.python" version="3.0.1"/>
<import addon="script.module.kodi-six" />
</requires>
<extension point="xbmc.python.pluginsource" library="ardundzdf.py">
Expand Down
6 changes: 3 additions & 3 deletions ardundzdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@

# VERSION -> addon.xml aktualisieren
# <nr>119</nr> # Numerierung für Einzelupdate
VERSION = '4.7.7'
VDATE = '14.07.2023'
VERSION = '4.7.8'
VDATE = '16.07.2023'


# (c) 2019 by Roland Scholz, rols1@gmx.de
Expand Down Expand Up @@ -2932,7 +2932,7 @@ def ARDSportWDRArchiv():
fparams=fparams, tagline=tag)

title = u"Event: [B]Tour de France[/B]" # Großevent
tag = u"Rennberichte, Analysen, Bilder, Ergebnisse und Wertungen zu allen Etappen der Tour de France 2022."
tag = u"Rennberichte, Analysen, Bilder, Ergebnisse und Wertungen zu allen Etappen der Tour de France."
cacheID = "Sport_TourdeFrance"
img = "https://images.sportschau.de/image/4caa92cb-1518-4489-8bec-3b0764c14aa8/AAABgQJrLa8/AAABgPp7Db4/16x9-1280/tour-de-france-bild-102.jpg"
path = "https://www.sportschau.de/radsport/tourdefrance/index.html"
Expand Down
17 changes: 17 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,23 @@ CHANGE HISTORY
max_col 97
--------------

16.07.2023 4.7.8
Parseplaylist: url_check der master-m3u8-Auswertung vorangestellt (rel. für
VideoEvent-Streams).
get_json_content (ARDnew): Anpassung Sek.-Format für Kennz. ganzer Sendungen
(seconds_translate).
get_page (util): vorzeitiger Ausstieg, falls in Stufe 1 (get_page1) ein HTTP
Error auftaucht (rel. für VideoEvent-Streams).
PlayVideo (util): play_time und video_dur vorbelegt für Rückgabe bei url_check
=False.
PlayVideo (util): zusätzl. Param. live als Kennung für Livestreams (relevant
für ThreadShowSeekPos), Anpassungen: arte_Live, SenderLiveResolution,
Parseplaylist, PlayButtonM3u8, WDRstream + ARDSportVideo (WDR-Livestreams),
Live (my3Sat), phoenix_Live, XL_Live, ZDF_Live.
ShowSeekPos (util): Test auf Verfügbarkeit des Players bereits vor showSubtitles
in PlayVideo, 2 Sync-Checks in waitForAbort-Schleife eingefügt, WRD-Lokalzeit-
Streams nicht zugelassen (live="" in WDRstream + ARDSportVideo).

25.06.2023 4.7.7
ShowSeekPos (util): neu - blendet nach Verschieben der Pufferposition von
inputstream.adaptive die passende Uhrzeit per Notification ein (Aufruf in
Expand Down
Binary file added resources/lib/ARDnew.pyc
Binary file not shown.
9 changes: 5 additions & 4 deletions resources/lib/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -2032,15 +2032,15 @@ def time_translate(timecode, add_hour=True, day_warn=False):
ts = datetime.datetime.fromtimestamp(time.mktime(time.strptime(timecode, date_format)))
add_hour = 1 # Default
#PLog("ts: %s, start_ts: %s , end_ts: %s" % (ts, start_ts, end_ts))
if ts > start_ts and ts < end_ts: # Timecode in Sommerzeit
if ts > start_ts and ts < end_ts: # Timecode liegt in Sommerzeit
add_hour = 2
PLog("add_hour: %s" % add_hour)
except Exception as exception:
PLog(str(exception))
return timecode

try:
# ts = datetime.strptime(timecode, date_format) # None beim 2. Durchlauf (s.o.)
# ts = datetime.strptime(timecode, date_format) # None beim 2. Durchlauf (s.o. 26.08.2019)
ts = datetime.datetime.fromtimestamp(time.mktime(time.strptime(timecode, date_format)))
new_ts = ts + datetime.timedelta(hours=add_hour) # add-Faktor addieren
ret_ts = new_ts.strftime("%d.%m.%Y %H:%M")
Expand All @@ -2053,7 +2053,7 @@ def time_translate(timecode, add_hour=True, day_warn=False):
PLog(new_ts);
PLog("sday-today: %s" % dif)
try:
if dif.find("day") < 0: # nur Stunden: 16:32:05.225575
if dif.find("day") < 0: # nur noch Stunden: 16:32:05.225575
dif = "1"
else:
dif = re.search(u'(\d+) day', dif).group(1)
Expand Down Expand Up @@ -3544,6 +3544,7 @@ def PlayVideo(url, title, thumb, Plot, sub_path=None, playlist='', seekTime=0, M
if SETTINGS.getSetting('pref_inputstream') == 'true':
if SETTINGS.getSetting('pref_streamtime') == 'true' and live:
if player_detect:
xbmc.sleep(2000)
from threading import Thread # Github-issue #30: Seek-Pos. -> Streamuhrzeit
PLog("Thread_ShowSeekPos_start:")
bg_thread = Thread(target=ShowSeekPos, args=(player, url))
Expand Down Expand Up @@ -3878,7 +3879,7 @@ def ShowSeekPos(player, url):

LastSeek=p
else:
PLog("monitor_stop")
PLog("monitor_ShowSeekPos_stop")
break

return
Expand Down

0 comments on commit ddaa65b

Please sign in to comment.