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 Apr 6, 2023
1 parent 69d9f49 commit 7bcd32a
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 16 deletions.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
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.image.flickrexplorer" name="FlickrExplorer" version="0.7.5+matrix" provider-name="rols1 (rols1@gmx.de)">
<addon id="plugin.image.flickrexplorer" name="FlickrExplorer" version="0.7.6+matrix" provider-name="rols1 (rols1@gmx.de)">
<requires>
<import addon="xbmc.python" version="3.0.0"/>
<import addon="script.module.kodi-six" />
Expand Down
7 changes: 6 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
12 changes: 7 additions & 5 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.5'
VDATE = '29.01.2023'
VERSION = '0.7.6'
VDATE = '05.04.2023'

#
#
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand Down
3 changes: 2 additions & 1 deletion resources/Strings/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}


Expand Down
3 changes: 2 additions & 1 deletion resources/Strings/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}


Expand Down
11 changes: 6 additions & 5 deletions resources/lib/util_flickr.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -800,17 +800,18 @@ 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=''

if '/video_download.gne' in url: # Videodaten unverändert weiter
return page, msg
else:
PLog(page[:100])
page = page.decode('utf-8')
if page:
page = page.decode('utf-8')

return page, msg

####################################################################################################
Expand Down

0 comments on commit 7bcd32a

Please sign in to comment.