Merge branch 'master' into playlists

README.md

@@ -1,5 +1,5 @@
 [![stable version](https://img.shields.io/badge/stable_version-1.8.18-blue.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/stable/repository.plexkodiconnect/repository.plexkodiconnect-1.0.2.zip) 
-[![beta version](https://img.shields.io/badge/beta_version-2.0.21-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
+[![beta version](https://img.shields.io/badge/beta_version-2.0.22-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
 
 [![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/Installation)
 [![FAQ](https://img.shields.io/badge/wiki-FAQ-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/faq)

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.0.21" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.0.22" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -67,7 +67,11 @@
     <summary lang="ru_RU">Нативная интеграция сервера Plex в Kodi</summary>
     <description lang="ru_RU">Подключите Kodi к своему серверу Plex. Плагин предполагает что вы управляете своими видео с помощью Plex (а не в Kodi). Вы можете потерять текущие базы данных музыки и видео в Kodi (так как плагин напрямую их изменяет). Используйте на свой страх и риск</description>
     <disclaimer lang="ru_RU">Используйте на свой страх и риск</disclaimer>
-    <news>version 2.0.21 (beta only):
+    <news>version 2.0.22 (beta only):
+- Fix Recently Added for tv shows not working
+- Fix PKC crashing on startup
+
+version 2.0.21 (beta only):
 - Fix TV show artwork Kodi native library (reset Kodi DB!)
 - Cache missing posters and backgrounds/fanart on Kodi startup
 - Add toggle to deactivate image caching during playback

changelog.txt

@@ -1,3 +1,7 @@
+version 2.0.22 (beta only):
+- Fix Recently Added for tv shows not working
+- Fix PKC crashing on startup
+
 version 2.0.21 (beta only):
 - Fix TV show artwork Kodi native library (reset Kodi DB!)
 - Cache missing posters and backgrounds/fanart on Kodi startup

resources/lib/artwork.py

@@ -12,8 +12,8 @@ import requests
 from xbmc import sleep, translatePath
 from xbmcvfs import exists
 
-from utils import window, settings, language as lang, kodi_sql, try_encode, \
+from utils import settings, language as lang, kodi_sql, try_encode, try_decode,\
-    thread_methods, dialog, exists_dir, try_decode
+    thread_methods, dialog, exists_dir
 import state
 
 ###############################################################################
@@ -107,7 +107,7 @@ class Image_Cache_Thread(Thread):
                               'over-loaded. Sleep %s seconds before trying '
                               'again to download %s',
                               2**sleeptime, double_urldecode(url))
-                    sleep((2**sleeptime)*1000)
+                    sleep((2**sleeptime) * 1000)
                     sleeptime += 1
                     continue
                 except Exception as e:
@@ -162,9 +162,11 @@ class Artwork():
             return
         LOG.info('Caching has not been completed - caching %s major images',
                  len(artworks_to_cache))
+        # Caching %s images
         self.queue.put(ArtworkSyncMessage(lang(30006) % len(artworks_to_cache)))
         for url in artworks_to_cache:
             self.queue.put(url[0])
+        # Major image caching done
         self.queue.put(ArtworkSyncMessage(lang(30007)))
 
     def fullTextureCacheSync(self):

resources/lib/entrypoint.py

@@ -369,7 +369,7 @@ def getRecentEpisodes(viewid, mediatype, tagname, limit):
     append_show_title = settings('RecentTvAppendShow') == 'true'
     append_sxxexx = settings('RecentTvAppendSeason') == 'true'
     # First we get a list of all the TV shows - filtered by tag
-    allshowsIds = list()
+    allshowsIds = set()
     params = {
         'sort': {'order': "descending", 'method': "dateadded"},
         'filter': {'operator': "is", 'field': "tag", 'value': "%s" % tagname},