Skip to content

Commit

Permalink
changes see changelog.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
rols1 committed Jan 29, 2023
1 parent b5c401c commit c6aa30a
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 13 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.image.flickrexplorer" name="FlickrExplorer" version="0.7.4" provider-name="rols1 (rols1@gmx.de)">
<addon id="plugin.image.flickrexplorer" name="FlickrExplorer" version="0.7.5+matrix" provider-name="rols1 (rols1@gmx.de)">
<requires>
<import addon="xbmc.python" version="2.25.0"/>
<import addon="xbmc.python" version="3.0.0"/>
<import addon="script.module.kodi-six" />
</requires>
<extension point="xbmc.python.pluginsource" library="flickrexplorer.py">
Expand Down
2 changes: 2 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ CHANGE HISTORY Kodi-Addon-FlickrExplorer
Releases: https://github.com/rols1/Kodi-Addon-FlickrExplorer/releases
--------------

28.01.2023 0.7.5 Modul updater: Aktualisierung adjust_line für Kodi 20 Nexus.

26.09.2021 0.7.4 RequestUrl: ssl.SSLContext(ssl.PROTOCOL_TLSv1) changed to
ssl.create_default_context() for security reasons.
RequestUrl: UrlopenTimeout changed from 3 to 10 (sec).
Expand Down
4 changes: 2 additions & 2 deletions flickrexplorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@

# +++++ FlickrExplorer - Addon Kodi-Version, migriert von der Plexmediaserver-Version +++++

VERSION = '0.7.4'
VDATE = '26.09.2021'
VERSION = '0.7.5'
VDATE = '29.01.2023'

#
#
Expand Down
36 changes: 27 additions & 9 deletions resources/lib/updater.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
################################################################################
# 01.12.2019 Migration Python3 Modul kodi_six + manuelle Anpassungen
# 18.03.2020 adjust_AddonXml: Anpassung python-Version an Kodi-Version
# 13.04.2020 Aktualisierung adjust_AddonXml
# 13.04.2020 Aktualisierung adjust_AddonXml
# 29.01.2023 Aktualisierung adjust_line für Kodi 20 Nexus
################################################################################
#

Expand Down Expand Up @@ -194,23 +195,40 @@ def adjust_line(line):
PLog(KODI_VERSION)
new_line = line

if KODI_VERSION.startswith('19.'): # Anp. Kodi Matrix
try:
vers = re.search(u'(\d+).', KODI_VERSION).group(0)
except Exception as exception:
PLog(str(exception))
vers = "19" # Default Matrix
vers = int(vers)
PLog("vers: %d" % vers)

if vers < 19: # Leia, Krypton, ..
if 'addon="xbmc.python"' in line:
python_ver = stringextract('version="', '"', line)
new_line = line.replace(python_ver, '2.25.0')
if 'addon id=' in line:
new_line = line.replace('+matrix', '') # ev. Downgrade
new_line = line.replace('+nexus', '') # ev. Downgrade

if vers == 19: # Matrix
if 'addon="xbmc.python"' in line:
python_ver = stringextract('version="', '"', line)
new_line = line.replace(python_ver, '3.0.0')
if 'addon id=' in line:
addon_ver = stringextract('version="', '"', line)
if 'matrix' not in line: # Anp. Addon-Version
addon_ver = stringextract('version="', '"', line)
if 'matrix' not in line:
new_line = line.replace(addon_ver, '%s+matrix' % addon_ver)

else: # Anp. Kodi <= Leia
if vers == 20: # Nexus
if 'addon="xbmc.python"' in line:
python_ver = stringextract('version="', '"', line)
new_line = line.replace(python_ver, '2.25.0') # Anp. Python-Version
new_line = line.replace(python_ver, '3.0.1')
if 'addon id=' in line:
new_line = line.replace('+matrix', '') # Anp. Addon-Version
addon_ver = stringextract('version="', '"', line)
if 'nexus' not in line:
new_line = line.replace(addon_ver, '%s+nexus' % addon_ver)

return new_line # unverändert
return new_line

################################################################################
# save_restore: Cache sichern / wieder herstellen
Expand Down
Binary file added resources/lib/updater.pyo
Binary file not shown.

0 comments on commit c6aa30a

Please sign in to comment.