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 Nov 22, 2024
1 parent 083db3b commit 7dfc0c4
Show file tree
Hide file tree
Showing 10 changed files with 44 additions and 4,296 deletions.
2 changes: 1 addition & 1 deletion addon.xml
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="5.1.3+matrix" provider-name="rols1 ([email protected])">
<addon id="plugin.video.ardundzdf" name="ARDundZDF" version="5.1.4+matrix" provider-name="rols1 ([email protected])">
<requires>
<import addon="xbmc.python" version="3.0.0"/>
<import addon="script.module.kodi-six" />
Expand Down
4 changes: 2 additions & 2 deletions ardundzdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@

# VERSION -> addon.xml aktualisieren
# <nr>224</nr> # Numerierung für Einzelupdate
VERSION = '5.1.3'
VDATE = '16.11.2024'
VERSION = '5.1.4'
VDATE = '22.11.2024'


# (c) 2019 by Roland Scholz, [email protected]
Expand Down
4,318 changes: 33 additions & 4,285 deletions changelog.txt

Large diffs are not rendered by default.

Binary file modified fanart.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/fanart.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/ard-funk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/images/ard-kika.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion resources/lib/ARDnew.py
Original file line number Diff line number Diff line change
Expand Up @@ -2714,7 +2714,7 @@ def ARDSearchnew(title, sender, offset=0, query='', homeID=""):
Main_NEW(NAME)

query = query.strip()
#query = query.replace(' ', '+') # für Merkliste - 01.03.2023 nicht mehr relevant
query = query.replace(' ', '+') # für Merkliste - 01.03.2023 nicht mehr relevant
query_org = query
query=py2_decode(query) # decode, falls erf. (1. Aufruf)

Expand Down
14 changes: 7 additions & 7 deletions resources/lib/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -1272,7 +1272,7 @@ def getHeaders(response): # z.Z. nicht genutzt
#
def getRedirect(path, header=""):
PLog('getRedirect: '+ path)
msg=""
page=""; msg=""
parsed = urlparse(path)

try:
Expand Down Expand Up @@ -1448,7 +1448,7 @@ def RLoad(fname, abs_path=False): # ersetzt Resource.Load von Plex
with open(path,'r') as f:
page = f.read()
else:
with open(path,'r', encoding="utf8") as f:
with open(path,'r', encoding="utf-8") as f:
page = f.read()
except Exception as exception:
PLog(str(exception))
Expand All @@ -1458,7 +1458,7 @@ def RLoad(fname, abs_path=False): # ersetzt Resource.Load von Plex
# Gegenstück zu RLoad - speichert Inhalt page in Datei fname im
# Dateisystem. PluginAbsPath muss in fname enthalten sein,
# falls im Pluginverz. gespeichert werden soll
# Migration Python3: immer utf8 - Alt.: xbmcvfs.File mit
# Migration Python3: immer utf-8 - Alt.: xbmcvfs.File mit
# Bytearray (s. merkliste.py)
# 05.07.2020 erweitert für Lock-Nutzung (für Monitor in epgRecord).
#
Expand Down Expand Up @@ -1490,7 +1490,7 @@ def RSave(fname, page, withcodec=False):
with open(path,'w') as f:
f.write(page)
else:
with open(path,'w', encoding="utf8") as f:
with open(path,'w', encoding="utf-8") as f:
f.write(page)

except Exception as exception:
Expand Down Expand Up @@ -1537,7 +1537,7 @@ def repl_char(cut_char, line): # problematische Zeichen in Text entfernen, wenn
# Hochkommata (Problem bei Dictbildung)
# doppelte utf-8-Enkodierung führt an manchen Stellen zu Sonderzeichen
# 14.04.2019 entfernt: (':', ' ')
# 07.11.2024 entfernt html-utf8-Icons (Symbole Popcorn, TV usw)
# 07.11.2024 entfernt html-utf-8-Icons (Symbole Popcorn, TV usw)
def repl_json_chars(line):
line_ret = line
#PLog(type(line_ret))
Expand Down Expand Up @@ -1578,12 +1578,12 @@ def valid_title_chars(line):
# {'id': 'x', 'title': 'x'} -> {"id":"x", "title":"x"} ohne LF's,
# Hochkommata -> *, sächs. Genitiv 's -> Blank
# line=Dict
# 18.09.2024 replacing umgestellt auf json.dumps (utf8-codiert für PY2)
# 18.09.2024 replacing umgestellt auf json.dumps (utf-8-codiert für PY2)
def my_jsondump(line):
PLog("my_jsondump:")
try:
if PYTHON2:
s=json.dumps(line, indent=None, separators=(",",":"), ensure_ascii=False).encode('utf8')
s=json.dumps(line, indent=None, separators=(",",":"), ensure_ascii=False).encode('utf-8')
else:
s=json.dumps(line, indent=None, separators=(",",":"), ensure_ascii=False)
except Exception as exception:
Expand Down

0 comments on commit 7dfc0c4

Please sign in to comment.