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 Oct 11, 2020
1 parent c442684 commit e6e7225
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 6 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.image.flickrexplorer" name="FlickrExplorer" version="0.7.0" provider-name="rols1 (rols1@gmx.de)">
<addon id="plugin.image.flickrexplorer" name="FlickrExplorer" version="0.7.1" provider-name="rols1 (rols1@gmx.de)">
<requires>
<import addon="xbmc.python" version="2.25.0"/>
<import addon="script.module.kodi-six" />
Expand Down
6 changes: 5 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ CHANGE HISTORY Kodi-Addon-FlickrExplorer
Releases: https://github.com/rols1/Kodi-Addon-FlickrExplorer/releases
--------------

12.10.2020 0.7.1 BuildPath: BuildExtras now included for all photosets (albums were
missed).
MyAlbums: title unescaped.

24.09.2020 0.7.0 fanart.png changed to fanart.jpg (dto. in addon.xml).
Icons replaced: plugin-update.png, icon.png.
Matrix-Adaption 9.0-alpha 2: change xbmc.translatePath ->
Expand All @@ -12,7 +16,7 @@ CHANGE HISTORY Kodi-Addon-FlickrExplorer
Search: list of last search-terms added (max. 25)
BuildPath: quoting for query terms to prevent url errors.

13.04.2020 0.6.9 Updater-Modul: update adjust_AddonXml - consideration of changes
not on Github 0.6.9 Updater-Modul: update adjust_AddonXml - consideration of changes
in addon.xml by addon-external tools (change of position of fields).

11.04.2020 0.6.8 Dialog-Calls for Kodi Matrix adapted:
Expand Down
10 changes: 6 additions & 4 deletions flickrexplorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@

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

VERSION = '0.7.0'
VDATE = '22.09.2020'
VERSION = '0.7.1'
VDATE = '12.10.2020'

#
#
Expand Down Expand Up @@ -537,7 +537,9 @@ def MyAlbums(title, user_id, pagenr):
count_photos = stringextract('photos="', '"', rec)
secret = stringextract('secret=\"', '\"', rec)
serverid = stringextract('server=\"', '\"', rec)
farmid = stringextract('farm=\"', '\"', rec)
farmid = stringextract('farm=\"', '\"', rec)

title = unescape(title)

# Url-Format: https://www.flickr.com/services/api/misc.urls.html
# thumb_src = 'https://farm%s.staticflickr.com/%s/%s_%s_z.jpg' % (farmid, serverid, photoset_id, secret) # m=small (240)
Expand Down Expand Up @@ -1490,7 +1492,7 @@ def BuildPath(method, query_flickr, user_id, pagenr):

# Suchstring + Extras anfügen für Fotoabgleich -
# s. https://www.flickr.com/services/api/flickr.photos.search.html
if 'photos.search' in method or 'favorites.getList' in method or 'photosets.getList' in method or 'galleries.getPhotos' in method:
if 'photos.search' in method or 'favorites.getList' in method or 'photosets' in method or 'galleries.getPhotos' in method:
extras = BuildExtras() # einschl. Dict['extras_list'] für Fotoabgleich
if query_flickr.startswith('&') and query_flickr.endswith('&'): # von MyPhotostream / MyFaves
query_flickr = '' # alle listen
Expand Down
Binary file removed resources/__init__.pyo
Binary file not shown.
Binary file removed resources/lib/__init__.pyo
Binary file not shown.

0 comments on commit e6e7225

Please sign in to comment.