diff --git a/README.md b/README.md index 35758e83..34fdd5bf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![stable version](https://img.shields.io/badge/stable_version-1.7.5-blue.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect/bin/repository.plexkodiconnect/repository.plexkodiconnect-1.0.0.zip) -[![beta version](https://img.shields.io/badge/beta_version-1.7.5-red.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect_BETA/bin-BETA/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.0.zip) +[![stable version](https://img.shields.io/badge/stable_version-1.7.6-blue.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect/bin/repository.plexkodiconnect/repository.plexkodiconnect-1.0.0.zip) +[![beta version](https://img.shields.io/badge/beta_version-1.7.6-red.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect_BETA/bin-BETA/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.0.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) diff --git a/addon.xml b/addon.xml index 16b229a2..16e38c9c 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/changelog.txt b/changelog.txt index 3b3a64e7..af551374 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,6 @@ +version 1.7.6 +- Hotfix: Revert Cache missing artwork on PKC startup. This should help with slow PKC startup, videos not being started, lagging PKC, etc. + version 1.7.5 - Dutch translation, thanks @mvanbaak diff --git a/resources/lib/artwork.py b/resources/lib/artwork.py index 1336687f..1cd6143b 100644 --- a/resources/lib/artwork.py +++ b/resources/lib/artwork.py @@ -126,40 +126,6 @@ def double_urldecode(text): return unquote(unquote(text)) -def get_uncached_artwork(): - """ - Returns a list of URLs that haven't been cached yet - """ - all_urls = [] - cached_urls = [] - result = [] - connection = kodiSQL('video') - cursor = connection.cursor() - # Get all artwork urls - cursor.execute("SELECT url FROM art WHERE media_type != 'actor'") - for url in cursor.fetchall(): - all_urls.append(url[0]) - connection.close() - connection = kodiSQL('music') - cursor = connection.cursor() - cursor.execute("SELECT url FROM art") - for url in cursor.fetchall(): - all_urls.append(url[0]) - connection.close() - # Get the cached urls - connection = kodiSQL('texture') - cursor = connection.cursor() - cursor.execute("SELECT url FROM texture") - for url in cursor.fetchall(): - cached_urls.append(url[0]) - connection.close() - for url in all_urls: - if url not in cached_urls: - result.append(url) - log.info('%s artwork urls have not been cached yet' % len(result)) - return result - - @ThreadMethodsAdditionalStop('plex_shouldStop') @ThreadMethods class Image_Cache_Thread(Thread): diff --git a/resources/lib/librarysync.py b/resources/lib/librarysync.py index c22074f7..8fe14c61 100644 --- a/resources/lib/librarysync.py +++ b/resources/lib/librarysync.py @@ -15,14 +15,13 @@ from utils import window, settings, getUnixTimestamp, sourcesXML,\ ThreadMethods, ThreadMethodsAdditionalStop, LogTime, getScreensaver,\ setScreensaver, playlistXSP, language as lang, DateToKodi, reset,\ advancedSettingsXML, tryDecode, deletePlaylists, deleteNodes, \ - ThreadMethodsAdditionalSuspend, create_actor_db_index, tryEncode, dialog + ThreadMethodsAdditionalSuspend, create_actor_db_index, dialog import downloadutils import itemtypes import plexdb_functions as plexdb import kodidb_functions as kodidb import userclient import videonodes -import artwork import variables as v from PlexFunctions import GetPlexMetadata, GetAllPlexLeaves, scrobble, \ @@ -1522,11 +1521,6 @@ class LibrarySync(Thread): # Initialize time offset Kodi - PMS self.syncPMStime() lastSync = getUnixTimestamp() - if settings('enableTextureCache') == "true": - # Start caching artwork that has not been cached yet - for url in artwork.get_uncached_artwork(): - artwork.ARTWORK_QUEUE.put( - artwork.double_urlencode(tryEncode((url)))) if settings('FanartTV') == 'true': # Start getting additional missing artwork with plexdb.Get_Plex_DB() as plex_db: @@ -1612,6 +1606,7 @@ class LibrarySync(Thread): elif window('plex_runLibScan') == 'del_textures': window('plex_runLibScan', clear=True) window('plex_dbScan', value="true") + import artwork artwork.Artwork().fullTextureCacheSync() window('plex_dbScan', clear=True) else: