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) 
+[![stable version](https://img.shields.io/badge/stable_version-2.1.0-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.30-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.1.0-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.30" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.1.0" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -67,7 +67,21 @@
     <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.30 (beta only):
+    <news>version 2.1.0:
+Finally a new update for the stable version. You will need to reconnect to your PMS and reset the Kodi database once. Highlights of v2 include:
+- Support for Plex extras
+- Huge improvements to Plex Companion
+- Fixes to Alexa voice control
+- Kodi 18 Leia Alpha 1 support
+- Improvements to playback start-up
+- Improvements to the syncing mechanism, which should get rid of a ton of small bugs
+- Fixes to widgets and resuming playback
+- Use of plex.direct paths instead of local IP addresses to ensure the SSL certificates shown by the PMS are deemed valid
+- Fix Kodi screensaver
+- Faster PKC startup
+- And tons of other stuff...
+
+version 2.0.30 (beta only):
 - Fix resume for On Deck widget for direct paths
 - Fix DB reset on Startup if PMS connection fails
 - Fix searching for PMS if there is no internet connection

changelog.txt

@@ -1,3 +1,17 @@
+version 2.1.0:
+Finally a new update for the stable version. You will need to reconnect to your PMS and reset the Kodi database once. Highlights of v2 include:
+- Support for Plex extras
+- Huge improvements to Plex Companion
+- Fixes to Alexa voice control
+- Kodi 18 Leia Alpha 1 support
+- Improvements to playback start-up
+- Improvements to the syncing mechanism, which should get rid of a ton of small bugs
+- Fixes to widgets and resuming playback
+- Use of plex.direct paths instead of local IP addresses to ensure the SSL certificates shown by the PMS are deemed valid
+- Fix Kodi screensaver
+- Faster PKC startup
+- And tons of other stuff...
+
 version 2.0.30 (beta only):
 - Fix resume for On Deck widget for direct paths
 - Fix DB reset on Startup if PMS connection fails

resources/lib/migration.py

@@ -15,12 +15,12 @@ def check_migration():
         settings('last_migrated_PKC_version', value=v.ADDON_VERSION)
         return
 
-    if not compare_version(v.ADDON_VERSION, '1.8.2'):
+    if not compare_version(last_migration, '1.8.2'):
         log.info('Migrating to version 1.8.1')
         # Set the new PKC theMovieDB key
         settings('themoviedbAPIKey', value='19c90103adb9e98f2172c6a6a3d85dc4')
 
-    if not compare_version(v.ADDON_VERSION, '2.0.25'):
+    if not compare_version(last_migration, '2.0.25'):
         log.info('Migrating to version 2.0.24')
         # Need to re-connect with PMS to pick up on plex.direct URIs
         settings('ipaddress', value='')