diff --git a/README.md b/README.md index 47da767..3c42484 100644 --- a/README.md +++ b/README.md @@ -29,14 +29,16 @@ EMail: rols1@gmx.de INSTALLATION =================== ## english: -- Download zip-file from https://github.com/rols1/Kodi-Addon-FlickrExplorer/releases/latest +- Kodi 19 (Matrix): Download zip-file from https://github.com/rols1/Kodi-Addon-FlickrExplorer/releases/latest +- Kodi 18 (Leia, Krypton): [Krypton-Version kodinerds.net](https://repo.kodinerds.net/index.php?action=list&scope=all&version=krypton/) - Download script.module.kodi-six.zip from https://github.com/romanvm/kodi.six/releases - choose downloaded zip-files with your Kodi-Browser - start addon and make the appropriate settings - [further instructions with pictures](https://kodi.wiki/view/HOW-TO:Install_add-ons_from_zip_files) ## deutsch: -- Download der zip-Datei hier: https://github.com/rols1/Kodi-Addon-FlickrExplorer/releases/latest +- Kodi 19 (Matrix): Download der zip-Datei https://github.com/rols1/Kodi-Addon-FlickrExplorer/releases/latest +- Kodi 18 (Leia, Krypton): [Krypton-Version kodinerds.net](https://repo.kodinerds.net/index.php?action=list&scope=all&version=krypton/) - Download script.module.kodi-six.zip hier https://github.com/romanvm/kodi.six/releases - Beide zip-Dateien mittels Kodi-Menü Addons/Addon-Browser installieren - Addon öffen und Addon-Einstellungen anpassen. diff --git a/addon.xml b/addon.xml index 8064a3c..f1ec7d1 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/changelog.txt b/changelog.txt index 62495ef..ea5f32c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -3,7 +3,12 @@ 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. +06.04.2023 0.7.6 RequestUrl: url in error_txt removed (too long), fix page.decode + (should not empty). + FlickrPeople: adaptations to changes on the website (format totalItems, + unquote page), item in language strings added. + +28.01.2023 0.7.5 Modul updater: adjust_line updated for Kodi 20 Nexus. 26.09.2021 0.7.4 RequestUrl: ssl.SSLContext(ssl.PROTOCOL_TLSv1) changed to ssl.create_default_context() for security reasons. diff --git a/flickrexplorer.py b/flickrexplorer.py index 74a6713..6098898 100644 --- a/flickrexplorer.py +++ b/flickrexplorer.py @@ -56,8 +56,8 @@ # +++++ FlickrExplorer - Addon Kodi-Version, migriert von der Plexmediaserver-Version +++++ -VERSION = '0.7.5' -VDATE = '29.01.2023' +VERSION = '0.7.6' +VDATE = '05.04.2023' # # @@ -246,10 +246,11 @@ def Main(): fparams=fparams) title = L('Flickr Nutzer') - summ = L("Suche Nutzer und ihre Inhalte") + ': ' + str(SETTINGS.getSetting('FlickrPeople')) + tag = L("Suche Nutzer und ihre Inhalte") + ': [B]%s[/B]' % str(SETTINGS.getSetting('FlickrPeople')) + summ = L(u"Der Name für FlickrPeople kann im Setting geändert werden") fparams="&fparams={}" addDir(li=li, label=title, action="dirList", dirID="FlickrPeople", fanart=R('icon-user.png'), thumb=R('icon-user.png'), - fparams=fparams, summary=summ) + fparams=fparams, tagline=tag, summary=summ) # Updater-Modul einbinden: repo_url = 'https://github.com/{0}/releases/'.format(GITHUB_REPOSITORY) @@ -680,12 +681,13 @@ def FlickrPeople(pagenr=1): # totalItems[2] enthält die Anzahl. Falls page zu groß (keine weiteren # Ergebnisse), enthalten sie 0. try: - totalItems = re.findall(r'totalItems":(\d+)\}\]', page) # Bsp. "totalItems":7}] + totalItems = re.findall(r'totalItems":(\d+)', page) # Bsp. "totalItems":7}] PLog(totalItems) total = int(totalItems[0]) except Exception as exception: PLog(str(exception)) PLog("total: " + str(total)) + page = unquote(page) # "44837724%40N07" -> "44837724@N07" records = blockextract('_flickrModelRegistry":"search-contact-models"', 'flickrModelRegistry', page) PLog(len(records)) diff --git a/resources/Strings/de.json b/resources/Strings/de.json index 1d78383..84088c7 100644 --- a/resources/Strings/de.json +++ b/resources/Strings/de.json @@ -66,7 +66,8 @@ "delete Cache": "delete Cache", "Bilder geloescht": "Bilder gelöscht", "Bilder LOESCHEN": "Bilder LÖSCHEN", - "Abbruch": "Abbruch" + "Abbruch": "Abbruch", + "Der Name für FlickrPeople kann im Setting geändert werden": "Der Name für FlickrPeople kann im Setting geändert werden" } diff --git a/resources/Strings/en.json b/resources/Strings/en.json index 8081933..c2280ca 100644 --- a/resources/Strings/en.json +++ b/resources/Strings/en.json @@ -67,7 +67,8 @@ "delete Cache": "delete Cache", "Bilder geloescht": "Images deleted" "Bilder LOESCHEN": "DELETE images", - "Abbruch": "Cancel" + "Abbruch": "Cancel", + "Der Name für FlickrPeople kann im Setting geändert werden": "The name for FlickrPeople can be changed in the Setting" } diff --git a/resources/lib/util_flickr.py b/resources/lib/util_flickr.py index 38426b0..af0bf04 100644 --- a/resources/lib/util_flickr.py +++ b/resources/lib/util_flickr.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # util_flickr.py # -# Stand: 26.09.2021 +# Stand: 05.04.2023 # Python3-Kompatibilität: from __future__ import absolute_import @@ -800,9 +800,8 @@ def RequestUrl(CallerName, url): ret.close() # PLog(page[:160]) except Exception as exception: - error_txt = "RequestUrl: %s-1: %s" % (CallerName, str(exception)) - error_txt = error_txt + ' | ' + url - msg = error_txt + error_txt = u"RequestUrl: %s-1: %s" % (CallerName, str(exception)) + msg=error_txt PLog(msg) page='' @@ -810,7 +809,9 @@ def RequestUrl(CallerName, url): return page, msg else: PLog(page[:100]) - page = page.decode('utf-8') + if page: + page = page.decode('utf-8') + return page, msg ####################################################################################################