Merge pull request #1686 from croneter/python3-beta

Bump Python 3 master
Merge pull request #1685 from croneter/py3-version-bump
2021-10-30 18:45:29 +02:00 · 2021-10-30 18:44:33 +02:00 · 2021-10-30 18:44:20 +02:00 · 2021-10-30 18:43:38 +02:00 · 2021-10-30 18:34:35 +02:00 · 2021-10-22 21:23:19 +02:00
182 changed files with 5647 additions and 4831 deletions
--- a/.codacy.yaml
+++ b/.codacy.yaml
@ -1,5 +1,4 @@
 exclude_paths:
  - 'resources/lib/watchdog/**'
  - 'resources/lib/pathtools/**'
-  - 'resources/lib/pathtools/**'
-  - 'resources/lib/defused_etree.py'
+  - 'resources/lib/defusedxml/**'
--- a/README.md
+++ b/README.md
@ -1,8 +1,8 @@
 [![Kodi Leia stable version](https://img.shields.io/badge/Kodi_Leia_STABLE-latest-blue.svg?maxAge=60&style=flat) ](https://croneter.github.io/pkc-source/repository.plexkodiconnect.Kodi-Leia.STABLE.zip) 
 [![Kodi Leia beta version](https://img.shields.io/badge/Kodi_Leia_BETA-latest-red.svg?maxAge=60&style=flat) ](https://croneter.github.io/pkc-source/repository.plexkodiconnect.Kodi-Leia.BETA.zip)
-[![Kodi Matrix stable version](https://img.shields.io/badge/Kodi_Matrix_STABLE-latest-blue.svg?maxAge=60&style=flat) ](https://croneter.github.io/pkc-source/repository.plexkodiconnect.Kodi-Matrix.STABLE.zip)
 [![Kodi Matrix beta version](https://img.shields.io/badge/Kodi_Matrix_BETA-latest-red.svg?maxAge=60&style=flat) ](https://croneter.github.io/pkc-source/repository.plexkodiconnect.Kodi-Matrix.BETA.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)
 [![Forum](https://img.shields.io/badge/forum-plex-orange.svg?maxAge=60&style=flat)](https://forums.plex.tv/discussion/210023/plexkodiconnect-let-kodi-talk-to-your-plex)
@ -39,7 +39,11 @@ Unfortunately, the PKC Kodi repository had to move because it stopped working (t

 ### Download and Installation

-Using the Kodi file manager, add [https://croneter.github.io/pkc-source](https://croneter.github.io/pkc-source) as a new Kodi `Web server directory (HTTPS)` source, then install the PlexKodiConnect repository from this new source "from ZIP file". See the [github wiki installation manual](https://github.com/croneter/PlexKodiConnect/wiki/Installation) for a detailed guide. Kodi will update PKC automatically. 
+Install PKC via the PlexKodiConnect Kodi repository download button just below (do NOT use the standard GitHub download!). Alternatively, add [https://croneter.github.io/pkc-source](https://croneter.github.io/pkc-source) as a new Kodi `Web server directory (HTTPS)` source. See the [github wiki installation manual](https://github.com/croneter/PlexKodiConnect/wiki/Installation) for a detailed guide. Please use the stable version except if you really know what you're doing. Kodi will update PKC automatically. 
+
+| Stable version | Beta version |
+|----------------|--------------|
+| [![stable version](https://img.shields.io/badge/stable_version-latest-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-latest-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip) |

 ### Warning
 Use at your own risk! This plugin assumes that you manage all your videos with Plex (and none with Kodi). You might lose data already stored in the Kodi video and music databases as this plugin directly changes them. Don't worry if you want Plex to manage all your media (like you should ;-)). 
@ -49,10 +53,10 @@ Some people argue that PKC is 'hacky' because of the way it directly accesses th
 ### PKC Features

 - Support for Kodi 18 Leia and Kodi 19 Matrix
- Preliminary support for Kodi 20 Nexus. Keep in mind that development for Kodi Nexus has not even officially reached alpha stage - any issues you encounter are probably caused by that
- [Skip intros](https://support.plex.tv/articles/skip-content/)
+- Preliminary support for Kodi 19 Nexus. Keep in mind that development for Kodi Nexus has not even officially reached alpha stage - any issues you encounter are probably caused by that
 - [Amazon Alexa voice recognition](https://www.plex.tv/apps/streaming-devices/amazon-alexa)
 - [Cinema Trailers & Extras](https://support.plex.tv/articles/202934883-cinema-trailers-extras/)
+- If Plex did not provide a trailer, automatically get one using the Kodi add-on [The Movie Database](https://kodi.wiki/view/Add-on:The_Movie_Database)
 - [Plex Watch Later / Plex It!](https://support.plex.tv/hc/en-us/sections/200211783-Plex-It-)
 - [Plex Companion](https://support.plex.tv/hc/en-us/sections/200276908-Plex-Companion): fling Plex media (or anything else) from other Plex devices to PlexKodiConnect
 - Automatically sync Plex playlists to Kodi playlists and vice-versa
--- a/addon.xml
+++ b/addon.xml
@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.15.0" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="3.5.8" provider-name="croneter">
  <requires>
-    <import addon="xbmc.python" version="2.1.0"/>
-    <import addon="script.module.requests" version="2.9.1" />
-    <import addon="script.module.defusedxml" version="0.5.0"/>
-    <import addon="script.module.six" />
-    <import addon="plugin.video.plexkodiconnect.movies" version="2.1.3" />
-    <import addon="plugin.video.plexkodiconnect.tvshows" version="2.1.3" />
+    <import addon="xbmc.python" version="3.0.0"/>
+    <import addon="script.module.requests" version="2.22.0+matrix.1" />
+    <import addon="plugin.video.plexkodiconnect.movies" version="3.0.1" />
+    <import addon="plugin.video.plexkodiconnect.tvshows" version="3.0.1" />
+    <import addon="metadata.themoviedb.org.python" version="1.3.1+matrix.1" />
  </requires>
  <extension point="xbmc.python.pluginsource" library="default.py">
        <provides>video audio image</provides>
@ -21,6 +20,10 @@
      </item>
  </extension>
  <extension point="xbmc.addon.metadata">
+    <assets>
+        <icon>icon.png</icon>
+        <fanart>fanart.jpg</fanart>
+    </assets>
    <summary lang="en">Native Integration of Plex into Kodi</summary>
    <description lang="en">Connect Kodi to your Plex Media Server. This plugin assumes that you manage all your videos with Plex (and none with Kodi). You might lose data already stored in the Kodi video and music databases (as this plugin directly changes them). Use at your own risk!</description>
    <disclaimer lang="en">Use at your own risk</disclaimer>
@ -88,193 +91,216 @@
    <summary lang="ko_KR">Plex를 Kodi에 기본 통합</summary>
    <description lang="ko_KR">Kodi를 Plex Media Server에 연결합니다. 이 플러그인은 Plex로 모든 비디오를 관리하고 Kodi로는 관리하지 않는다고 가정합니다. Kodi 비디오 및 음악 데이터베이스에 이미 저장된 데이터가 손실 될 수 있습니다 (이 플러그인이 직접 변경하므로). 자신의 책임하에 사용하십시오!</description>
    <disclaimer lang="ko_KR">자신의 책임하에 사용</disclaimer>
-    <news>version 2.15.0:
- versions 2.14.3-2.14.4 for everyone
- Direct Paths: Fix TypeError: "element indices must be integers" on playback startup [backport]
- Refactor stream code and fix Kodi not activating subtitle when it should [backport]
- Add playback settings to let the user choose whether Plex or Kodi provides the default audio or subtitle stream on playback start [backport]
- Update translations from Transifex [backport]
+    <news>version 3.5.8:
+- Fix UnboundLocalError: local variable 'identifier' referenced before assignment
+- versions 3.5.6-3.5.7 for everyone

-version 2.14.4 (beta only):
+version 3.5.7 (beta only):
+- Fix Kodi JSON racing condition on playback startup and KeyError
+
+version 3.5.6 (beta only):
+- Fix Plex Companion not working by fixing some issues with PKC's http.server's BaseHTTPRequestHandler
+
+version 3.5.5:
+- Lost patience with Kodi 19: drop use of Python multiprocessing entirely
+
+version 3.5.4:
+- Fix Receiving init() missing 1 required positional argument: ‘certification_country’
+- Update translations from Transifex
+
+version 3.5.3:
+- Add playback settings to let the user choose whether Plex or Kodi provides the default audio or subtitle stream on playback start
+
+version 3.5.2:
+- version 3.5.1 for everyone
+
+version 3.5.1 (beta only):
+- Refactor stream code and fix Kodi not activating subtitle when it should
+- Direct Paths: Fix TypeError: "element indices must be integers" on playback startup
+- Android: Fix broken Python multiprocessing module (a Kodi 19.2 bug) 
+- Fix logging if fanart.tv lookup fails: be less verbose
+
+version 3.5.0:
+- versions 3.4.5-3.4.7 for everyone
+
+version 3.4.7 (beta only):
 - Tell the PMS if a video's audio stream or potentially subtitle stream has changed. For subtitles, this functionality is broken due to a Kodi bug
 - Transcoding: Fix Plex burning-in subtitles when it should not
- Fix logging if fanart.tv lookup fails: be less verbose
 - Large refactoring of playlist and playqueue code
 - Refactor usage of a media part's id

-version 2.14.3 (beta only):
+version 3.4.6 (beta only):
+- Fix RecursionError if a video lies in a root directory
+
+version 3.4.5 (beta only):
 - Implement "Reset resume position" from the Kodi context menu

-version 2.14.2:
- version 2.14.1 for everyone
+version 3.4.4:
+- Initial compatibility with Kodi 20 Nexus. Keep in mind that development for Kodi Nexus has not even officially reached alpha stage - any issues you encounter are probably caused by that
+- version 3.4.3 for everyone

-version 2.14.1 (beta only):
+version 3.4.3 (beta ony):
 - Use Plex settings for audio and subtitle stream selection. This is a best guess regarding subtitles as Plex and Kodi are not sharing much info
 - Fix PlexKodiConnect setting the Plex subtitle to None
 - Download landscape artwork from fanart.tv, thanks @geropan
 - Revert "Fix PlexKodiConnect changing subtitles for all videos on the PMS"

-version 2.14.0:
+version 3.4.2:
 - Fix PlexKodiConnect changing or removing subtitles for every video on the PMS
- version 2.13.1-2.13.2 for everyone

-version 2.13.2 (beta only):
+version 3.4.1:
+- Fix PMS setting `List of IP addresses and networks that are allowed without auth` causing Kodi to take forever to start playback
+
+version 3.4.0:
+- Improve logging for converting Unix timestamps
+- Remove dependency on script.module.defusedxml - that module is now included in PKC
+- version 3.3.3-3.3.5 for everyone
+
+version 3.3.5 (beta only):
+- Rewire defusedxml and xml.etree.ElementTree: Fix AttributeError: module 'resources.lib.utils' has no attribute 'ParseError'
+- Fix errors when PKC tries to edit files that don't exist yet
+
+version 3.3.4 (beta only):
 - Fix a racing condition that could lead to the sync getting stuck
 - Fix RecursionError: maximum recursion depth exceeded
- Websocket Fix AttributeError: 'NoneType' object has no attribute 'is_ssl'
+- Bump websocket client: fix AttributeError: 'NoneType' object has no attribute 'is_ssl'

-version 2.13.1 (beta only):
+version 3.3.3 (beta only):
 - Fix a racing condition that could lead to the sync process getting stuck
 - Fix likelyhood of `database is locked` error occuring
-
-version 2.13.0:
+- Fix AttributeError: module 'urllib' has no attribute 'parse'
 - Support for the Plex HAMA agent to let Kodi identify animes (using Kodi's uniqueID 'anidb')
 - Support forced HAMA IDs when using tvdb uniqueID
- version 2.12.26 for everyone

-version 2.12.26 (beta only):
+version 3.3.2:
+- version 3.3.1 for everyone
+
+version 3.3.1 (beta only):
 - Add an additional Plex Hub "PKC Continue Watching" that merges the Plex Continue Watching with On Deck
 - Fix auto-picking of video stream if several video versions are available
+- Make PKC compatible with Kodi 20 N* by using xbmcvfs for translatePath
 - Update translations

-version 2.12.25:
- Update websocket client to 0.59.0. Fix threading issues and AttributeErrors
+version 3.3.0:
+WARNING: Database reset and full resync required
+- versions 3.2.1-3.2.4 for everyone

-version 2.12.24:
- version 2.12.23 for everyone
+version 3.2.4 (beta only):
+- Fix websockets and AttributeError: 'NoneType' object has no attribute

-version 2.12.23 (beta only):
+version 3.2.3 (beta only):
+- Attempt to fix websocket threading issues and AttributeError: 'NoneType' object has no attribute 'is_ssl' or 'settimeout'
+- Get rid of Python arrow; hopefully fix many Python import errors (also occuring in other add-ons!)
+
+version 3.2.2 (beta only):
+- Fix videos not starting due to a TypeError
+- Show warning message to remind user to use Estuary for database resets
+- Update websocket client to 1.0.0
+
+version 3.2.1 (beta only):
+WARNING: Database reset and full resync required
+- Fix PKC widgets not working at all in some cases
+- Direct Paths: fix several issues with episodes
+- New Python-dependency: arrow
+
+version 3.2.0:
+WARNING: Database reset and full resync required
+- version 3.1.1-3.1.4 for everyone
+
+version 3.1.4 (beta only):
 - Fix Alexa and RuntimeError: dictionary keys changed during iteration
+- Fix AttributeError: module 'shutil' has no attribute 'copy_tree'
+
+version 3.1.3 (beta only):
+- Add PKC setting to disable verification whether we can access a media file
+- Direct paths: corrections to more closely mirror Kodi's way of saving movie and tv show files to the db
+- Make sure that the correct file system encoding is used for playlists
 - Fix a rare AttributeError when using playlists
+- Fix regression: fix add-on paths always falling back to direct paths

-version 2.12.22:
- version 2.12.20 and 2.12.21 for everyone
+version 3.1.2 (beta only):
+- Fix ImportError: cannot import name 'dir_util' from 'distutils' on PKC startup
+- Fix UnicodeEncodeError if Plex playlist name contains illegal chars
+- Fix PKC not showing up as a casting target in some cases

-version 2.12.21 (beta only):
- Switch to new websocket implementation
- Hopefully fix RuntimeError: no add-on id "plugin.video.plexkodiconnect"
+version 3.1.1 (beta only):
+- Direct paths: fix filename showing instead of full video metadata during playback
 - Update translations

-version 2.12.20 (beta only):
+version 3.1.0:
+- version 3.0.16 and 3.0.17 for everyone
+- Fix resume not working if Kodi player start-up is slow
+
+version 3.0.17 (beta only):
+- Fix instantaneous background sync and Alexa not working
+- Hopefully fix RuntimeError: no add-on id "plugin.video.plexkodiconnect"
+- Fix error socket.timeout: timed out 
+
+version 3.0.16 (beta only):
 - Add information to PKC settings for background sync and Alexa whether a connection has been successfully made 

-version 2.12.19:
- 2.12.17 and 2.12.18 for everyone
+version 3.0.15:
+- 3.0.14 for everyone
 - Rename skip intro skin file

-version 2.12.18 (beta only):
+version 3.0.14 (beta only):
 - Quickly sync recently watched items before synching the playstates of the entire Plex library
+- Fix TypeError: function missing required argument 'message'
+- Fix PlexKodiConnect Kodi add-on icon and fanart not showing
 - Improve logging for websocket JSON loads

-version 2.12.17 (beta only):
+version 3.0.13:
+- Fix UnboundLocalError: local variable 'user' referenced before assignment
+
+version 3.0.12:
 - Sync name and user rating of a TV show season to Kodi
 - Fix rare TypeError: expected string or buffer on playback start

-version 2.12.16:
- versions 2.12.14 and 2.12.15 for everyone
+version 3.0.11:
+- Fix TypeError: function missing required argument 'message'

-version 2.12.15 (beta only):
+version 3.0.10:
 - Fix skip intros sometimes not working due to a RuntimeError
 - Update translations

-version 2.12.14:
+version 3.0.9:
 - Add skip intro functionality
+- Fix Kodi add-on NextUp not working

-version 2.12.13:
+version 3.0.8:
 - Fix KeyError: u'game' if Plex Arcade has been activated
 - Fix AttributeError: 'App' object has no attribute 'threads' when sync is cancelled

-version 2.12.12:
+version 3.0.7:
 - Hopefully fix rare case when sync would get stuck indefinitely
 - Fix ValueError: invalid literal for int() for invalid dates sent by Plex
- version 2.12.11 for everyone

-version 2.12.11 (beta only):
+version 3.0.6:
 - Fix PKC not auto-picking audio/subtitle stream when transcoding
 - Fix ValueError when deleting a music album
 - Fix OSError: Invalid argument when Plex returns an invalid timestamp

-version 2.12.10:
+version 3.0.5:
 - Fix pictures from Plex picture libraries not working/displaying
+- Fix sqlite3.OperationalError on PKC upgrade

-version 2.12.9:
- Fix Local variable 'user' referenced before assignement
+version 3.0.4:
+- Automatically look for missing movie trailers using TMDB

-version 2.12.8:
- version 2.12.7 for everyone
-
-version 2.12.7 (beta only):
+version 3.0.3:
 - Fix PKC suddenly using main Plex user's credentials, e.g. when the PMS address changed
 - Fix missing Kodi tags for movie collections/sets
+- Change `thread.isAlive` to `thread.is_alive`

-version 2.12.6:
+version 3.0.2:
+- Fix AttributeError: module has no attribute try_decode
+
+version 3.0.1:
 - Fix rare KeyError when using PKC widgets
- Fix suspension of artwork caching and PKC becoming unresponsive
- Update translations
- Versions 2.12.4 and 2.12.5 for everyone
-
-version 2.12.5 (beta only):
- Greatly improve matching logic for The Movie Database if Plex does not provide an appropriate id
- Fix high transcoding resolutions not being available for Win10
- Fix rare playback progress report failing and KeyError: u'containerKey'
- Fix rare KeyError: None when trying to sync playlists
- Fix TypeError when canceling Plex sync section dialog
-
-version 2.12.4 (beta only):
- Hopefully fix freeze during sync: Don't assign multiple sets/collections for a specific movie
- Support metadata provider ids (e.g. for IMDB) for the new Plex Movie Agent
-
-version 2.12.3:
- Fix playback failing due to caching of subtitles with non-ascii chars
- Fix ValueError: invalid literal for int() with base 10 during show sync
- Fix UnboundLocalError when certain Plex sections are deleted or being un-synched
- New method to install PlexKodiConnect directly via an URL. You thus do not need to upload a ZIP file to Kodi anymore.
-
-version 2.12.2:
- version 2.12.0 and 2.12.1 for everyone 
- Fix regression: sync dialog not showing up when it should 
-
-version 2.12.1 (beta only):
- Fix PKC shutdown on Kodi profile switch
- Fix Kodi content type for images/photos
- Added support for custom set of safe characters when escaping paths (thanks @geropan)
- Revert "Don't allow spaces in devicename"
- Fix sync dialog showing in certain cases even though user opted out
-
-version 2.12.0 (beta only):
- Fix websocket threads; enable PKC background sync for all Plex Home users!
- Fix PKC incorrectly marking a video as unwatched if an external player has been used
 - Update translations

-version 2.11.7:
- Fix PKC crashing on devices running Microsoft UWP, e.g. XBox
-
-version 2.11.6:
- Fix rare sync crash when queue was full
- Set "Auto-adjust transcoding quality" to false by default
-
-version 2.11.5:
- Versions 2.11.0-2.11.4 for everyone
-
-version 2.11.4 (beta only):
- Fix another TypeError: 'NoneType' object has no attribute '__getitem__', e.g. when trying to play trailers
-
-version 2.11.3 (beta only):
- Fix TypeError: 'NoneType' object has no attribute '__getitem__', e.g. when displaying albums
-
-version 2.11.2 (beta only):
- Refactor direct and add-on paths. Enables use of Plex music playlists synched to Kodi
-
-version 2.11.1 (beta only):
- Rewire the set-up of audio and subtitle streams, esp. before starting a transcoding session. Fixes playback not starting at all
-
-version 2.11.0 (beta only):
- Fix PKC not burning in (and thus not showing) subtitles when transcoding
- When transcoding, only let user choose to burn-in subtitles that can't be displayed otherwise by Kodi
- Improve PKC automatically connecting to local PMS
- Ensure that our only video transcoding target is h264 
- Fix adjusted subtitle size not working when burning in subtitles
- Fix regression: burn-in subtitles picking up the last user setting instead of the current one
+version 3.0.0:
+- Major upgrade from Python 2 to Python 3, allowing use of Kodi 19 Matrix
 </news>
  </extension>
 </addon>
--- a/changelog.txt
+++ b/changelog.txt
@ -1,77 +1,214 @@
-version 2.15.0:
- versions 2.14.3-2.14.4 for everyone
- Direct Paths: Fix TypeError: "element indices must be integers" on playback startup [backport]
- Refactor stream code and fix Kodi not activating subtitle when it should [backport]
- Add playback settings to let the user choose whether Plex or Kodi provides the default audio or subtitle stream on playback start [backport]
- Update translations from Transifex [backport]
+version 3.5.8:
+- Fix UnboundLocalError: local variable 'identifier' referenced before assignment
+- versions 3.5.6-3.5.7 for everyone

-version 2.14.4 (beta only):
+version 3.5.7 (beta only):
+- Fix Kodi JSON racing condition on playback startup and KeyError
+
+version 3.5.6 (beta only):
+- Fix Plex Companion not working by fixing some issues with PKC's http.server's BaseHTTPRequestHandler
+
+version 3.5.5:
+- Lost patience with Kodi 19: drop use of Python multiprocessing entirely
+
+version 3.5.4:
+- Fix Receiving init() missing 1 required positional argument: ‘certification_country’
+- Update translations from Transifex
+
+version 3.5.3:
+- Add playback settings to let the user choose whether Plex or Kodi provides the default audio or subtitle stream on playback start
+
+version 3.5.2:
+- version 3.5.1 for everyone
+
+version 3.5.1 (beta only):
+- Refactor stream code and fix Kodi not activating subtitle when it should
+- Direct Paths: Fix TypeError: "element indices must be integers" on playback startup
+- Android: Fix broken Python multiprocessing module (a Kodi 19.2 bug) 
+- Fix logging if fanart.tv lookup fails: be less verbose
+
+version 3.5.0:
+- versions 3.4.5-3.4.7 for everyone
+
+version 3.4.7 (beta only):
 - Tell the PMS if a video's audio stream or potentially subtitle stream has changed. For subtitles, this functionality is broken due to a Kodi bug
 - Transcoding: Fix Plex burning-in subtitles when it should not
- Fix logging if fanart.tv lookup fails: be less verbose
 - Large refactoring of playlist and playqueue code
 - Refactor usage of a media part's id

-version 2.14.3 (beta only):
+version 3.4.6 (beta only):
+- Fix RecursionError if a video lies in a root directory
+
+version 3.4.5 (beta only):
 - Implement "Reset resume position" from the Kodi context menu

-version 2.14.2:
- version 2.14.1 for everyone
+version 3.4.4:
+- Initial compatibility with Kodi 20 Nexus. Keep in mind that development for Kodi Nexus has not even officially reached alpha stage - any issues you encounter are probably caused by that
+- version 3.4.3 for everyone

-version 2.14.1 (beta only):
+version 3.4.3 (beta ony):
 - Use Plex settings for audio and subtitle stream selection. This is a best guess regarding subtitles as Plex and Kodi are not sharing much info
 - Fix PlexKodiConnect setting the Plex subtitle to None
 - Download landscape artwork from fanart.tv, thanks @geropan
 - Revert "Fix PlexKodiConnect changing subtitles for all videos on the PMS"

-version 2.14.0:
+version 3.4.2:
 - Fix PlexKodiConnect changing or removing subtitles for every video on the PMS
- version 2.13.1-2.13.2 for everyone

-version 2.13.2 (beta only):
+version 3.4.1:
+- Fix PMS setting `List of IP addresses and networks that are allowed without auth` causing Kodi to take forever to start playback
+
+version 3.4.0:
+- Improve logging for converting Unix timestamps
+- Remove dependency on script.module.defusedxml - that module is now included in PKC
+- version 3.3.3-3.3.5 for everyone
+
+version 3.3.5 (beta only):
+- Rewire defusedxml and xml.etree.ElementTree: Fix AttributeError: module 'resources.lib.utils' has no attribute 'ParseError'
+- Fix errors when PKC tries to edit files that don't exist yet
+
+version 3.3.4 (beta only):
 - Fix a racing condition that could lead to the sync getting stuck
 - Fix RecursionError: maximum recursion depth exceeded
- Websocket Fix AttributeError: 'NoneType' object has no attribute 'is_ssl'
+- Bump websocket client: fix AttributeError: 'NoneType' object has no attribute 'is_ssl'

-version 2.13.1 (beta only):
+version 3.3.3 (beta only):
 - Fix a racing condition that could lead to the sync process getting stuck
 - Fix likelyhood of `database is locked` error occuring
-
-version 2.13.0:
+- Fix AttributeError: module 'urllib' has no attribute 'parse'
 - Support for the Plex HAMA agent to let Kodi identify animes (using Kodi's uniqueID 'anidb')
 - Support forced HAMA IDs when using tvdb uniqueID
- version 2.12.26 for everyone

-version 2.12.26 (beta only):
+version 3.3.2:
+- version 3.3.1 for everyone
+
+version 3.3.1 (beta only):
 - Add an additional Plex Hub "PKC Continue Watching" that merges the Plex Continue Watching with On Deck
 - Fix auto-picking of video stream if several video versions are available
+- Make PKC compatible with Kodi 20 N* by using xbmcvfs for translatePath
 - Update translations

-version 2.12.25:
- Update websocket client to 0.59.0. Fix threading issues and AttributeErrors
+version 3.3.0:
+WARNING: Database reset and full resync required
+- versions 3.2.1-3.2.4 for everyone

-version 2.12.24:
- version 2.12.23 for everyone
+version 3.2.4 (beta only):
+- Fix websockets and AttributeError: 'NoneType' object has no attribute

-version 2.12.23 (beta only):
+version 3.2.3 (beta only):
+- Attempt to fix websocket threading issues and AttributeError: 'NoneType' object has no attribute 'is_ssl' or 'settimeout'
+- Get rid of Python arrow; hopefully fix many Python import errors (also occuring in other add-ons!)
+
+version 3.2.2 (beta only):
+- Fix videos not starting due to a TypeError
+- Show warning message to remind user to use Estuary for database resets
+- Update websocket client to 1.0.0
+
+version 3.2.1 (beta only):
+WARNING: Database reset and full resync required
+- Fix PKC widgets not working at all in some cases
+- Direct Paths: fix several issues with episodes
+- New Python-dependency: arrow
+
+version 3.2.0:
+WARNING: Database reset and full resync required
+- version 3.1.1-3.1.4 for everyone
+
+version 3.1.4 (beta only):
 - Fix Alexa and RuntimeError: dictionary keys changed during iteration
+- Fix AttributeError: module 'shutil' has no attribute 'copy_tree'
+
+version 3.1.3 (beta only):
+- Add PKC setting to disable verification whether we can access a media file
+- Direct paths: corrections to more closely mirror Kodi's way of saving movie and tv show files to the db
+- Make sure that the correct file system encoding is used for playlists
 - Fix a rare AttributeError when using playlists
+- Fix regression: fix add-on paths always falling back to direct paths

-version 2.12.22:
- version 2.12.20 and 2.12.21 for everyone
+version 3.1.2 (beta only):
+- Fix ImportError: cannot import name 'dir_util' from 'distutils' on PKC startup
+- Fix UnicodeEncodeError if Plex playlist name contains illegal chars
+- Fix PKC not showing up as a casting target in some cases

-version 2.12.21 (beta only):
- Switch to new websocket implementation
- Hopefully fix RuntimeError: no add-on id "plugin.video.plexkodiconnect"
+version 3.1.1 (beta only):
+- Direct paths: fix filename showing instead of full video metadata during playback
 - Update translations

-version 2.12.20 (beta only):
+version 3.1.0:
+- version 3.0.16 and 3.0.17 for everyone
+- Fix resume not working if Kodi player start-up is slow
+
+version 3.0.17 (beta only):
+- Fix instantaneous background sync and Alexa not working
+- Hopefully fix RuntimeError: no add-on id "plugin.video.plexkodiconnect"
+- Fix error socket.timeout: timed out 
+
+version 3.0.16 (beta only):
 - Add information to PKC settings for background sync and Alexa whether a connection has been successfully made 

-version 2.12.19:
- 2.12.17 and 2.12.18 for everyone
+version 3.0.15:
+- 3.0.14 for everyone
 - Rename skip intro skin file

+version 3.0.14 (beta only):
+- Quickly sync recently watched items before synching the playstates of the entire Plex library
+- Fix TypeError: function missing required argument 'message'
+- Fix PlexKodiConnect Kodi add-on icon and fanart not showing
+- Improve logging for websocket JSON loads
+
+version 3.0.13:
+- Fix UnboundLocalError: local variable 'user' referenced before assignment
+
+version 3.0.12:
+- Sync name and user rating of a TV show season to Kodi
+- Fix rare TypeError: expected string or buffer on playback start
+
+version 3.0.11:
+- Fix TypeError: function missing required argument 'message'
+
+version 3.0.10:
+- Fix skip intros sometimes not working due to a RuntimeError
+- Update translations
+
+version 3.0.9:
+- Add skip intro functionality
+- Fix Kodi add-on NextUp not working
+
+version 3.0.8:
+- Fix KeyError: u'game' if Plex Arcade has been activated
+- Fix AttributeError: 'App' object has no attribute 'threads' when sync is cancelled
+
+version 3.0.7:
+- Hopefully fix rare case when sync would get stuck indefinitely
+- Fix ValueError: invalid literal for int() for invalid dates sent by Plex
+
+version 3.0.6:
+- Fix PKC not auto-picking audio/subtitle stream when transcoding
+- Fix ValueError when deleting a music album
+- Fix OSError: Invalid argument when Plex returns an invalid timestamp
+
+version 3.0.5:
+- Fix pictures from Plex picture libraries not working/displaying
+- Fix sqlite3.OperationalError on PKC upgrade
+
+version 3.0.4:
+- Automatically look for missing movie trailers using TMDB
+
+version 3.0.3:
+- Fix PKC suddenly using main Plex user's credentials, e.g. when the PMS address changed
+- Fix missing Kodi tags for movie collections/sets
+- Change `thread.isAlive` to `thread.is_alive`
+
+version 3.0.2:
+- Fix AttributeError: module has no attribute try_decode
+
+version 3.0.1:
+- Fix rare KeyError when using PKC widgets
+- Update translations
+
+version 3.0.0:
+- Major upgrade from Python 2 to Python 3, allowing use of Kodi 19 Matrix
+
 version 2.12.18 (beta only):
 - Quickly sync recently watched items before synching the playstates of the entire Plex library
 - Improve logging for websocket JSON loads
--- a/contextmenu.py
+++ b/contextmenu.py
@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 ###############################################################################
-from __future__ import absolute_import, division, unicode_literals
 from sys import listitem
-from urllib import urlencode
+from urllib.parse import urlencode

 from xbmc import getCondVisibility, sleep
 from xbmcgui import Window
@ -11,7 +10,7 @@ from xbmcgui import Window


 def _get_kodi_type():
-    kodi_type = listitem.getVideoInfoTag().getMediaType().decode('utf-8')
+    kodi_type = listitem.getVideoInfoTag().getMediaType()
    if not kodi_type:
        if getCondVisibility('Container.Content(albums)'):
            kodi_type = "album"
--- a/default.py
+++ b/default.py
@ -1,17 +1,16 @@
 # -*- coding: utf-8 -*-

 ###############################################################################
-from __future__ import absolute_import, division, unicode_literals
+from builtins import object
 import logging
 from sys import argv
-from urlparse import parse_qsl
+from urllib.parse import parse_qsl

 import xbmc
 import xbmcgui
 import xbmcplugin

 from resources.lib import entrypoint, utils, transfer, variables as v, loghandler
-from resources.lib.tools import unicode_paths

 ###############################################################################

@ -23,19 +22,15 @@ LOG = logging.getLogger('PLEX.default')
 HANDLE = int(argv[1])


-class Main():
+class Main(object):
    # MAIN ENTRY POINT
    # @utils.profiling()
    def __init__(self):
        LOG.debug('Full sys.argv received: %s', argv)
        # Parse parameters
        params = dict(parse_qsl(argv[2][1:]))
-        arguments = unicode_paths.decode(argv[2])
-        path = unicode_paths.decode(argv[0])
-        # Ensure unicode
-        for key, value in params.iteritems():
-            params[key.decode('utf-8')] = params.pop(key)
-            params[key] = value.decode('utf-8')
+        arguments = argv[2]
+        path = argv[0]
        mode = params.get('mode', '')
        itemid = params.get('id', '')

--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@ -155,6 +155,11 @@ msgctxt "#30028"
 msgid "PKC-only image caching completed"
 msgstr ""

+# Warning shown when PKC switches to the Kodi default skin Estuary
+msgctxt "#30029"
+msgid "To ensure a smooth PlexKodiConnect experience, it is HIGHLY recommended to use Kodi's default skin \"Estuary\" for initial set-up and for possible database resets. Continue?"
+msgstr ""
+
 msgctxt "#30030"
 msgid "Port Number"
 msgstr ""
@ -1093,6 +1098,11 @@ msgctxt "#39074"
 msgid "TV Shows"
 msgstr ""

+# PKC Settings - Sync
+msgctxt "#39075"
+msgid "Verify access to media files while synching"
+msgstr ""
+
 # Pop-up during initial sync
 msgctxt "#39076"
 msgid "If you use several Plex libraries of one kind, e.g. \"Kids Movies\" and \"Parents Movies\", be sure to check the Wiki: https://goo.gl/JFtQV9"
--- a/resources/lib/app/init.py
+++ b/resources/lib/app/init.py
@ -4,7 +4,6 @@
 Used to save PKC's application state and share between modules. Be careful
 if you invoke another PKC Python instance (!!) when e.g. PKC.movies is called
 """
-from __future__ import absolute_import, division, unicode_literals
 from .account import Account
 from .application import App
 from .connection import Connection
--- a/resources/lib/app/account.py
+++ b/resources/lib/app/account.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from .. import utils
--- a/resources/lib/app/application.py
+++ b/resources/lib/app/application.py
@ -1,8 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
-import Queue
+import queue
 from threading import Lock, RLock

 import xbmc
@ -40,15 +39,15 @@ class App(object):
            self.lock_playlists = Lock()

            # Plex Companion Queue()
-            self.companion_queue = Queue.Queue(maxsize=100)
+            self.companion_queue = queue.Queue(maxsize=100)
            # Websocket_client queue to communicate with librarysync
-            self.websocket_queue = Queue.Queue()
+            self.websocket_queue = queue.Queue()
            # xbmc.Monitor() instance from kodimonitor.py
            self.monitor = None
            # xbmc.Player() instance
            self.player = None
-            # Instance of FanartThread()
-            self.fanart_thread = None
+            # Instance of MetadataThread()
+            self.metadata_thread = None
            # Instance of ImageCachingThread()
            self.caching_thread = None
            # Dialog to skip intro
@ -62,24 +61,24 @@ class App(object):
    def is_playing_video(self):
        return self.player.isPlayingVideo() == 1

-    def register_fanart_thread(self, thread):
-        self.fanart_thread = thread
+    def register_metadata_thread(self, thread):
+        self.metadata_thread = thread
        self.threads.append(thread)

-    def deregister_fanart_thread(self, thread):
-        self.fanart_thread.unblock_callers()
-        self.fanart_thread = None
+    def deregister_metadata_thread(self, thread):
+        self.metadata_thread.unblock_callers()
+        self.metadata_thread = None
        self.threads.remove(thread)

-    def suspend_fanart_thread(self, block=True):
+    def suspend_metadata_thread(self, block=True):
        try:
-            self.fanart_thread.suspend(block=block)
+            self.metadata_thread.suspend(block=block)
        except AttributeError:
            pass

-    def resume_fanart_thread(self):
+    def resume_metadata_thread(self):
        try:
-            self.fanart_thread.resume()
+            self.metadata_thread.resume()
        except AttributeError:
            pass

--- a/resources/lib/app/connection.py
+++ b/resources/lib/app/connection.py
@ -1,9 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
+import secrets

-from .. import utils, json_rpc as js, variables as v
+from .. import utils, json_rpc as js

 LOG = getLogger('PLEX.connection')

@ -38,22 +38,36 @@ class Connection(object):
        PKC needs Kodi webserver to work correctly
        """
        LOG.debug('Loading Kodi webserver details')
-        # Kodi webserver details
-        if js.get_setting('services.webserver') in (None, False):
-            # Enable the webserver, it is disabled
+        if not utils.settings('enableTextureCache') == 'true':
+            LOG.info('Artwork caching disabled')
+            return
+        self.webserver_password = js.get_setting('services.webserverpassword')
+        if not self.webserver_password:
+            LOG.warn('No password set for the Kodi web server. Generating a '
+                     'new random password')
+            self.webserver_password = secrets.token_urlsafe(16)
+            js.set_setting('services.webserverpassword', self.webserver_password)
+        if not js.get_setting('services.webserver'):
+            # The Kodi webserver is needed for artwork caching. PKC already set
+            # a strong, random password automatically if you haven't done so
+            # already. Please confirm the next dialog that you want to enable
+            # the webserver now with Yes.
+            utils.messageDialog(utils.lang(29999), utils.lang(30004))
+            # Enable the webserver, it is disabled. Will force a Kodi pop-up
            js.set_setting('services.webserver', True)
+            if not js.get_setting('services.webserver'):
+                LOG.warn('User chose to not enable Kodi webserver')
+                utils.settings('enableTextureCache', value='false')
        self.webserver_host = 'localhost'
        self.webserver_port = js.get_setting('services.webserverport')
        self.webserver_username = js.get_setting('services.webserverusername')
-        self.webserver_password = js.get_setting('services.webserverpassword')

    def load(self):
        LOG.debug('Loading connection settings')
        # Shall we verify SSL certificates? "None" will leave SSL enabled
        # Ignore this setting for Kodi >= 18 as Kodi 18 is much stricter
        # with checking SSL certs
-        self.verify_ssl_cert = None if v.KODIVERSION >= 18 or utils.settings('sslverify') == 'true' \
-            else False
+        self.verify_ssl_cert = None
        # Do we have an ssl certificate for PKC we need to use?
        self.ssl_cert_path = utils.settings('sslcert') \
            if utils.settings('sslcert') != 'None' else None
@ -74,8 +88,7 @@ class Connection(object):
                  self.server_name, self.machine_identifier, self.server)

    def load_entrypoint(self):
-        self.verify_ssl_cert = None if v.KODIVERSION >= 18 or utils.settings('sslverify') == 'true' \
-            else False
+        self.verify_ssl_cert = None
        self.ssl_cert_path = utils.settings('sslcert') \
            if utils.settings('sslcert') != 'None' else None
        self.https = utils.settings('https') == 'true'
--- a/resources/lib/app/libsync.py
+++ b/resources/lib/app/libsync.py
@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-
 from .. import utils


@ -71,6 +69,8 @@ class Sync(object):
        self.run_lib_scan = None
        # Set if user decided to cancel sync
        self.stop_sync = False
+        # Do we check whether we can access a media file?
+        self.check_media_file_existence = False
        # Could we access the paths?
        self.path_verified = False

@ -94,6 +94,8 @@ class Sync(object):

    def load(self):
        self.direct_paths = utils.settings('useDirectPaths') == '1'
+        self.check_media_file_existence = \
+            utils.settings('check_media_file_existence') == '1'
        self.enable_music = utils.settings('enableMusic') == 'true'
        self.artwork = utils.settings('usePlexArtwork') == 'true'
        self.replace_smb_path = utils.settings('replaceSMB') == 'true'
@ -107,7 +109,7 @@ class Sync(object):
        self.remapSMBphotoOrg = remove_trailing_slash(utils.settings('remapSMBphotoOrg'))
        self.remapSMBphotoNew = remove_trailing_slash(utils.settings('remapSMBphotoNew'))
        self.escape_path = utils.settings('escapePath') == 'true'
-        self.escape_path_safe_chars = utils.settings('escapePathSafeChars').encode('utf-8')
+        self.escape_path_safe_chars = utils.settings('escapePathSafeChars')
        self.indicate_media_versions = utils.settings('indicate_media_versions') == "true"
        self.sync_specific_plex_playlists = utils.settings('syncSpecificPlexPlaylists') == 'true'
        self.sync_specific_kodi_playlists = utils.settings('syncSpecificKodiPlaylists') == 'true'
--- a/resources/lib/app/playstate.py
+++ b/resources/lib/app/playstate.py
@ -1,8 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-
-
 class PlayState(object):
    # "empty" dict for the PLAYER_STATES above. Use copy.deepcopy to duplicate!
    template = {
--- a/resources/lib/artwork.py
+++ b/resources/lib/artwork.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import requests

@ -101,10 +100,7 @@ def cache_url(url, should_suspend=None):
    while True:
        try:
            requests.head(
-                url="http://%s:%s/image/image://%s"
-                    % (app.CONN.webserver_host,
-                       app.CONN.webserver_port,
-                       url),
+                url=f'http://{app.CONN.webserver_username}:{app.CONN.webserver_password}@{app.CONN.webserver_host}:{app.CONN.webserver_port}/image/image://{url}',
                auth=(app.CONN.webserver_username,
                      app.CONN.webserver_password),
                timeout=TIMEOUT)
--- a/resources/lib/backgroundthread.py
+++ b/resources/lib/backgroundthread.py
@ -1,12 +1,12 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from time import time as _time
 import threading
-import Queue
+import queue
 import heapq
 from collections import deque
+from functools import total_ordering

 from . import utils, app, variables as v

@ -113,7 +113,7 @@ class KillableThread(threading.Thread):
        self._suspension_reached.set()


-class ProcessingQueue(Queue.Queue, object):
+class ProcessingQueue(queue.Queue, object):
    """
    Queue of queues that processes a queue completely before moving on to the
    next queue. There's one queue per Section(). You need to initialize each
@ -192,7 +192,7 @@ class ProcessingQueue(Queue.Queue, object):
        self._sections.append(section)
        self._queues.append(
            OrderedQueue() if section.plex_type == v.PLEX_TYPE_ALBUM
-            else Queue.Queue())
+            else queue.Queue())
        if self._current_section is None:
            self._activate_next_section()

@ -217,7 +217,7 @@ class ProcessingQueue(Queue.Queue, object):
        return item[1]


-class OrderedQueue(Queue.PriorityQueue, object):
+class OrderedQueue(queue.PriorityQueue, object):
    """
    Queue that enforces an order on the items it returns. An item you push
    onto the queue must be a tuple
@ -233,15 +233,15 @@ class OrderedQueue(Queue.PriorityQueue, object):
        self.next_index = 0
        super(OrderedQueue, self).__init__(maxsize)

-    def _qsize(self, len=len):
+    def _qsize(self):
        try:
            return len(self.queue) if self.queue[0][0] == self.next_index else 0
        except IndexError:
            return 0

-    def _get(self, heappop=heapq.heappop):
+    def _get(self):
        self.next_index += 1
-        return heappop(self.queue)
+        return heapq.heappop(self.queue)


 class Tasks(list):
@ -260,14 +260,20 @@ class Tasks(list):
            self.pop().cancel()


+@total_ordering
 class Task(object):
    def __init__(self, priority=None):
        self.priority = priority
        self._canceled = False
        self.finished = False

-    def __cmp__(self, other):
-        return self.priority - other.priority
+    def __lt__(self, other):
+        """Magic method Task<Other Task; compares the tasks' priorities."""
+        return self.priority - other.priority > 0
+
+    def __eq__(self, other):
+        """Magic method Task=Other Task; compares the tasks' priorities."""
+        return self.priority == other.priority

    def start(self):
        BGThreader.addTask(self)
@ -308,10 +314,10 @@ class FunctionAsTask(Task):
            self._callback(result)


-class MutablePriorityQueue(Queue.PriorityQueue):
-    def _get(self, heappop=heapq.heappop):
+class MutablePriorityQueue(queue.PriorityQueue):
+    def _get(self):
            self.queue.sort()
-            return heappop(self.queue)
+            return heapq.heappop(self.queue)

    def lowest(self):
        """Return the lowest priority item in the queue (not reliable!)."""
@ -351,7 +357,7 @@ class BackgroundWorker(object):
        return self._abort or app.APP.monitor.abortRequested()

    def start(self):
-        if self._thread and self._thread.isAlive():
+        if self._thread and self._thread.is_alive():
            return

        self._thread = KillableThread(target=self._queueLoop, name='BACKGROUND-WORKER({0})'.format(self.name))
@ -368,7 +374,7 @@ class BackgroundWorker(object):
                self._runTask(self._task)
                self._queue.task_done()
                self._task = None
-        except Queue.Empty:
+        except queue.Empty:
            LOG.debug('(%s): Idle', self.name)

    def shutdown(self, block=True):
@ -377,13 +383,13 @@ class BackgroundWorker(object):
        if self._task:
            self._task.cancel()

-        if block and self._thread and self._thread.isAlive():
+        if block and self._thread and self._thread.is_alive():
            LOG.debug('thread (%s): Waiting...', self.name)
            self._thread.join()
            LOG.debug('thread (%s): Done', self.name)

    def working(self):
-        return self._thread and self._thread.isAlive()
+        return self._thread and self._thread.is_alive()


 class NonstoppingBackgroundWorker(BackgroundWorker):
@ -408,7 +414,7 @@ class NonstoppingBackgroundWorker(BackgroundWorker):
        return self._working


-class BackgroundThreader:
+class BackgroundThreader(object):
    def __init__(self, name=None, worker=BackgroundWorker, worker_count=6):
        self.name = name
        self._queue = MutablePriorityQueue()
@ -488,7 +494,7 @@ class BackgroundThreader:
        qitem.priority = lowest - 1


-class ThreaderManager:
+class ThreaderManager(object):
    def __init__(self,
                 worker=NonstoppingBackgroundWorker,
                 worker_count=WORKER_COUNT):
--- a/resources/lib/clientinfo.py
+++ b/resources/lib/clientinfo.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 import xbmc
@ -30,7 +29,6 @@ def getXArgsDeviceInfo(options=None, include_token=True):
    """
    xargs = {
        'Accept': '*/*',
-        'Connection': 'keep-alive',
        "Content-Type": "application/x-www-form-urlencoded",
        # "Access-Control-Allow-Origin": "*",
        'Accept-Language': xbmc.getLanguage(xbmc.ISO_639_1),
@ -43,6 +41,8 @@ def getXArgsDeviceInfo(options=None, include_token=True):
        'X-Plex-Version': v.ADDON_VERSION,
        'X-Plex-Client-Identifier': getDeviceId(),
        'X-Plex-Provides': 'client,controller,player,pubsub-player',
+        'X-Plex-Protocol': '1.0',
+        'Cache-Control': 'no-cache'
    }
    if include_token and utils.window('pms_token'):
        xargs['X-Plex-Token'] = utils.window('pms_token')
--- a/resources/lib/companion.py
+++ b/resources/lib/companion.py
@ -3,7 +3,6 @@
 """
 Processes Plex companion inputs from the plexbmchelper to Kodi commands
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from xbmc import Player

@ -28,7 +27,7 @@ def skip_to(params):
    LOG.debug('Skipping to playQueueItemID %s, plex_id %s',
              playqueue_item_id, plex_id)
    found = True
-    for player in js.get_players().values():
+    for player in list(js.get_players().values()):
        playqueue = PQ.PLAYQUEUES[player['playerid']]
        for i, item in enumerate(playqueue.items):
            if item.id == playqueue_item_id:
@ -86,7 +85,7 @@ def process_command(request_path, params):
    elif request_path == "player/playback/stop":
        js.stop()
    elif request_path == "player/playback/seekTo":
-        js.seek_to(int(params.get('offset', 0)))
+        js.seek_to(float(params.get('offset', 0.0)) / 1000.0)
    elif request_path == "player/playback/stepForward":
        js.smallforward()
    elif request_path == "player/playback/stepBack":
--- a/resources/lib/context.py
+++ b/resources/lib/context.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import xbmcgui

@ -60,14 +59,14 @@ class ContextMenu(xbmcgui.WindowXMLDialog):
        if action in (ACTION_SELECT_ITEM, ACTION_MOUSE_LEFT_CLICK):
            if self.getFocusId() == LIST:
                option = self.list_.getSelectedItem()
-                self.selected_option = option.getLabel().decode('utf-8')
+                self.selected_option = option.getLabel()
                LOG.info('option selected: %s', self.selected_option)
                self.close()

    def _add_editcontrol(self, x, y, height, width, password=None):
        media = path_ops.path.join(
            v.ADDON_PATH, 'resources', 'skins', 'default', 'media')
-        filename = utils.try_encode(path_ops.path.join(media, 'white.png'))
+        filename = path_ops.path.join(media, 'white.png')
        control = xbmcgui.ControlImage(0, 0, 0, 0,
                                       filename=filename,
                                       aspectRatio=0,
--- a/resources/lib/context_entry.py
+++ b/resources/lib/context_entry.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import xbmc
 import xbmcgui
@ -92,7 +91,7 @@ class ContextMenu(object):
        options.append(OPTIONS['Addon'])
        context_menu = context.ContextMenu(
            "script-plex-context.xml",
-            utils.try_encode(v.ADDON_PATH),
+            v.ADDON_PATH,
            "default",
            "1080i")
        context_menu.set_options(options)
@ -126,13 +125,13 @@ class ContextMenu(object):
        """
        delete = True
        if utils.settings('skipContextMenu') != "true":
-            if not utils.dialog("yesno", heading="{plex}", line1=utils.lang(33041)):
+            if not utils.dialog("yesno", heading="{plex}", message=utils.lang(33041)):
                LOG.info("User skipped deletion for: %s", self.plex_id)
                delete = False
        if delete:
            LOG.info("Deleting Plex item with id %s", self.plex_id)
            if PF.delete_item_from_pms(self.plex_id) is False:
-                utils.dialog("ok", heading="{plex}", line1=utils.lang(30414))
+                utils.dialog("ok", heading="{plex}", message=utils.lang(30414))

    def _PMS_play(self):
        """
@ -143,8 +142,8 @@ class ContextMenu(object):
        playqueue.clear()
        app.PLAYSTATE.context_menu_play = True
        handle = self.api.fullpath(force_addon=True)[0]
-        handle = 'RunPlugin(%s)' % handle
-        xbmc.executebuiltin(handle.encode('utf-8'))
+        handle = f'RunPlugin({handle})'
+        xbmc.executebuiltin(handle)

    def _extras(self):
        """
--- a/resources/lib/db.py
+++ b/resources/lib/db.py
@ -27,7 +27,7 @@ def catch_operationalerrors(method):
            try:
                return method(self, *args, **kwargs)
            except sqlite3.OperationalError as err:
-                if 'database is locked' not in err:
+                if err.args[0] and 'database is locked' not in err.args[0]:
                    # Not an error we want to catch, so reraise it
                    raise
                attempts -= 1
--- a/resources/lib/defused_etree.py
+++ b/resources/lib/defused_etree.py
@ -1,39 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""
-xml.etree.ElementTree tries to encode with text.encode('ascii') - which is
-just plain BS. This etree will always return unicode, not string
-"""
-from __future__ import absolute_import, division, unicode_literals
-# Originally tried faster cElementTree, but does NOT work reliably with Kodi
-from defusedxml.ElementTree import DefusedXMLParser, _generate_etree_functions
-
-from xml.etree.ElementTree import TreeBuilder as _TreeBuilder
-from xml.etree.ElementTree import parse as _parse
-from xml.etree.ElementTree import iterparse as _iterparse
-from xml.etree.ElementTree import tostring
-
-
-class UnicodeXMLParser(DefusedXMLParser):
-    """
-    PKC Hack to ensure we're always receiving unicode, not str
-    """
-    @staticmethod
-    def _fixtext(text):
-        """
-        Do NOT try to convert every entry to str with entry.encode('ascii')!
-        """
-        return text
-
-
-# aliases
-XMLTreeBuilder = XMLParse = UnicodeXMLParser
-
-parse, iterparse, fromstring = _generate_etree_functions(UnicodeXMLParser,
-                                                         _TreeBuilder, _parse,
-                                                         _iterparse)
-XML = fromstring
-
-
-__all__ = ['XML', 'XMLParse', 'XMLTreeBuilder', 'fromstring', 'iterparse',
-           'parse', 'tostring']
--- a/resources/lib/defusedxml/ElementTree.py
+++ b/resources/lib/defusedxml/ElementTree.py
@ -0,0 +1,188 @@
+# defusedxml
+#
+# Copyright (c) 2013-2020 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defused xml.etree.ElementTree facade
+"""
+from __future__ import print_function, absolute_import
+
+import sys
+import warnings
+from xml.etree.ElementTree import ParseError
+from xml.etree.ElementTree import TreeBuilder as _TreeBuilder
+from xml.etree.ElementTree import parse as _parse
+from xml.etree.ElementTree import tostring
+
+import importlib
+
+
+from .common import DTDForbidden, EntitiesForbidden, ExternalReferenceForbidden
+
+__origin__ = "xml.etree.ElementTree"
+
+
+def _get_py3_cls():
+    """Python 3.3 hides the pure Python code but defusedxml requires it.
+
+    The code is based on test.support.import_fresh_module().
+    """
+    pymodname = "xml.etree.ElementTree"
+    cmodname = "_elementtree"
+
+    pymod = sys.modules.pop(pymodname, None)
+    cmod = sys.modules.pop(cmodname, None)
+
+    sys.modules[cmodname] = None
+    try:
+        pure_pymod = importlib.import_module(pymodname)
+    finally:
+        # restore module
+        sys.modules[pymodname] = pymod
+        if cmod is not None:
+            sys.modules[cmodname] = cmod
+        else:
+            sys.modules.pop(cmodname, None)
+        # restore attribute on original package
+        etree_pkg = sys.modules["xml.etree"]
+        if pymod is not None:
+            etree_pkg.ElementTree = pymod
+        elif hasattr(etree_pkg, "ElementTree"):
+            del etree_pkg.ElementTree
+
+    _XMLParser = pure_pymod.XMLParser
+    _iterparse = pure_pymod.iterparse
+    # patch pure module to use ParseError from C extension
+    pure_pymod.ParseError = ParseError
+
+    return _XMLParser, _iterparse
+
+
+_XMLParser, _iterparse = _get_py3_cls()
+
+_sentinel = object()
+
+
+class DefusedXMLParser(_XMLParser):
+    def __init__(
+        self,
+        html=_sentinel,
+        target=None,
+        encoding=None,
+        forbid_dtd=False,
+        forbid_entities=True,
+        forbid_external=True,
+    ):
+        super().__init__(target=target, encoding=encoding)
+        if html is not _sentinel:
+            # the 'html' argument has been deprecated and ignored in all
+            # supported versions of Python. Python 3.8 finally removed it.
+            if html:
+                raise TypeError("'html=True' is no longer supported.")
+            else:
+                warnings.warn(
+                    "'html' keyword argument is no longer supported. Pass "
+                    "in arguments as keyword arguments.",
+                    category=DeprecationWarning,
+                )
+
+        self.forbid_dtd = forbid_dtd
+        self.forbid_entities = forbid_entities
+        self.forbid_external = forbid_external
+        parser = self.parser
+        if self.forbid_dtd:
+            parser.StartDoctypeDeclHandler = self.defused_start_doctype_decl
+        if self.forbid_entities:
+            parser.EntityDeclHandler = self.defused_entity_decl
+            parser.UnparsedEntityDeclHandler = self.defused_unparsed_entity_decl
+        if self.forbid_external:
+            parser.ExternalEntityRefHandler = self.defused_external_entity_ref_handler
+
+    def defused_start_doctype_decl(self, name, sysid, pubid, has_internal_subset):
+        raise DTDForbidden(name, sysid, pubid)
+
+    def defused_entity_decl(
+        self, name, is_parameter_entity, value, base, sysid, pubid, notation_name
+    ):
+        raise EntitiesForbidden(name, value, base, sysid, pubid, notation_name)
+
+    def defused_unparsed_entity_decl(self, name, base, sysid, pubid, notation_name):
+        # expat 1.2
+        raise EntitiesForbidden(name, None, base, sysid, pubid, notation_name)  # pragma: no cover
+
+    def defused_external_entity_ref_handler(self, context, base, sysid, pubid):
+        raise ExternalReferenceForbidden(context, base, sysid, pubid)
+
+
+# aliases
+# XMLParse is a typo, keep it for backwards compatibility
+XMLTreeBuilder = XMLParse = XMLParser = DefusedXMLParser
+
+
+def parse(source, parser=None, forbid_dtd=False, forbid_entities=True, forbid_external=True):
+    if parser is None:
+        parser = DefusedXMLParser(
+            target=_TreeBuilder(),
+            forbid_dtd=forbid_dtd,
+            forbid_entities=forbid_entities,
+            forbid_external=forbid_external,
+        )
+    return _parse(source, parser)
+
+
+def iterparse(
+    source,
+    events=None,
+    parser=None,
+    forbid_dtd=False,
+    forbid_entities=True,
+    forbid_external=True,
+):
+    if parser is None:
+        parser = DefusedXMLParser(
+            target=_TreeBuilder(),
+            forbid_dtd=forbid_dtd,
+            forbid_entities=forbid_entities,
+            forbid_external=forbid_external,
+        )
+    return _iterparse(source, events, parser)
+
+
+def fromstring(text, forbid_dtd=False, forbid_entities=True, forbid_external=True):
+    parser = DefusedXMLParser(
+        target=_TreeBuilder(),
+        forbid_dtd=forbid_dtd,
+        forbid_entities=forbid_entities,
+        forbid_external=forbid_external,
+    )
+    parser.feed(text)
+    return parser.close()
+
+
+XML = fromstring
+
+
+def fromstringlist(sequence, forbid_dtd=False, forbid_entities=True, forbid_external=True):
+    parser = DefusedXMLParser(
+        target=_TreeBuilder(),
+        forbid_dtd=forbid_dtd,
+        forbid_entities=forbid_entities,
+        forbid_external=forbid_external,
+    )
+    for text in sequence:
+        parser.feed(text)
+    return parser.close()
+
+
+__all__ = [
+    "ParseError",
+    "XML",
+    "XMLParse",
+    "XMLParser",
+    "XMLTreeBuilder",
+    "fromstring",
+    "fromstringlist",
+    "iterparse",
+    "parse",
+    "tostring",
+]
--- a/resources/lib/defusedxml/init.py
+++ b/resources/lib/defusedxml/init.py
@ -0,0 +1,67 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defuse XML bomb denial of service vulnerabilities
+"""
+from __future__ import print_function, absolute_import
+
+import warnings
+
+from .common import (
+    DefusedXmlException,
+    DTDForbidden,
+    EntitiesForbidden,
+    ExternalReferenceForbidden,
+    NotSupportedError,
+    _apply_defusing,
+)
+
+
+def defuse_stdlib():
+    """Monkey patch and defuse all stdlib packages
+
+    :warning: The monkey patch is an EXPERIMETNAL feature.
+    """
+    defused = {}
+
+    with warnings.catch_warnings():
+        from . import cElementTree
+    from . import ElementTree
+    from . import minidom
+    from . import pulldom
+    from . import sax
+    from . import expatbuilder
+    from . import expatreader
+    from . import xmlrpc
+
+    xmlrpc.monkey_patch()
+    defused[xmlrpc] = None
+
+    defused_mods = [
+        cElementTree,
+        ElementTree,
+        minidom,
+        pulldom,
+        sax,
+        expatbuilder,
+        expatreader,
+    ]
+
+    for defused_mod in defused_mods:
+        stdlib_mod = _apply_defusing(defused_mod)
+        defused[defused_mod] = stdlib_mod
+
+    return defused
+
+
+__version__ = "0.8.0.dev1"
+
+__all__ = [
+    "DefusedXmlException",
+    "DTDForbidden",
+    "EntitiesForbidden",
+    "ExternalReferenceForbidden",
+    "NotSupportedError",
+]
--- a/resources/lib/defusedxml/cElementTree.py
+++ b/resources/lib/defusedxml/cElementTree.py
@ -0,0 +1,47 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defused xml.etree.cElementTree
+"""
+import warnings
+
+# This module is an alias for ElementTree just like xml.etree.cElementTree
+from .ElementTree import (
+    XML,
+    XMLParse,
+    XMLParser,
+    XMLTreeBuilder,
+    fromstring,
+    fromstringlist,
+    iterparse,
+    parse,
+    tostring,
+    DefusedXMLParser,
+    ParseError,
+)
+
+__origin__ = "xml.etree.cElementTree"
+
+
+warnings.warn(
+    "defusedxml.cElementTree is deprecated, import from defusedxml.ElementTree instead.",
+    category=DeprecationWarning,
+    stacklevel=2,
+)
+
+__all__ = [
+    "ParseError",
+    "XML",
+    "XMLParse",
+    "XMLParser",
+    "XMLTreeBuilder",
+    "fromstring",
+    "fromstringlist",
+    "iterparse",
+    "parse",
+    "tostring",
+    # backwards compatibility
+    "DefusedXMLParser",
+]
--- a/resources/lib/defusedxml/common.py
+++ b/resources/lib/defusedxml/common.py
@ -0,0 +1,85 @@
+# defusedxml
+#
+# Copyright (c) 2013-2020 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Common constants, exceptions and helpe functions
+"""
+import sys
+import xml.parsers.expat
+
+PY3 = True
+
+# Fail early when pyexpat is not installed correctly
+if not hasattr(xml.parsers.expat, "ParserCreate"):
+    raise ImportError("pyexpat")  # pragma: no cover
+
+
+class DefusedXmlException(ValueError):
+    """Base exception"""
+
+    def __repr__(self):
+        return str(self)
+
+
+class DTDForbidden(DefusedXmlException):
+    """Document type definition is forbidden"""
+
+    def __init__(self, name, sysid, pubid):
+        super().__init__()
+        self.name = name
+        self.sysid = sysid
+        self.pubid = pubid
+
+    def __str__(self):
+        tpl = "DTDForbidden(name='{}', system_id={!r}, public_id={!r})"
+        return tpl.format(self.name, self.sysid, self.pubid)
+
+
+class EntitiesForbidden(DefusedXmlException):
+    """Entity definition is forbidden"""
+
+    def __init__(self, name, value, base, sysid, pubid, notation_name):
+        super().__init__()
+        self.name = name
+        self.value = value
+        self.base = base
+        self.sysid = sysid
+        self.pubid = pubid
+        self.notation_name = notation_name
+
+    def __str__(self):
+        tpl = "EntitiesForbidden(name='{}', system_id={!r}, public_id={!r})"
+        return tpl.format(self.name, self.sysid, self.pubid)
+
+
+class ExternalReferenceForbidden(DefusedXmlException):
+    """Resolving an external reference is forbidden"""
+
+    def __init__(self, context, base, sysid, pubid):
+        super().__init__()
+        self.context = context
+        self.base = base
+        self.sysid = sysid
+        self.pubid = pubid
+
+    def __str__(self):
+        tpl = "ExternalReferenceForbidden(system_id='{}', public_id={})"
+        return tpl.format(self.sysid, self.pubid)
+
+
+class NotSupportedError(DefusedXmlException):
+    """The operation is not supported"""
+
+
+def _apply_defusing(defused_mod):
+    assert defused_mod is sys.modules[defused_mod.__name__]
+    stdlib_name = defused_mod.__origin__
+    __import__(stdlib_name, {}, {}, ["*"])
+    stdlib_mod = sys.modules[stdlib_name]
+    stdlib_names = set(dir(stdlib_mod))
+    for name, obj in vars(defused_mod).items():
+        if name.startswith("_") or name not in stdlib_names:
+            continue
+        setattr(stdlib_mod, name, obj)
+    return stdlib_mod
--- a/resources/lib/defusedxml/expatbuilder.py
+++ b/resources/lib/defusedxml/expatbuilder.py
@ -0,0 +1,107 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defused xml.dom.expatbuilder
+"""
+from __future__ import print_function, absolute_import
+
+from xml.dom.expatbuilder import ExpatBuilder as _ExpatBuilder
+from xml.dom.expatbuilder import Namespaces as _Namespaces
+
+from .common import DTDForbidden, EntitiesForbidden, ExternalReferenceForbidden
+
+__origin__ = "xml.dom.expatbuilder"
+
+
+class DefusedExpatBuilder(_ExpatBuilder):
+    """Defused document builder"""
+
+    def __init__(
+        self, options=None, forbid_dtd=False, forbid_entities=True, forbid_external=True
+    ):
+        _ExpatBuilder.__init__(self, options)
+        self.forbid_dtd = forbid_dtd
+        self.forbid_entities = forbid_entities
+        self.forbid_external = forbid_external
+
+    def defused_start_doctype_decl(self, name, sysid, pubid, has_internal_subset):
+        raise DTDForbidden(name, sysid, pubid)
+
+    def defused_entity_decl(
+        self, name, is_parameter_entity, value, base, sysid, pubid, notation_name
+    ):
+        raise EntitiesForbidden(name, value, base, sysid, pubid, notation_name)
+
+    def defused_unparsed_entity_decl(self, name, base, sysid, pubid, notation_name):
+        # expat 1.2
+        raise EntitiesForbidden(name, None, base, sysid, pubid, notation_name)  # pragma: no cover
+
+    def defused_external_entity_ref_handler(self, context, base, sysid, pubid):
+        raise ExternalReferenceForbidden(context, base, sysid, pubid)
+
+    def install(self, parser):
+        _ExpatBuilder.install(self, parser)
+
+        if self.forbid_dtd:
+            parser.StartDoctypeDeclHandler = self.defused_start_doctype_decl
+        if self.forbid_entities:
+            # if self._options.entities:
+            parser.EntityDeclHandler = self.defused_entity_decl
+            parser.UnparsedEntityDeclHandler = self.defused_unparsed_entity_decl
+        if self.forbid_external:
+            parser.ExternalEntityRefHandler = self.defused_external_entity_ref_handler
+
+
+class DefusedExpatBuilderNS(_Namespaces, DefusedExpatBuilder):
+    """Defused document builder that supports namespaces."""
+
+    def install(self, parser):
+        DefusedExpatBuilder.install(self, parser)
+        if self._options.namespace_declarations:
+            parser.StartNamespaceDeclHandler = self.start_namespace_decl_handler
+
+    def reset(self):
+        DefusedExpatBuilder.reset(self)
+        self._initNamespaces()
+
+
+def parse(file, namespaces=True, forbid_dtd=False, forbid_entities=True, forbid_external=True):
+    """Parse a document, returning the resulting Document node.
+
+    'file' may be either a file name or an open file object.
+    """
+    if namespaces:
+        build_builder = DefusedExpatBuilderNS
+    else:
+        build_builder = DefusedExpatBuilder
+    builder = build_builder(
+        forbid_dtd=forbid_dtd, forbid_entities=forbid_entities, forbid_external=forbid_external
+    )
+
+    if isinstance(file, str):
+        fp = open(file, "rb")
+        try:
+            result = builder.parseFile(fp)
+        finally:
+            fp.close()
+    else:
+        result = builder.parseFile(file)
+    return result
+
+
+def parseString(
+    string, namespaces=True, forbid_dtd=False, forbid_entities=True, forbid_external=True
+):
+    """Parse a document from a string, returning the resulting
+    Document node.
+    """
+    if namespaces:
+        build_builder = DefusedExpatBuilderNS
+    else:
+        build_builder = DefusedExpatBuilder
+    builder = build_builder(
+        forbid_dtd=forbid_dtd, forbid_entities=forbid_entities, forbid_external=forbid_external
+    )
+    return builder.parseString(string)
--- a/resources/lib/defusedxml/expatreader.py
+++ b/resources/lib/defusedxml/expatreader.py
@ -0,0 +1,61 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defused xml.sax.expatreader
+"""
+from __future__ import print_function, absolute_import
+
+from xml.sax.expatreader import ExpatParser as _ExpatParser
+
+from .common import DTDForbidden, EntitiesForbidden, ExternalReferenceForbidden
+
+__origin__ = "xml.sax.expatreader"
+
+
+class DefusedExpatParser(_ExpatParser):
+    """Defused SAX driver for the pyexpat C module."""
+
+    def __init__(
+        self,
+        namespaceHandling=0,
+        bufsize=2 ** 16 - 20,
+        forbid_dtd=False,
+        forbid_entities=True,
+        forbid_external=True,
+    ):
+        super().__init__(namespaceHandling, bufsize)
+        self.forbid_dtd = forbid_dtd
+        self.forbid_entities = forbid_entities
+        self.forbid_external = forbid_external
+
+    def defused_start_doctype_decl(self, name, sysid, pubid, has_internal_subset):
+        raise DTDForbidden(name, sysid, pubid)
+
+    def defused_entity_decl(
+        self, name, is_parameter_entity, value, base, sysid, pubid, notation_name
+    ):
+        raise EntitiesForbidden(name, value, base, sysid, pubid, notation_name)
+
+    def defused_unparsed_entity_decl(self, name, base, sysid, pubid, notation_name):
+        # expat 1.2
+        raise EntitiesForbidden(name, None, base, sysid, pubid, notation_name)  # pragma: no cover
+
+    def defused_external_entity_ref_handler(self, context, base, sysid, pubid):
+        raise ExternalReferenceForbidden(context, base, sysid, pubid)
+
+    def reset(self):
+        super().reset()
+        parser = self._parser
+        if self.forbid_dtd:
+            parser.StartDoctypeDeclHandler = self.defused_start_doctype_decl
+        if self.forbid_entities:
+            parser.EntityDeclHandler = self.defused_entity_decl
+            parser.UnparsedEntityDeclHandler = self.defused_unparsed_entity_decl
+        if self.forbid_external:
+            parser.ExternalEntityRefHandler = self.defused_external_entity_ref_handler
+
+
+def create_parser(*args, **kwargs):
+    return DefusedExpatParser(*args, **kwargs)
--- a/resources/lib/defusedxml/lxml.py
+++ b/resources/lib/defusedxml/lxml.py
@ -0,0 +1,153 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""DEPRECATED Example code for lxml.etree protection
+
+The code has NO protection against decompression bombs.
+"""
+from __future__ import print_function, absolute_import
+
+import threading
+import warnings
+
+from lxml import etree as _etree
+
+from .common import DTDForbidden, EntitiesForbidden, NotSupportedError
+
+LXML3 = _etree.LXML_VERSION[0] >= 3
+
+__origin__ = "lxml.etree"
+
+tostring = _etree.tostring
+
+
+warnings.warn(
+    "defusedxml.lxml is no longer supported and will be removed in a future release.",
+    category=DeprecationWarning,
+    stacklevel=2,
+)
+
+
+class RestrictedElement(_etree.ElementBase):
+    """A restricted Element class that filters out instances of some classes"""
+
+    __slots__ = ()
+    # blacklist = (etree._Entity, etree._ProcessingInstruction, etree._Comment)
+    blacklist = _etree._Entity
+
+    def _filter(self, iterator):
+        blacklist = self.blacklist
+        for child in iterator:
+            if isinstance(child, blacklist):
+                continue
+            yield child
+
+    def __iter__(self):
+        iterator = super(RestrictedElement, self).__iter__()
+        return self._filter(iterator)
+
+    def iterchildren(self, tag=None, reversed=False):
+        iterator = super(RestrictedElement, self).iterchildren(tag=tag, reversed=reversed)
+        return self._filter(iterator)
+
+    def iter(self, tag=None, *tags):
+        iterator = super(RestrictedElement, self).iter(tag=tag, *tags)
+        return self._filter(iterator)
+
+    def iterdescendants(self, tag=None, *tags):
+        iterator = super(RestrictedElement, self).iterdescendants(tag=tag, *tags)
+        return self._filter(iterator)
+
+    def itersiblings(self, tag=None, preceding=False):
+        iterator = super(RestrictedElement, self).itersiblings(tag=tag, preceding=preceding)
+        return self._filter(iterator)
+
+    def getchildren(self):
+        iterator = super(RestrictedElement, self).__iter__()
+        return list(self._filter(iterator))
+
+    def getiterator(self, tag=None):
+        iterator = super(RestrictedElement, self).getiterator(tag)
+        return self._filter(iterator)
+
+
+class GlobalParserTLS(threading.local):
+    """Thread local context for custom parser instances"""
+
+    parser_config = {
+        "resolve_entities": False,
+        # 'remove_comments': True,
+        # 'remove_pis': True,
+    }
+
+    element_class = RestrictedElement
+
+    def createDefaultParser(self):
+        parser = _etree.XMLParser(**self.parser_config)
+        element_class = self.element_class
+        if self.element_class is not None:
+            lookup = _etree.ElementDefaultClassLookup(element=element_class)
+            parser.set_element_class_lookup(lookup)
+        return parser
+
+    def setDefaultParser(self, parser):
+        self._default_parser = parser
+
+    def getDefaultParser(self):
+        parser = getattr(self, "_default_parser", None)
+        if parser is None:
+            parser = self.createDefaultParser()
+            self.setDefaultParser(parser)
+        return parser
+
+
+_parser_tls = GlobalParserTLS()
+getDefaultParser = _parser_tls.getDefaultParser
+
+
+def check_docinfo(elementtree, forbid_dtd=False, forbid_entities=True):
+    """Check docinfo of an element tree for DTD and entity declarations
+
+    The check for entity declarations needs lxml 3 or newer. lxml 2.x does
+    not support dtd.iterentities().
+    """
+    docinfo = elementtree.docinfo
+    if docinfo.doctype:
+        if forbid_dtd:
+            raise DTDForbidden(docinfo.doctype, docinfo.system_url, docinfo.public_id)
+        if forbid_entities and not LXML3:
+            # lxml < 3 has no iterentities()
+            raise NotSupportedError("Unable to check for entity declarations " "in lxml 2.x")
+
+    if forbid_entities:
+        for dtd in docinfo.internalDTD, docinfo.externalDTD:
+            if dtd is None:
+                continue
+            for entity in dtd.iterentities():
+                raise EntitiesForbidden(entity.name, entity.content, None, None, None, None)
+
+
+def parse(source, parser=None, base_url=None, forbid_dtd=False, forbid_entities=True):
+    if parser is None:
+        parser = getDefaultParser()
+    elementtree = _etree.parse(source, parser, base_url=base_url)
+    check_docinfo(elementtree, forbid_dtd, forbid_entities)
+    return elementtree
+
+
+def fromstring(text, parser=None, base_url=None, forbid_dtd=False, forbid_entities=True):
+    if parser is None:
+        parser = getDefaultParser()
+    rootelement = _etree.fromstring(text, parser, base_url=base_url)
+    elementtree = rootelement.getroottree()
+    check_docinfo(elementtree, forbid_dtd, forbid_entities)
+    return rootelement
+
+
+XML = fromstring
+
+
+def iterparse(*args, **kwargs):
+    raise NotSupportedError("defused lxml.etree.iterparse not available")
--- a/resources/lib/defusedxml/minidom.py
+++ b/resources/lib/defusedxml/minidom.py
@ -0,0 +1,63 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defused xml.dom.minidom
+"""
+from __future__ import print_function, absolute_import
+
+from xml.dom.minidom import _do_pulldom_parse
+from . import expatbuilder as _expatbuilder
+from . import pulldom as _pulldom
+
+__origin__ = "xml.dom.minidom"
+
+
+def parse(
+    file, parser=None, bufsize=None, forbid_dtd=False, forbid_entities=True, forbid_external=True
+):
+    """Parse a file into a DOM by filename or file object."""
+    if parser is None and not bufsize:
+        return _expatbuilder.parse(
+            file,
+            forbid_dtd=forbid_dtd,
+            forbid_entities=forbid_entities,
+            forbid_external=forbid_external,
+        )
+    else:
+        return _do_pulldom_parse(
+            _pulldom.parse,
+            (file,),
+            {
+                "parser": parser,
+                "bufsize": bufsize,
+                "forbid_dtd": forbid_dtd,
+                "forbid_entities": forbid_entities,
+                "forbid_external": forbid_external,
+            },
+        )
+
+
+def parseString(
+    string, parser=None, forbid_dtd=False, forbid_entities=True, forbid_external=True
+):
+    """Parse a file into a DOM from a string."""
+    if parser is None:
+        return _expatbuilder.parseString(
+            string,
+            forbid_dtd=forbid_dtd,
+            forbid_entities=forbid_entities,
+            forbid_external=forbid_external,
+        )
+    else:
+        return _do_pulldom_parse(
+            _pulldom.parseString,
+            (string,),
+            {
+                "parser": parser,
+                "forbid_dtd": forbid_dtd,
+                "forbid_entities": forbid_entities,
+                "forbid_external": forbid_external,
+            },
+        )
--- a/resources/lib/defusedxml/pulldom.py
+++ b/resources/lib/defusedxml/pulldom.py
@ -0,0 +1,41 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defused xml.dom.pulldom
+"""
+from __future__ import print_function, absolute_import
+
+from xml.dom.pulldom import parse as _parse
+from xml.dom.pulldom import parseString as _parseString
+from .sax import make_parser
+
+__origin__ = "xml.dom.pulldom"
+
+
+def parse(
+    stream_or_string,
+    parser=None,
+    bufsize=None,
+    forbid_dtd=False,
+    forbid_entities=True,
+    forbid_external=True,
+):
+    if parser is None:
+        parser = make_parser()
+        parser.forbid_dtd = forbid_dtd
+        parser.forbid_entities = forbid_entities
+        parser.forbid_external = forbid_external
+    return _parse(stream_or_string, parser, bufsize)
+
+
+def parseString(
+    string, parser=None, forbid_dtd=False, forbid_entities=True, forbid_external=True
+):
+    if parser is None:
+        parser = make_parser()
+        parser.forbid_dtd = forbid_dtd
+        parser.forbid_entities = forbid_entities
+        parser.forbid_external = forbid_external
+    return _parseString(string, parser)
--- a/resources/lib/defusedxml/sax.py
+++ b/resources/lib/defusedxml/sax.py
@ -0,0 +1,60 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defused xml.sax
+"""
+from __future__ import print_function, absolute_import
+
+from xml.sax import InputSource as _InputSource
+from xml.sax import ErrorHandler as _ErrorHandler
+
+from . import expatreader
+
+__origin__ = "xml.sax"
+
+
+def parse(
+    source,
+    handler,
+    errorHandler=_ErrorHandler(),
+    forbid_dtd=False,
+    forbid_entities=True,
+    forbid_external=True,
+):
+    parser = make_parser()
+    parser.setContentHandler(handler)
+    parser.setErrorHandler(errorHandler)
+    parser.forbid_dtd = forbid_dtd
+    parser.forbid_entities = forbid_entities
+    parser.forbid_external = forbid_external
+    parser.parse(source)
+
+
+def parseString(
+    string,
+    handler,
+    errorHandler=_ErrorHandler(),
+    forbid_dtd=False,
+    forbid_entities=True,
+    forbid_external=True,
+):
+    from io import BytesIO
+
+    if errorHandler is None:
+        errorHandler = _ErrorHandler()
+    parser = make_parser()
+    parser.setContentHandler(handler)
+    parser.setErrorHandler(errorHandler)
+    parser.forbid_dtd = forbid_dtd
+    parser.forbid_entities = forbid_entities
+    parser.forbid_external = forbid_external
+
+    inpsrc = _InputSource()
+    inpsrc.setByteStream(BytesIO(string))
+    parser.parse(inpsrc)
+
+
+def make_parser(parser_list=[]):
+    return expatreader.create_parser()
--- a/resources/lib/defusedxml/xmlrpc.py
+++ b/resources/lib/defusedxml/xmlrpc.py
@ -0,0 +1,144 @@
+# defusedxml
+#
+# Copyright (c) 2013 by Christian Heimes <christian@python.org>
+# Licensed to PSF under a Contributor Agreement.
+# See https://www.python.org/psf/license for licensing details.
+"""Defused xmlrpclib
+
+Also defuses gzip bomb
+"""
+from __future__ import print_function, absolute_import
+
+import io
+
+from .common import DTDForbidden, EntitiesForbidden, ExternalReferenceForbidden
+
+__origin__ = "xmlrpc.client"
+from xmlrpc.client import ExpatParser
+from xmlrpc import client as xmlrpc_client
+from xmlrpc import server as xmlrpc_server
+from xmlrpc.client import gzip_decode as _orig_gzip_decode
+from xmlrpc.client import GzipDecodedResponse as _OrigGzipDecodedResponse
+
+try:
+    import gzip
+except ImportError:  # pragma: no cover
+    gzip = None
+
+
+# Limit maximum request size to prevent resource exhaustion DoS
+# Also used to limit maximum amount of gzip decoded data in order to prevent
+# decompression bombs
+# A value of -1 or smaller disables the limit
+MAX_DATA = 30 * 1024 * 1024  # 30 MB
+
+
+def defused_gzip_decode(data, limit=None):
+    """gzip encoded data -> unencoded data
+
+    Decode data using the gzip content encoding as described in RFC 1952
+    """
+    if not gzip:  # pragma: no cover
+        raise NotImplementedError
+    if limit is None:
+        limit = MAX_DATA
+    f = io.BytesIO(data)
+    gzf = gzip.GzipFile(mode="rb", fileobj=f)
+    try:
+        if limit < 0:  # no limit
+            decoded = gzf.read()
+        else:
+            decoded = gzf.read(limit + 1)
+    except IOError:  # pragma: no cover
+        raise ValueError("invalid data")
+    f.close()
+    gzf.close()
+    if limit >= 0 and len(decoded) > limit:
+        raise ValueError("max gzipped payload length exceeded")
+    return decoded
+
+
+class DefusedGzipDecodedResponse(gzip.GzipFile if gzip else object):
+    """a file-like object to decode a response encoded with the gzip
+    method, as described in RFC 1952.
+    """
+
+    def __init__(self, response, limit=None):
+        # response doesn't support tell() and read(), required by
+        # GzipFile
+        if not gzip:  # pragma: no cover
+            raise NotImplementedError
+        self.limit = limit = limit if limit is not None else MAX_DATA
+        if limit < 0:  # no limit
+            data = response.read()
+            self.readlength = None
+        else:
+            data = response.read(limit + 1)
+            self.readlength = 0
+        if limit >= 0 and len(data) > limit:
+            raise ValueError("max payload length exceeded")
+        self.stringio = io.BytesIO(data)
+        super().__init__(mode="rb", fileobj=self.stringio)
+
+    def read(self, n):
+        if self.limit >= 0:
+            left = self.limit - self.readlength
+            n = min(n, left + 1)
+            data = gzip.GzipFile.read(self, n)
+            self.readlength += len(data)
+            if self.readlength > self.limit:
+                raise ValueError("max payload length exceeded")
+            return data
+        else:
+            return super().read(n)
+
+    def close(self):
+        super().close()
+        self.stringio.close()
+
+
+class DefusedExpatParser(ExpatParser):
+    def __init__(self, target, forbid_dtd=False, forbid_entities=True, forbid_external=True):
+        super().__init__(target)
+        self.forbid_dtd = forbid_dtd
+        self.forbid_entities = forbid_entities
+        self.forbid_external = forbid_external
+        parser = self._parser
+        if self.forbid_dtd:
+            parser.StartDoctypeDeclHandler = self.defused_start_doctype_decl
+        if self.forbid_entities:
+            parser.EntityDeclHandler = self.defused_entity_decl
+            parser.UnparsedEntityDeclHandler = self.defused_unparsed_entity_decl
+        if self.forbid_external:
+            parser.ExternalEntityRefHandler = self.defused_external_entity_ref_handler
+
+    def defused_start_doctype_decl(self, name, sysid, pubid, has_internal_subset):
+        raise DTDForbidden(name, sysid, pubid)
+
+    def defused_entity_decl(
+        self, name, is_parameter_entity, value, base, sysid, pubid, notation_name
+    ):
+        raise EntitiesForbidden(name, value, base, sysid, pubid, notation_name)
+
+    def defused_unparsed_entity_decl(self, name, base, sysid, pubid, notation_name):
+        # expat 1.2
+        raise EntitiesForbidden(name, None, base, sysid, pubid, notation_name)  # pragma: no cover
+
+    def defused_external_entity_ref_handler(self, context, base, sysid, pubid):
+        raise ExternalReferenceForbidden(context, base, sysid, pubid)
+
+
+def monkey_patch():
+    xmlrpc_client.FastParser = DefusedExpatParser
+    xmlrpc_client.GzipDecodedResponse = DefusedGzipDecodedResponse
+    xmlrpc_client.gzip_decode = defused_gzip_decode
+    if xmlrpc_server:
+        xmlrpc_server.gzip_decode = defused_gzip_decode
+
+
+def unmonkey_patch():
+    xmlrpc_client.FastParser = None
+    xmlrpc_client.GzipDecodedResponse = _OrigGzipDecodedResponse
+    xmlrpc_client.gzip_decode = _orig_gzip_decode
+    if xmlrpc_server:
+        xmlrpc_server.gzip_decode = _orig_gzip_decode
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import requests
 import requests.exceptions as exceptions
@ -18,7 +17,7 @@ LOG = getLogger('PLEX.download')
 ###############################################################################


-class DownloadUtils():
+class DownloadUtils(object):
    """
    Manages any up/downloads with PKC. Careful to initiate correctly
    Use startSession() to initiate.
@ -264,7 +263,7 @@ class DownloadUtils():
                # 201: Created
                try:
                    # xml response
-                    r = utils.defused_etree.fromstring(r.content)
+                    r = utils.etree.fromstring(r.content)
                    return r
                except Exception:
                    r.encoding = 'utf-8'
--- a/resources/lib/entrypoint.py
+++ b/resources/lib/entrypoint.py
@ -4,10 +4,10 @@
 Loads of different functions called in SEPARATE Python instances through
 e.g. plugin://... calls. Hence be careful to only rely on window variables.
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import sys
 import copy
+import xml.etree.ElementTree as etree

 import xbmc
 import xbmcplugin
@ -88,12 +88,10 @@ def directory_item(label, path, folder=True):
    Adds a xbmcplugin.addDirectoryItem() directory itemlistitem
    """
    listitem = ListItem(label, path=path)
-    listitem.setThumbnailImage(
-        "special://home/addons/plugin.video.plexkodiconnect/icon.png")
    listitem.setArt(
-        {"fanart": "special://home/addons/plugin.video.plexkodiconnect/fanart.jpg"})
-    listitem.setArt(
-        {"landscape":"special://home/addons/plugin.video.plexkodiconnect/fanart.jpg"})
+        {'landscape':'special://home/addons/plugin.video.plexkodiconnect/fanart.jpg',
+         'fanart': 'special://home/addons/plugin.video.plexkodiconnect/fanart.jpg',
+         'thumb': 'special://home/addons/plugin.video.plexkodiconnect/icon.png'})
    xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),
                                url=path,
                                listitem=listitem,
@ -249,12 +247,10 @@ def show_listing(xml, plex_type=None, section_id=None, synched=True, key=None):
        widgets.KEY = key
    # Process all items to show
    all_items = mass_api(xml)
-    all_items = utils.process_method_on_list(widgets.generate_item, all_items)
-    all_items = utils.process_method_on_list(widgets.prepare_listitem,
-                                             all_items)
+    all_items = [widgets.generate_item(api) for api in all_items]
+    all_items = [widgets.prepare_listitem(item) for item in all_items]
    # fill that listing...
-    all_items = utils.process_method_on_list(widgets.create_listitem,
-                                             all_items)
+    all_items = [widgets.create_listitem(item) for item in all_items]
    xbmcplugin.addDirectoryItems(int(sys.argv[1]), all_items, len(all_items))
    # end directory listing
    xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_UNSORTED)
@ -288,7 +284,7 @@ def get_video_files(plex_id, params):
    app.init(entrypoint=True)
    item = PF.GetPlexMetadata(plex_id)
    try:
-        path = utils.try_decode(item[0][0][0].attrib['file'])
+        path = item[0][0][0].attrib['file']
    except (TypeError, IndexError, AttributeError, KeyError):
        LOG.error('Could not get file path for item %s', plex_id)
        return xbmcplugin.endOfDirectory(int(sys.argv[1]))
@ -304,15 +300,14 @@ def get_video_files(plex_id, params):
    if path_ops.exists(path):
        for root, dirs, files in path_ops.walk(path):
            for directory in dirs:
-                item_path = utils.try_encode(path_ops.path.join(root,
-                                                                directory))
+                item_path = path_ops.path.join(root, directory)
                listitem = ListItem(item_path, path=item_path)
                xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),
                                            url=item_path,
                                            listitem=listitem,
                                            isFolder=True)
            for file in files:
-                item_path = utils.try_encode(path_ops.path.join(root, file))
+                item_path = path_ops.path.join(root, file)
                listitem = ListItem(item_path, path=item_path)
                xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),
                                            url=file,
@ -357,23 +352,20 @@ def extra_fanart(plex_id, plex_path):
        backdrops = api.artwork()['Backdrop']
        for count, backdrop in enumerate(backdrops):
            # Same ordering as in artwork
-            art_file = utils.try_encode(path_ops.path.join(
-                fanart_dir, "fanart%.3d.jpg" % count))
+            art_file = path_ops.path.join(fanart_dir, "fanart%.3d.jpg" % count)
            listitem = ListItem("%.3d" % count, path=art_file)
            xbmcplugin.addDirectoryItem(
                handle=int(sys.argv[1]),
                url=art_file,
                listitem=listitem)
-            path_ops.copyfile(backdrop, utils.try_decode(art_file))
+            path_ops.copyfile(backdrop, art_file)
    else:
        LOG.info("Found cached backdrop.")
        # Use existing cached images
-        fanart_dir = utils.try_decode(fanart_dir)
+        fanart_dir = fanart_dir
        for root, _, files in path_ops.walk(fanart_dir):
-            root = utils.decode_path(root)
            for file in files:
-                file = utils.decode_path(file)
-                art_file = utils.try_encode(path_ops.path.join(root, file))
+                art_file = path_ops.path.join(root, file)
                listitem = ListItem(file, path=art_file)
                xbmcplugin.addDirectoryItem(handle=int(sys.argv[1]),
                                            url=art_file,
@ -505,7 +497,7 @@ def browse_plex(key=None, plex_type=None, section_id=None, synched=True,
        if prompt is None:
            # User cancelled
            return
-        prompt = prompt.strip().decode('utf-8')
+        prompt = prompt.strip()
        args['query'] = prompt
    xml = DU().downloadUrl(utils.extend_url('{server}%s' % key, args))
    try:
@ -516,7 +508,7 @@ def browse_plex(key=None, plex_type=None, section_id=None, synched=True,
        return
    if xml[0].tag == 'Hub':
        # E.g. when hitting the endpoint '/hubs/search'
-        answ = utils.etree.Element(xml.tag, attrib=xml.attrib)
+        answ = etree.Element(xml.tag, attrib=xml.attrib)
        for hub in xml:
            if not utils.cast(int, hub.get('size')):
                # Empty category
--- a/resources/lib/exceptions.py
+++ b/resources/lib/exceptions.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals


 class PlaylistError(Exception):
--- a/resources/lib/initialsetup.py
+++ b/resources/lib/initialsetup.py
@ -1,12 +1,11 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from xbmc import executebuiltin

 from . import utils
-from .utils import etree
+import xml.etree.ElementTree as etree
 from . import path_ops
 from . import migration
 from .downloadutils import DownloadUtils as DU, exceptions
@ -212,8 +211,7 @@ class InitialSetup(object):
        not set before
        """
        answer = True
-        chk = PF.check_connection(app.CONN.server,
-                                  verifySSL=True if v.KODIVERSION >= 18 else False)
+        chk = PF.check_connection(app.CONN.server, verifySSL=True)
        if chk is False:
            LOG.warn('Could not reach PMS %s', app.CONN.server)
            answer = False
@ -241,18 +239,13 @@ class InitialSetup(object):
        """
        Checks for server's connectivity. Returns check_connection result
        """
-        if server['local']:
-            # Deactive SSL verification if the server is local for Kodi 17
-            verifySSL = True if v.KODIVERSION >= 18 else False
-        else:
-            verifySSL = True
        if not server['token']:
            # Plex GDM: we only get the token from plex.tv after
            # Sign-in to plex.tv
            server['token'] = utils.settings('plexToken') or None
        return PF.check_connection(server['baseURL'],
                                   token=server['token'],
-                                   verifySSL=verifySSL)
+                                   verifySSL=True)

    def pick_pms(self, showDialog=False, inform_of_search=False):
        """
@ -410,7 +403,7 @@ class InitialSetup(object):
                utils.messageDialog(
                    utils.lang(29999),
                    '%s %s\n%s' % (utils.lang(39013),
-                                   server['name'].decode('utf-8'),
+                                   server['name'],
                                   utils.lang(39014)))
                if self.plex_tv_sign_in() is False:
                    # Exit while loop if user cancels
@ -549,22 +542,14 @@ class InitialSetup(object):

        # Display a warning if Kodi puts ALL movies into the queue, basically
        # breaking playback reporting for PKC
-        warn = False
        settings = js.settings_getsettingvalue('videoplayer.autoplaynextitem')
-        if v.KODIVERSION >= 18:
-            # Answer for videoplayer.autoplaynextitem:
-            # [{u'label': u'Music videos', u'value': 0},
-            #  {u'label': u'TV shows', u'value': 1},
-            #  {u'label': u'Episodes', u'value': 2},
-            #  {u'label': u'Movies', u'value': 3},
-            #  {u'label': u'Uncategorized', u'value': 4}]
-            if 1 in settings or 2 in settings or 3 in settings:
-                warn = True
-        else:
-            # Kodi Krypton: answer is boolean
-            if settings:
-                warn = True
-        if warn:
+        # Answer for videoplayer.autoplaynextitem:
+        # [{u'label': u'Music videos', u'value': 0},
+        #  {u'label': u'TV shows', u'value': 1},
+        #  {u'label': u'Episodes', u'value': 2},
+        #  {u'label': u'Movies', u'value': 3},
+        #  {u'label': u'Uncategorized', u'value': 4}]
+        if 1 in settings or 2 in settings or 3 in settings:
            LOG.warn('Kodi setting videoplayer.autoplaynextitem is: %s',
                     settings)
            if utils.settings('warned_setting_videoplayer.autoplaynextitem') == 'false':
@ -574,17 +559,13 @@ class InitialSetup(object):
                # Warning: Kodi setting "Play next video automatically" is
                # enabled. This could break PKC. Deactivate?
                if utils.yesno_dialog(utils.lang(29999), utils.lang(30003)):
-                    if v.KODIVERSION >= 18:
-                        for i in (1, 2, 3):
-                            try:
-                                settings.remove(i)
-                            except ValueError:
-                                pass
-                        js.settings_setsettingvalue('videoplayer.autoplaynextitem',
-                                                    settings)
-                    else:
-                        js.settings_setsettingvalue('videoplayer.autoplaynextitem',
-                                                    False)
+                    for i in (1, 2, 3):
+                        try:
+                            settings.remove(i)
+                        except ValueError:
+                            pass
+                    js.settings_setsettingvalue('videoplayer.autoplaynextitem',
+                                                settings)
        # Set any video library updates to happen in the background in order to
        # hide "Compressing database"
        js.settings_setsettingvalue('videolibrary.backgroundupdate', True)
@ -632,7 +613,11 @@ class InitialSetup(object):
            app.ACCOUNT.load()
            app.SYNC.load()
            return
+
        LOG.info('Showing install questions')
+        if not utils.default_kodi_skin_warning_message():
+            LOG.info('Aborting initial setup due to skin')
+            return
        # Additional settings where the user needs to choose
        # Direct paths (\\NAS\mymovie.mkv) or addon (http)?
        goto_settings = False
@ -687,10 +672,10 @@ class InitialSetup(object):

        # If you use several Plex libraries of one kind, e.g. "Kids Movies" and
        # "Parents Movies", be sure to check https://goo.gl/JFtQV9
-        # dialog.ok(heading=utils.lang(29999), line1=utils.lang(39076))
+        # dialog.ok(heading=utils.lang(29999), message=utils.lang(39076))

        # Need to tell about our image source for collections: themoviedb.org
-        # dialog.ok(heading=utils.lang(29999), line1=utils.lang(39717))
+        # dialog.ok(heading=utils.lang(29999), message=utils.lang(39717))
        # Make sure that we only ask these questions upon first installation
        utils.settings('InstallQuestionsAnswered', value='true')

--- a/resources/lib/itemtypes/init.py
+++ b/resources/lib/itemtypes/init.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from .movies import Movie
 from .tvshows import Show, Season, Episode
 from .music import Artist, Album, Song
--- a/resources/lib/itemtypes/common.py
+++ b/resources/lib/itemtypes/common.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from ntpath import dirname

@ -162,7 +161,7 @@ class ItemBase(object):
        Returns a dict of the Kodi ids: {<provider>: <kodi_unique_id>}
        """
        kodi_unique_ids = api.guids.copy()
-        for provider, provider_id in api.guids.iteritems():
+        for provider, provider_id in api.guids.items():
            kodi_unique_ids[provider] = self.kodidb.add_uniqueid(
                kodi_id,
                api.kodi_type,
--- a/resources/lib/itemtypes/movies.py
+++ b/resources/lib/itemtypes/movies.py
@ -1,14 +1,26 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
+import re
+import os
+import string

 from .common import ItemBase
 from ..plex_api import API
 from .. import app, variables as v, plex_functions as PF
+from ..path_ops import append_os_sep

 LOG = getLogger('PLEX.movies')

+# Tolerance in years if comparing videos as equal
+VIDEOYEAR_TOLERANCE = 1
+PUNCTUATION_TRANSLATION = {ord(char): None for char in string.punctuation}
+# Punctuation removed in original strings!!
+# Matches '2010 The Year We Make Contact 1984'
+# from '2010 The Year We Make Contact 1984 720p webrip'
+REGEX_MOVIENAME_AND_YEAR = re.compile(
+    r'''(.+)((?:19|20)\d{2}).*(?!((19|20)\d{2}))''')
+

 class Movie(ItemBase):
    """
@ -38,11 +50,39 @@ class Movie(ItemBase):

        fullpath, path, filename = api.fullpath()
        if app.SYNC.direct_paths and not fullpath.startswith('http'):
-            kodi_pathid = self.kodidb.add_path(path,
-                                               content='movies',
-                                               scraper='metadata.local')
+            if api.subtype:
+                # E.g. homevideos, which have "subtype" flag set
+                # Homevideo directories need to be flat by Plex' instructions
+                library_path, video_path = path, path
+            else:
+                # Normal movie libraries
+                library_path, video_path, filename = split_movie_path(fullpath)
+            if library_path == video_path:
+                # "Flat" folder structure where e.g. movies lie all in 1 dir
+                # E.g.
+                #   'C:\\Movies\\Pulp Fiction (1994).mkv'
+                kodi_pathid = self.kodidb.add_path(library_path,
+                                                   content='movies',
+                                                   scraper='metadata.local')
+                path = library_path
+                kodi_parent_pathid = kodi_pathid
+            else:
+                # Plex library contains folders named identical to the
+                # video file, e.g.
+                #   'C:\\Movies\\Pulp Fiction (1994)\\Pulp Fiction (1994).mkv'
+                # Add the "parent" path for the Plex library
+                kodi_parent_pathid = self.kodidb.add_path(
+                    library_path,
+                    content='movies',
+                    scraper='metadata.local')
+                # Add this movie's path
+                kodi_pathid = self.kodidb.add_path(
+                    video_path,
+                    id_parent_path=kodi_parent_pathid)
+                path = video_path
        else:
            kodi_pathid = self.kodidb.get_path(path)
+            kodi_parent_pathid = kodi_pathid

        if update_item:
            LOG.info('UPDATE movie plex_id: %s - %s', plex_id, api.title())
@ -106,8 +146,8 @@ class Movie(ItemBase):
                              api.list_to_string(api.studios()),
                              api.trailer(),
                              api.list_to_string(api.countries()),
-                              fullpath,
-                              kodi_pathid,
+                              path,
+                              kodi_parent_pathid,
                              api.premiere_date(),
                              api.userrating())

@ -133,6 +173,7 @@ class Movie(ItemBase):
                              kodi_id=kodi_id,
                              kodi_fileid=file_id,
                              kodi_pathid=kodi_pathid,
+                              trailer_synced=bool(api.trailer()),
                              last_sync=self.last_sync)

    def remove(self, plex_id, plex_type=None):
@ -243,3 +284,73 @@ class Movie(ItemBase):
        return unique_ids.get('imdb',
                              unique_ids.get('tmdb',
                                             unique_ids.get('tvdb')))
+
+
+def split_movie_path(path):
+    """
+    Implements Plex' video naming convention for movies:
+    https://support.plex.tv/articles/naming-and-organizing-your-movie-media-files/
+
+    Splits a video's path into its librarypath, potential video folder, and
+    filename.
+    E.g. path = 'C:\\Movies\\Pulp Fiction (1994)\\Pulp Fiction (1994).mkv'
+    returns the tuple
+        ('C:\\Movies\\',
+         'C:\\Movies\\Pulp Fiction (1994)\\',
+         'Pulp Fiction (1994).mkv')
+
+    E.g. path = 'C:\\Movies\\Pulp Fiction (1994).mkv'
+    returns the tuple
+        ('C:\\Movies\\',
+         'C:\\Movies\\',
+         'Pulp Fiction (1994).mkv')
+    """
+    basename, filename = os.path.split(path)
+    library_path, videofolder = os.path.split(basename)
+
+    clean_filename = _clean_name(os.path.splitext(filename)[0])
+    clean_videofolder = _clean_name(videofolder)
+
+    try:
+        parsed_filename = _parse_videoname_and_year(clean_filename)
+    except (TypeError, IndexError):
+        LOG.warn('Could not parse video path, be sure to follow the Plex '
+                 'naming guidelines!! We failed to parse this path: %s', path)
+        # Be on the safe side and assume that the movie folder structure is
+        # flat
+        return append_os_sep(basename), append_os_sep(basename), filename
+    try:
+        parsed_videofolder = _parse_videoname_and_year(clean_videofolder)
+    except (TypeError, IndexError):
+        # e.g. no year to parse => flat structure
+        return append_os_sep(basename), append_os_sep(basename), filename
+    if _parsed_names_alike(parsed_filename, parsed_videofolder):
+        # e.g.
+        # filename = The Master.(2012).720p.Blu-ray.axed.mkv
+        # videofolder = The Master 2012
+        # or
+        # filename = National Lampoon's Christmas Vacation (1989)
+        #       [x264-Bluray-1080p DTS-2.0]
+        # videofolder = Christmas Vacation 1989
+        return append_os_sep(library_path), append_os_sep(basename), filename
+    else:
+        # Flat movie file-stuctrue, all movies in one big directory
+        return append_os_sep(basename), append_os_sep(basename), filename
+
+
+def _parsed_names_alike(name1, name2):
+    return (abs(name2[1] - name1[1]) <= VIDEOYEAR_TOLERANCE and
+            (name1[0] in name2[0] or name2[0] in name1[0]))
+
+
+def _clean_name(name):
+    """
+    Returns name with all whitespaces (regex "\\s") and punctuation
+    (string.punctuation) characters removed; all characters in lowercase
+    """
+    return re.sub('\\s', '', name).translate(PUNCTUATION_TRANSLATION).lower()
+
+
+def _parse_videoname_and_year(name):
+    parsed = REGEX_MOVIENAME_AND_YEAR.search(name)
+    return parsed[1], int(parsed[2])
--- a/resources/lib/itemtypes/music.py
+++ b/resources/lib/itemtypes/music.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from .common import ItemBase
@ -127,16 +126,12 @@ class MusicMixin(object):
        # Check whether we have orphaned path entries
        if not self.kodidb.path_id_from_song(kodi_id):
            self.kodidb.remove_path(path_id)
-        if v.KODIVERSION < 18:
-            self.kodidb.remove_albuminfosong(kodi_id)
        self.kodidb.delete_artwork(kodi_id, v.KODI_TYPE_SONG)

    def remove_album(self, kodi_id):
        '''
        Remove an album
        '''
-        if v.KODIVERSION < 18:
-            self.kodidb.delete_album_from_album_genre(kodi_id)
        self.kodidb.remove_album(kodi_id)
        self.kodidb.delete_artwork(kodi_id, v.KODI_TYPE_ALBUM)

@ -176,16 +171,6 @@ class Artist(MusicMixin, ItemBase):

        if app.SYNC.artwork:
            artworks = api.artwork()
-            if 'poster' in artworks:
-                thumb = "<thumb>%s</thumb>" % artworks['poster']
-            else:
-                thumb = None
-            if 'fanart' in artworks:
-                fanart = "<fanart>%s</fanart>" % artworks['fanart']
-            else:
-                fanart = None
-        else:
-            thumb, fanart = None, None

        # UPDATE THE ARTIST #####
        if update_item:
@ -200,8 +185,6 @@ class Artist(MusicMixin, ItemBase):
            kodi_id = self.kodidb.add_artist(api.title(), musicBrainzId)
        self.kodidb.update_artist(api.list_to_string(api.genres()),
                                  api.plot(),
-                                  thumb,
-                                  fanart,
                                  timing.unix_date_to_kodi(self.last_sync),
                                  kodi_id)
        if app.SYNC.artwork:
@ -281,76 +264,46 @@ class Album(MusicMixin, ItemBase):
        genre = api.list_to_string(api.genres())
        if app.SYNC.artwork:
            artworks = api.artwork()
-            if 'poster' in artworks:
-                thumb = "<thumb>%s</thumb>" % artworks['poster']
-            else:
-                thumb = None
-        else:
-            thumb = None

        # UPDATE THE ALBUM #####
        if update_item:
            LOG.info("UPDATE album plex_id: %s - Name: %s", plex_id, name)
-            if v.KODIVERSION >= 18:
-                self.kodidb.update_album(name,
-                                         musicBrainzId,
-                                         api.artist_name(),
-                                         genre,
-                                         api.year(),
-                                         compilation,
-                                         api.plot(),
-                                         thumb,
-                                         api.list_to_string(api.studios()),
-                                         api.userrating(),
-                                         timing.unix_date_to_kodi(self.last_sync),
-                                         'album',
-                                         kodi_id)
-            else:
-                self.kodidb.update_album_17(name,
-                                            musicBrainzId,
-                                            api.artist_name(),
-                                            genre,
-                                            api.year(),
-                                            compilation,
-                                            api.plot(),
-                                            thumb,
-                                            api.list_to_string(api.studios()),
-                                            api.userrating(),
-                                            timing.unix_date_to_kodi(self.last_sync),
-                                            'album',
-                                            kodi_id)
+            self.kodidb.update_album(name,
+                                     musicBrainzId,
+                                     api.artist_name(),
+                                     genre,
+                                     api.premiere_date(),
+                                     # TODO: as soon as Plex supports the original
+                                     # release date (Kodi: strOrigReleaseDate)
+                                     api.premiere_date(),
+                                     compilation,
+                                     api.plot(),
+                                     api.list_to_string(api.studios()),
+                                     api.kodi_type,
+                                     api.userrating(),
+                                     timing.unix_date_to_kodi(self.last_sync),
+                                     api.kodi_type,
+                                     kodi_id)
        # OR ADD THE ALBUM #####
        else:
            LOG.info("ADD album plex_id: %s - Name: %s", plex_id, name)
            kodi_id = self.kodidb.new_album_id()
-            if v.KODIVERSION >= 18:
-                self.kodidb.add_album(kodi_id,
-                                      name,
-                                      musicBrainzId,
-                                      api.artist_name(),
-                                      genre,
-                                      api.year(),
-                                      compilation,
-                                      api.plot(),
-                                      thumb,
-                                      api.list_to_string(api.studios()),
-                                      api.userrating(),
-                                      timing.unix_date_to_kodi(self.last_sync),
-                                      'album')
-            else:
-                self.kodidb.add_album_17(kodi_id,
-                                         name,
-                                         musicBrainzId,
-                                         api.artist_name(),
-                                         genre,
-                                         api.year(),
-                                         compilation,
-                                         api.plot(),
-                                         thumb,
-                                         api.list_to_string(api.studios()),
-                                         api.userrating(),
-                                         timing.unix_date_to_kodi(self.last_sync),
-                                         'album')
+            self.kodidb.add_album(kodi_id,
+                                  name,
+                                  musicBrainzId,
+                                  api.artist_name(),
+                                  genre,
+                                  api.premiere_date(),
+                                  # TODO: as soon as Plex supports the original
+                                  # release date (Kodi: strOrigReleaseDate)
+                                  api.premiere_date(),
+                                  compilation,
+                                  api.plot(),
+                                  api.list_to_string(api.studios()),
+                                  api.kodi_type,
+                                  api.userrating(),
+                                  timing.unix_date_to_kodi(self.last_sync),
+                                  api.kodi_type)
        self.kodidb.add_albumartist(artist_id, kodi_id, api.artist_name())
        if app.SYNC.artwork:
            self.kodidb.modify_artwork(artworks,
@ -432,34 +385,23 @@ class Song(MusicMixin, ItemBase):
            # No album found, create a single's album
            LOG.info('Creating singles album')
            parent_id = self.kodidb.new_album_id()
-            if v.KODIVERSION >= 18:
-                self.kodidb.add_album(kodi_id,
-                                      None,
-                                      None,
-                                      None,
-                                      genre,
-                                      api.year(),
-                                      None,
-                                      None,
-                                      None,
-                                      None,
-                                      None,
-                                      timing.unix_date_to_kodi(self.last_sync),
-                                      'single')
-            else:
-                self.kodidb.add_album_17(kodi_id,
-                                         None,
-                                         None,
-                                         None,
-                                         genre,
-                                         api.year(),
-                                         None,
-                                         None,
-                                         None,
-                                         None,
-                                         None,
-                                         timing.unix_date_to_kodi(self.last_sync),
-                                         'single')
+            self.kodidb.add_album(kodi_id,
+                                  None,
+                                  None,
+                                  None,
+                                  genre,
+                                  api.premiere_date(),
+                                  # TODO: as soon as Plex supports the original
+                                  # release date (Kodi: strOrigReleaseDate)
+                                  api.premiere_date(),
+                                  None,
+                                  None,
+                                  None,
+                                  'single',
+                                  None,
+                                  None,
+                                  timing.unix_date_to_kodi(self.last_sync),
+                                  'single')
        else:
            album = self.plexdb.album(album_id)
            if not album:
@ -515,97 +457,62 @@ class Song(MusicMixin, ItemBase):
                moods.append(entry.attrib['tag'])
        mood = api.list_to_string(moods)
        _, path, filename = api.fullpath()
+        audio_codec = api.audio_codec()
        # UPDATE THE SONG #####
        if update_item:
            LOG.info("UPDATE song plex_id: %s - %s", plex_id, title)
            # Use dummy strHash '123' for Kodi
            self.kodidb.update_path(path, kodi_pathid)
-            # Update the song entry
-            if v.KODIVERSION >= 18:
-                # Kodi Leia
-                self.kodidb.update_song(parent_id,
-                                        artists,
-                                        genre,
-                                        title,
-                                        track,
-                                        api.runtime(),
-                                        year,
-                                        filename,
-                                        api.viewcount(),
-                                        api.lastplayed(),
-                                        api.userrating(),
-                                        comment,
-                                        mood,
-                                        api.date_created(),
-                                        kodi_id)
-            else:
-                self.kodidb.update_song_17(parent_id,
-                                           artists,
-                                           genre,
-                                           title,
-                                           track,
-                                           api.runtime(),
-                                           year,
-                                           filename,
-                                           api.viewcount(),
-                                           api.lastplayed(),
-                                           api.userrating(),
-                                           comment,
-                                           mood,
-                                           api.date_created(),
-                                           kodi_id)
+            self.kodidb.update_song(parent_id,
+                                    artists,
+                                    genre,
+                                    title,
+                                    track,
+                                    api.runtime(),
+                                    api.premiere_date(),
+                                    # TODO: as soon as Plex supports the original
+                                    # release date (Kodi: strOrigReleaseDate)
+                                    api.premiere_date(),
+                                    filename,
+                                    api.viewcount(),
+                                    api.lastplayed(),
+                                    api.userrating(),
+                                    comment,
+                                    mood,
+                                    audio_codec['bitrate'] or 0,
+                                    audio_codec['samplingrate'] or 0,
+                                    audio_codec['channels'] or 0,
+                                    api.date_created(),
+                                    kodi_id)
        # OR ADD THE SONG #####
        else:
            LOG.info("ADD song plex_id: %s - %s", plex_id, title)
            # Add path
            kodi_pathid = self.kodidb.add_path(path)
-            # Create the song entry
-            if v.KODIVERSION >= 18:
-                # Kodi Leia
-                self.kodidb.add_song(kodi_id,
-                                     parent_id,
-                                     kodi_pathid,
-                                     artists,
-                                     genre,
-                                     title,
-                                     track,
-                                     api.runtime(),
-                                     year,
-                                     filename,
-                                     musicBrainzId,
-                                     api.viewcount(),
-                                     api.lastplayed(),
-                                     api.userrating(),
-                                     0,
-                                     0,
-                                     mood,
-                                     api.date_created())
-            else:
-                self.kodidb.add_song_17(kodi_id,
-                                        parent_id,
-                                        kodi_pathid,
-                                        artists,
-                                        genre,
-                                        title,
-                                        track,
-                                        api.runtime(),
-                                        year,
-                                        filename,
-                                        musicBrainzId,
-                                        api.viewcount(),
-                                        api.lastplayed(),
-                                        api.userrating(),
-                                        0,
-                                        0,
-                                        mood,
-                                        api.date_created())
-        if v.KODIVERSION < 18:
-            # Link song to album
-            self.kodidb.add_albuminfosong(kodi_id,
-                                          parent_id,
-                                          track,
-                                          title,
-                                          api.runtime())
+            self.kodidb.add_song(kodi_id,
+                                 parent_id,
+                                 kodi_pathid,
+                                 artists,
+                                 genre,
+                                 title,
+                                 track,
+                                 api.runtime(),
+                                 api.premiere_date(),
+                                 # TODO: as soon as Plex supports the original
+                                 # release date (Kodi: strOrigReleaseDate)
+                                 api.premiere_date(),
+                                 filename,
+                                 musicBrainzId,
+                                 api.viewcount(),
+                                 api.lastplayed(),
+                                 api.userrating(),
+                                 0,
+                                 0,
+                                 mood,
+                                 audio_codec['bitrate'] or 0,
+                                 audio_codec['samplingrate'] or 0,
+                                 audio_codec['channels'] or 0,
+                                 api.date_created())
        # Link song to artists
        artist_name = api.grandparent_title()
        # Do the actual linking
--- a/resources/lib/itemtypes/tvshows.py
+++ b/resources/lib/itemtypes/tvshows.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from .common import ItemBase, process_path
--- a/resources/lib/json_rpc.py
+++ b/resources/lib/json_rpc.py
@ -4,7 +4,6 @@
 Collection of functions using the Kodi JSON RPC interface.
 See http://kodi.wiki/view/JSON-RPC_API
 """
-from __future__ import absolute_import, division, unicode_literals
 from json import loads, dumps
 from xbmc import executeJSONRPC

@ -85,7 +84,7 @@ def get_player_ids():
    Returns a list of all the active Kodi player ids (usually 3) as int
    """
    ret = []
-    for player in get_players().values():
+    for player in list(get_players().values()):
        ret.append(player['playerid'])
    return ret

@ -170,12 +169,12 @@ def stop():

 def seek_to(offset):
    """
-    Seeks all Kodi players to offset [int] in milliseconds
+    Seeks all Kodi players to offset [int] in seconds
    """
    for playerid in get_player_ids():
        return JsonRPC("Player.Seek").execute(
            {"playerid": playerid,
-             "value": timing.millis_to_kodi_time(offset)})
+             "value": {'time': timing.millis_to_kodi_time(int(offset * 1000))}})


 def smallforward():
@ -430,6 +429,15 @@ def get_current_audio_stream_index(playerid):
        'properties': ['currentaudiostream']})['result']['currentaudiostream']['index']


+def get_current_video_stream_index(playerid):
+    """
+    Returns the currently active video stream index [int]
+    """
+    return JsonRPC('Player.GetProperties').execute({
+        'playerid': playerid,
+        'properties': ['currentvideostream']})['result']['currentvideostream']['index']
+
+
 def get_current_subtitle_stream_index(playerid):
    """
    Returns the currently active subtitle stream index [int] or None if there
@ -621,6 +629,15 @@ def item_details(kodi_id, kodi_type):
    ret = JsonRPC(json).execute({'%sid' % kodi_type: kodi_id,
                                'properties': fields})
    try:
-        return ret['result']['%sdetails' % kodi_type]
+        ret = ret['result']['%sdetails' % kodi_type]
    except (KeyError, TypeError):
        return {}
+    if kodi_type == v.KODI_TYPE_SHOW:
+        # append watched counts to tvshow details
+        ret["extraproperties"] = {
+            "totalseasons": str(ret["season"]),
+            "totalepisodes": str(ret["episode"]),
+            "watchedepisodes": str(ret["watchedepisodes"]),
+            "unwatchedepisodes": str(ret["episode"] - ret["watchedepisodes"])
+        }
+    return ret
--- a/resources/lib/kodi_constants.py
+++ b/resources/lib/kodi_constants.py
@ -5,88 +5,45 @@ script.module.metadatautils
 kodi_constants.py
 Several common constants for use with Kodi json api
 '''
-FIELDS_BASE = ['dateadded', 'file', 'lastplayed', 'plot', 'title', 'art',
-               'playcount']
-FIELDS_FILE = FIELDS_BASE + ['streamdetails', 'director', 'resume', 'runtime']
-FIELDS_MOVIES = FIELDS_FILE + ['plotoutline', 'sorttitle', 'cast', 'votes',
-    'showlink', 'top250', 'trailer', 'year', 'country', 'studio', 'set',
-    'genre', 'mpaa', 'setid', 'rating', 'tag', 'tagline', 'writer',
-    'originaltitle', 'imdbnumber', 'uniqueid']
-FIELDS_TVSHOWS = FIELDS_BASE + ['sorttitle', 'mpaa', 'premiered', 'year',
-    'episode', 'watchedepisodes', 'votes', 'rating', 'studio', 'season',
-    'genre', 'cast', 'episodeguide', 'tag', 'originaltitle', 'imdbnumber']
+FIELDS_BASE = ["dateadded", "file", "lastplayed", "plot", "title", "art", "playcount"]
+FIELDS_FILE = FIELDS_BASE + ["streamdetails", "director", "resume", "runtime"]
+FIELDS_MOVIES = FIELDS_FILE + ["plotoutline", "sorttitle", "cast", "votes", "showlink", "top250", "trailer", "year",
+                               "country", "studio", "set", "genre", "mpaa", "setid", "rating", "tag", "tagline",
+                               "writer", "originaltitle",
+                               "imdbnumber"]
+FIELDS_MOVIES.append("uniqueid")
+FIELDS_TVSHOWS = FIELDS_BASE + ["sorttitle", "mpaa", "premiered", "year", "episode", "watchedepisodes", "votes",
+                                "rating", "studio", "season", "genre", "cast", "episodeguide", "tag", "originaltitle",
+                                "imdbnumber"]
 FIELDS_SEASON = ['art', 'playcount', 'season', 'showtitle', 'episode',
-    'tvshowid', 'watchedepisodes', 'userrating', 'fanart', 'thumbnail']
-FIELDS_EPISODES = FIELDS_FILE + ['cast', 'productioncode', 'rating', 'votes',
-    'episode', 'showtitle', 'tvshowid', 'season', 'firstaired', 'writer',
-    'originaltitle']
-FIELDS_MUSICVIDEOS = FIELDS_FILE + ['genre', 'artist', 'tag', 'album', 'track',
-    'studio', 'year']
-FIELDS_FILES = FIELDS_FILE + ['plotoutline', 'sorttitle', 'cast', 'votes',
-    'trailer', 'year', 'country', 'studio', 'genre', 'mpaa', 'rating',
-    'tagline', 'writer', 'originaltitle', 'imdbnumber', 'premiered', 'episode',
-    'showtitle', 'firstaired', 'watchedepisodes', 'duration', 'season']
-FIELDS_SONGS = ['artist', 'displayartist', 'title', 'rating', 'fanart',
-    'thumbnail', 'duration', 'disc', 'playcount', 'comment', 'file', 'album',
-    'lastplayed', 'genre', 'musicbrainzartistid', 'track', 'dateadded']
-FIELDS_ALBUMS = ['title', 'fanart', 'thumbnail', 'genre', 'displayartist',
-    'artist', 'musicbrainzalbumartistid', 'year', 'rating', 'artistid',
-    'musicbrainzalbumid', 'theme', 'description', 'type', 'style', 'playcount',
-    'albumlabel', 'mood', 'dateadded']
-FIELDS_ARTISTS = ['born', 'formed', 'died', 'style', 'yearsactive', 'mood',
-    'fanart', 'thumbnail', 'musicbrainzartistid', 'disbanded', 'description',
-    'instrument']
-FIELDS_RECORDINGS = ['art', 'channel', 'directory', 'endtime', 'file', 'genre',
-    'icon', 'playcount', 'plot', 'plotoutline', 'resume', 'runtime',
-    'starttime', 'streamurl', 'title']
-FIELDS_CHANNELS = ['broadcastnow', 'channeltype', 'hidden', 'locked',
-    'lastplayed', 'thumbnail', 'channel']
+                 'tvshowid', 'watchedepisodes', 'userrating', 'fanart', 'thumbnail']
+FIELDS_EPISODES = FIELDS_FILE + ["cast", "productioncode", "rating", "votes", "episode", "showtitle", "tvshowid",
+                                 "season", "firstaired", "writer", "originaltitle"]
+FIELDS_MUSICVIDEOS = FIELDS_FILE + ["genre", "artist", "tag", "album", "track", "studio", "year"]
+FIELDS_FILES = FIELDS_FILE + ["plotoutline", "sorttitle", "cast", "votes", "trailer", "year", "country", "studio",
+                              "genre", "mpaa", "rating", "tagline", "writer", "originaltitle", "imdbnumber",
+                              "premiered", "episode", "showtitle",
+                              "firstaired", "watchedepisodes", "duration", "season"]
+FIELDS_SONGS = ["artist", "displayartist", "title", "rating", "fanart", "thumbnail", "duration", "disc",
+                "playcount", "comment", "file", "album", "lastplayed", "genre", "musicbrainzartistid", "track",
+                "dateadded"]
+FIELDS_ALBUMS = ["title", "fanart", "thumbnail", "genre", "displayartist", "artist",
+                 "musicbrainzalbumartistid", "year", "rating", "artistid", "musicbrainzalbumid", "theme", "description",
+                 "type", "style", "playcount", "albumlabel", "mood", "dateadded"]
+FIELDS_ARTISTS = ["born", "formed", "died", "style", "yearsactive", "mood", "fanart", "thumbnail",
+                  "musicbrainzartistid", "disbanded", "description", "instrument"]
+FIELDS_RECORDINGS = ["art", "channel", "directory", "endtime", "file", "genre", "icon", "playcount", "plot",
+                     "plotoutline", "resume", "runtime", "starttime", "streamurl", "title"]
+FIELDS_CHANNELS = ["broadcastnow", "channeltype", "hidden", "locked", "lastplayed", "thumbnail", "channel"]

-FILTER_UNWATCHED = {
-    'operator': 'lessthan',
-    'field': 'playcount',
-    'value': '1'
-}
-FILTER_WATCHED = {
-    'operator': 'isnot',
-    'field': 'playcount',
-    'value': '0'
-}
-FILTER_RATING = {
-    'operator': 'greaterthan',
-    'field': 'rating',
-    'value': '7'
-}
-FILTER_RATING_MUSIC = {
-    'operator': 'greaterthan',
-    'field': 'rating',
-    'value': '3'
-}
-FILTER_INPROGRESS = {
-    'operator': 'true',
-    'field': 'inprogress',
-    'value': ''
-}
-SORT_RATING = {
-    'method': 'rating',
-    'order': 'descending'
-}
-SORT_RANDOM = {
-    'method': 'random',
-    'order': 'descending'
-}
-SORT_TITLE = {
-    'method': 'title',
-    'order': 'ascending'
-}
-SORT_DATEADDED = {
-    'method': 'dateadded',
-    'order': 'descending'
-}
-SORT_LASTPLAYED = {
-    'method': 'lastplayed',
-    'order': 'descending'
-}
-SORT_EPISODE = {
-    'method': 'episode'
-}
+FILTER_UNWATCHED = {"operator": "lessthan", "field": "playcount", "value": "1"}
+FILTER_WATCHED = {"operator": "isnot", "field": "playcount", "value": "0"}
+FILTER_RATING = {"operator": "greaterthan", "field": "rating", "value": "7"}
+FILTER_RATING_MUSIC = {"operator": "greaterthan", "field": "rating", "value": "3"}
+FILTER_INPROGRESS = {"operator": "true", "field": "inprogress", "value": ""}
+SORT_RATING = {"method": "rating", "order": "descending"}
+SORT_RANDOM = {"method": "random", "order": "descending"}
+SORT_TITLE = {"method": "title", "order": "ascending"}
+SORT_DATEADDED = {"method": "dateadded", "order": "descending"}
+SORT_LASTPLAYED = {"method": "lastplayed", "order": "descending"}
+SORT_EPISODE = {"method": "episode"}
--- a/resources/lib/kodi_db/init.py
+++ b/resources/lib/kodi_db/init.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from .common import KODIDB_LOCK
@ -21,7 +20,6 @@ def kodiid_from_filename(path, kodi_type=None, db_type=None):
    Returns None, <kodi_type> if not possible
    """
    kodi_id = None
-    path = utils.try_decode(path)
    # Make sure path ends in either '/' or '\'
    # We CANNOT use path_ops.path.join as this can result in \ where we need /
    try:
@ -74,7 +72,7 @@ def reset_cached_images():
        for path in paths:
            new_path = path_ops.translate_path('special://thumbnails/%s' % path)
            try:
-                path_ops.makedirs(path_ops.encode_path(new_path))
+                path_ops.makedirs(new_path)
            except OSError as err:
                LOG.warn('Could not create thumbnail directory %s: %s',
                         new_path, err)
--- a/resources/lib/kodi_db/common.py
+++ b/resources/lib/kodi_db/common.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from threading import Lock

 from .. import db, path_ops
@ -65,7 +64,7 @@ class KodiDBBase(object):
        """
        Pass in an artworks dict (see PlexAPI) to set an items artwork.
        """
-        for kodi_art, url in artworks.iteritems():
+        for kodi_art, url in artworks.items():
            self.add_art(url, kodi_id, kodi_type, kodi_art)

    @db.catch_operationalerrors
@ -84,7 +83,7 @@ class KodiDBBase(object):
        """
        Pass in an artworks dict (see PlexAPI) to set an items artwork.
        """
-        for kodi_art, url in artworks.iteritems():
+        for kodi_art, url in artworks.items():
            self.modify_art(url, kodi_id, kodi_type, kodi_art)

    @db.catch_operationalerrors
--- a/resources/lib/kodi_db/music.py
+++ b/resources/lib/kodi_db/music.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from . import common
@ -49,17 +48,16 @@ class KodiMusicDB(common.KodiDBBase):
                strRole)
            VALUES (?, ?)
        ''', (1, 'Artist'))
-        if v.KODIVERSION >= 18:
-            self.cursor.execute('DELETE FROM versiontagscan')
-            self.cursor.execute('''
-                INSERT INTO versiontagscan(
-                    idVersion,
-                    iNeedsScan,
-                    lastscanned)
-                VALUES (?, ?, ?)
-            ''', (v.DB_MUSIC_VERSION,
-                  0,
-                  timing.kodi_now()))
+        self.cursor.execute('DELETE FROM versiontagscan')
+        self.cursor.execute('''
+            INSERT INTO versiontagscan(
+                idVersion,
+                iNeedsScan,
+                lastscanned)
+            VALUES (?, ?, ?)
+        ''', (v.DB_MUSIC_VERSION,
+              0,
+              timing.kodi_now()))

    @db.catch_operationalerrors
    def update_path(self, path, kodi_pathid):
@ -160,87 +158,6 @@ class KodiMusicDB(common.KodiDBBase):
        self.cursor.execute('SELECT COALESCE(MAX(idAlbum), 0) FROM album')
        return self.cursor.fetchone()[0] + 1

-    @db.catch_operationalerrors
-    def add_album_17(self, *args):
-        """
-        strReleaseType: 'album' or 'single'
-        """
-        if app.SYNC.artwork:
-            self.cursor.execute('''
-                INSERT INTO album(
-                    idAlbum,
-                    strAlbum,
-                    strMusicBrainzAlbumID,
-                    strArtists,
-                    strGenres,
-                    iYear,
-                    bCompilation,
-                    strReview,
-                    strImage,
-                    strLabel,
-                    iUserrating,
-                    lastScraped,
-                    strReleaseType)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            ''', (args))
-        else:
-            args = list(args)
-            del args[8]
-            self.cursor.execute('''
-                INSERT INTO album(
-                    idAlbum,
-                    strAlbum,
-                    strMusicBrainzAlbumID,
-                    strArtists,
-                    strGenres,
-                    iYear,
-                    bCompilation,
-                    strReview,
-                    strLabel,
-                    iUserrating,
-                    lastScraped,
-                    strReleaseType)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-            ''', (args))
-
-    @db.catch_operationalerrors
-    def update_album_17(self, *args):
-        if app.SYNC.artwork:
-            self.cursor.execute('''
-                UPDATE album
-                SET strAlbum = ?,
-                    strMusicBrainzAlbumID = ?,
-                    strArtists = ?,
-                    strGenres = ?,
-                    iYear = ?,
-                    bCompilation = ?,
-                    strReview = ?,
-                    strImage = ?,
-                    strLabel = ?,
-                    iUserrating = ?,
-                    lastScraped = ?,
-                    strReleaseType = ?
-                WHERE idAlbum = ?
-            ''', (args))
-        else:
-            args = list(args)
-            del args[7]
-            self.cursor.execute('''
-                UPDATE album
-                SET strAlbum = ?,
-                    strMusicBrainzAlbumID = ?,
-                    strArtists = ?,
-                    strGenres = ?,
-                    iYear = ?,
-                    bCompilation = ?,
-                    strReview = ?,
-                    strLabel = ?,
-                    iUserrating = ?,
-                    lastScraped = ?,
-                    strReleaseType = ?
-                WHERE idAlbum = ?
-            ''', (args))
-
    @db.catch_operationalerrors
    def add_album(self, *args):
        """
@ -254,15 +171,16 @@ class KodiMusicDB(common.KodiDBBase):
                    strMusicBrainzAlbumID,
                    strArtistDisp,
                    strGenres,
-                    iYear,
+                    strReleaseDate,
+                    strOrigReleaseDate,
                    bCompilation,
                    strReview,
-                    strImage,
                    strLabel,
+                    strType,
                    iUserrating,
                    lastScraped,
                    strReleaseType)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
            ''', (args))
        else:
            args = list(args)
@ -274,14 +192,16 @@ class KodiMusicDB(common.KodiDBBase):
                    strMusicBrainzAlbumID,
                    strArtistDisp,
                    strGenres,
-                    iYear,
+                    strReleaseDate,
+                    strOrigReleaseDate,
                    bCompilation,
                    strReview,
                    strLabel,
+                    strType,
                    iUserrating,
                    lastScraped,
                    strReleaseType)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
            ''', (args))

    @db.catch_operationalerrors
@ -293,11 +213,12 @@ class KodiMusicDB(common.KodiDBBase):
                    strMusicBrainzAlbumID = ?,
                    strArtistDisp = ?,
                    strGenres = ?,
-                    iYear = ?,
+                    strReleaseDate = ?,
+                    strOrigReleaseDate = ?,
                    bCompilation = ?,
                    strReview = ?,
-                    strImage = ?,
                    strLabel = ?,
+                    strType = ?,
                    iUserrating = ?,
                    lastScraped = ?,
                    strReleaseType = ?
@ -312,7 +233,8 @@ class KodiMusicDB(common.KodiDBBase):
                    strMusicBrainzAlbumID = ?,
                    strArtistDisp = ?,
                    strGenres = ?,
-                    iYear = ?,
+                    strReleaseDate = ?,
+                    strOrigReleaseDate = ?,
                    bCompilation = ?,
                    strReview = ?,
                    strLabel = ?,
@ -395,7 +317,8 @@ class KodiMusicDB(common.KodiDBBase):
                strTitle,
                iTrack,
                iDuration,
-                iYear,
+                strReleaseDate,
+                strOrigReleaseDate,
                strFileName,
                strMusicBrainzTrackID,
                iTimesPlayed,
@ -404,33 +327,11 @@ class KodiMusicDB(common.KodiDBBase):
                iStartOffset,
                iEndOffset,
                mood,
+                iBitRate,
+                iSampleRate,
+                iChannels,
                dateAdded)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ''', (args))
-
-    @db.catch_operationalerrors
-    def add_song_17(self, *args):
-        self.cursor.execute('''
-            INSERT INTO song(
-                idSong,
-                idAlbum,
-                idPath,
-                strArtists,
-                strGenres,
-                strTitle,
-                iTrack,
-                iDuration,
-                iYear,
-                strFileName,
-                strMusicBrainzTrackID,
-                iTimesPlayed,
-                lastplayed,
-                rating,
-                iStartOffset,
-                iEndOffset,
-                mood,
-                dateAdded)
-            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
        ''', (args))

    @db.catch_operationalerrors
@ -443,13 +344,17 @@ class KodiMusicDB(common.KodiDBBase):
                strTitle = ?,
                iTrack = ?,
                iDuration = ?,
-                iYear = ?,
+                strReleaseDate = ?,
+                strOrigReleaseDate = ?,
                strFilename = ?,
                iTimesPlayed = ?,
                lastplayed = ?,
                rating = ?,
                comment = ?,
                mood = ?,
+                iBitRate = ?,
+                iSampleRate = ?,
+                iChannels = ?,
                dateAdded = ?
            WHERE idSong = ?
        ''', (args))
@ -463,27 +368,6 @@ class KodiMusicDB(common.KodiDBBase):
            WHERE idSong = ?
        ''', (args))

-    @db.catch_operationalerrors
-    def update_song_17(self, *args):
-        self.cursor.execute('''
-            UPDATE song
-            SET idAlbum = ?,
-                strArtists = ?,
-                strGenres = ?,
-                strTitle = ?,
-                iTrack = ?,
-                iDuration = ?,
-                iYear = ?,
-                strFilename = ?,
-                iTimesPlayed = ?,
-                lastplayed = ?,
-                rating = ?,
-                comment = ?,
-                mood = ?,
-                dateAdded = ?
-            WHERE idSong = ?
-        ''', (args))
-
    def path_id_from_song(self, kodi_id):
        self.cursor.execute('SELECT idPath FROM song WHERE idSong = ? LIMIT 1',
                            (kodi_id, ))
@ -527,26 +411,13 @@ class KodiMusicDB(common.KodiDBBase):

    @db.catch_operationalerrors
    def update_artist(self, *args):
-        if app.SYNC.artwork:
-            self.cursor.execute('''
-                UPDATE artist
-                SET strGenres = ?,
-                    strBiography = ?,
-                    strImage = ?,
-                    strFanart = ?,
-                    lastScraped = ?
-                WHERE idArtist = ?
-            ''', (args))
-        else:
-            args = list(args)
-            del args[3], args[2]
-            self.cursor.execute('''
-                UPDATE artist
-                SET strGenres = ?,
-                    strBiography = ?,
-                    lastScraped = ?
-                WHERE idArtist = ?
-            ''', (args))
+        self.cursor.execute('''
+            UPDATE artist
+            SET strGenres = ?,
+                strBiography = ?,
+                lastScraped = ?
+            WHERE idArtist = ?
+        ''', (args))

    @db.catch_operationalerrors
    def remove_song(self, kodi_id):
@ -568,22 +439,6 @@ class KodiMusicDB(common.KodiDBBase):
            VALUES (?, ?, ?, ?, ?)
        ''', (artist_id, song_id, 1, 0, artist_name))

-    @db.catch_operationalerrors
-    def add_albuminfosong(self, song_id, album_id, track_no, track_title,
-                          runtime):
-        """
-        Kodi 17 only
-        """
-        self.cursor.execute('''
-            INSERT OR REPLACE INTO albuminfosong(
-                idAlbumInfoSong,
-                idAlbumInfo,
-                iTrack,
-                strTitle,
-                iDuration)
-            VALUES (?, ?, ?, ?, ?)
-        ''', (song_id, album_id, track_no, track_title, runtime))
-
    @db.catch_operationalerrors
    def update_userrating(self, kodi_id, kodi_type, userrating):
        """
@ -611,9 +466,6 @@ class KodiMusicDB(common.KodiDBBase):

    @db.catch_operationalerrors
    def remove_album(self, kodi_id):
-        if v.KODIVERSION < 18:
-            self.cursor.execute('DELETE FROM albuminfosong WHERE idAlbumInfo = ?',
-                                (kodi_id, ))
        self.cursor.execute('DELETE FROM album_artist WHERE idAlbum = ?',
                            (kodi_id, ))
        self.cursor.execute('DELETE FROM album WHERE idAlbum = ?', (kodi_id, ))
--- a/resources/lib/kodi_db/texture.py
+++ b/resources/lib/kodi_db/texture.py
@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-
 from . import common


--- a/resources/lib/kodi_db/video.py
+++ b/resources/lib/kodi_db/video.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from sqlite3 import IntegrityError

@ -46,13 +45,15 @@ class KodiVideoDB(common.KodiDBBase):
                                     strContent,
                                     strScraper,
                                     noUpdate,
-                                     exclude)
-                    VALUES (?, ?, ?, ?, ?)
+                                     exclude,
+                                     allAudio)
+                    VALUES (?, ?, ?, ?, ?, ?)
                '''
                self.cursor.execute(query, (path,
                                            kind,
                                            'metadata.local',
                                            1,
+                                            0,
                                            0))

    @db.catch_operationalerrors
@ -61,9 +62,8 @@ class KodiVideoDB(common.KodiDBBase):
        Video DB: Adds all subdirectories to path table while setting a "trail"
        of parent path ids
        """
-        parentpath = path_ops.path.abspath(
-            path_ops.path.join(path,
-                               path_ops.decode_path(path_ops.path.pardir)))
+        parentpath = path_ops.path.split(path_ops.path.split(path)[0])[0]
+        parentpath = path_ops.append_os_sep(parentpath)
        pathid = self.get_path(parentpath)
        if pathid is None:
            self.cursor.execute('''
@ -110,11 +110,13 @@ class KodiVideoDB(common.KodiDBBase):
                                    idParentPath,
                                    strContent,
                                    strScraper,
-                                    noUpdate)
-                                VALUES (?, ?, ?, ?, ?, ?)
+                                    noUpdate,
+                                    exclude,
+                                    allAudio)
+                                VALUES (?, ?, ?, ?, ?, ?, ?, ?)
                                ''',
                                (path, date_added, id_parent_path, content,
-                                 scraper, 1))
+                                 scraper, 1, 0, 0))
            pathid = self.cursor.lastrowid
        return pathid

@ -318,7 +320,7 @@ class KodiVideoDB(common.KodiDBBase):
        for the elmement kodi_id, kodi_type.
        Will also delete a freshly orphaned actor entry.
        """
-        for kind, people_list in people.iteritems():
+        for kind, people_list in people.items():
            self._add_people_kind(kodi_id, kodi_type, kind, people_list)

    @db.catch_operationalerrors
@ -363,7 +365,7 @@ class KodiVideoDB(common.KodiDBBase):
        for kind, people_list in (people if people else
                                  {'actor': [],
                                   'director': [],
-                                   'writer': []}).iteritems():
+                                   'writer': []}).items():
            self._modify_people_kind(kodi_id, kodi_type, kind, people_list)

    @db.catch_operationalerrors
@ -479,6 +481,31 @@ class KodiVideoDB(common.KodiDBBase):
                            (kodi_id, kodi_type))
        return dict(self.cursor.fetchall())

+    def get_trailer(self, kodi_id, kodi_type):
+        """
+        Returns the trailer's URL for kodi_type from the Kodi database or None
+        """
+        if kodi_type == v.KODI_TYPE_MOVIE:
+            self.cursor.execute('SELECT c19 FROM movie WHERE idMovie=?',
+                                (kodi_id, ))
+        else:
+            raise NotImplementedError(f'trailers for {kodi_type} not implemented')
+        try:
+            return self.cursor.fetchone()[0]
+        except TypeError:
+            pass
+
+    @db.catch_operationalerrors
+    def set_trailer(self, kodi_id, kodi_type, url):
+        """
+        Writes the trailer's url to the Kodi DB
+        """
+        if kodi_type == v.KODI_TYPE_MOVIE:
+            self.cursor.execute('UPDATE movie SET c19=? WHERE idMovie=?',
+                                (url, kodi_id))
+        else:
+            raise NotImplementedError(f'trailers for {kodi_type} not implemented')
+
    @db.catch_operationalerrors
    def modify_streams(self, fileid, streamdetails=None, runtime=None):
        """
@ -584,6 +611,8 @@ class KodiVideoDB(common.KodiDBBase):
            identifier = 'idMovie'
        elif kodi_type == v.KODI_TYPE_EPISODE:
            identifier = 'idEpisode'
+        else:
+            return
        self.cursor.execute('SELECT idFile FROM %s WHERE %s = ? LIMIT 1'
                            % (kodi_type, identifier), (kodi_id, ))
        try:
--- a/resources/lib/kodimonitor.py
+++ b/resources/lib/kodimonitor.py
@ -3,7 +3,6 @@
 """
 PKC Kodi Monitoring implementation
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from json import loads
 import copy
@ -62,7 +61,7 @@ class KodiMonitor(xbmc.Monitor):
        Called when a bunch of different stuff happens on the Kodi side
        """
        if data:
-            data = loads(data, 'utf-8')
+            data = loads(data)
            LOG.debug("Method: %s Data: %s", method, data)

        if method == "Player.OnPlay":
@ -218,7 +217,7 @@ class KodiMonitor(xbmc.Monitor):
        play_info = json.loads(play_info)
        app.APP.player.stop()
        handle = 'RunPlugin(%s)' % play_info.get('handle')
-        xbmc.executebuiltin(handle.encode('utf-8'))
+        xbmc.executebuiltin(handle)

    def PlayBackStart(self, data):
        """
@ -391,6 +390,12 @@ class KodiMonitor(xbmc.Monitor):
        if not self._switched_to_plex_streams:
            # We need to switch to the Plex streams ONCE upon playback start
            # after onavchange has been fired
+            # Wait a bit because JSON responses won't be ready otherwise
+            if app.APP.monitor.waitForAbort(2):
+                # In case PKC needs to quit
+                return
+            item.init_kodi_streams()
+            item.switch_to_plex_stream('video')
            if utils.settings('audioStreamPick') == '0':
                item.switch_to_plex_stream('audio')
            if utils.settings('subtitleStreamPick') == '0':
@ -626,11 +631,11 @@ def _notify_upnext(item):
        }
        _complete_artwork_keys(info[key])
    info['play_info'] = {'handle': next_api.fullpath(force_addon=True)[0]}
-    sender = v.ADDON_ID.encode('utf-8')
-    method = 'upnext_data'.encode('utf-8')
-    data = binascii.hexlify(json.dumps(info))
+    sender = v.ADDON_ID
+    method = 'upnext_data'
+    data = binascii.hexlify(json.dumps(info).encode('utf-8'))
    data = '\\"[\\"{0}\\"]\\"'.format(data)
-    xbmc.executebuiltin('NotifyAll(%s, %s, %s)' % (sender, method, data))
+    xbmc.executebuiltin(f'NotifyAll({sender}, {method}, {data})')


 def _videolibrary_onupdate(data):
--- a/resources/lib/library_sync/init.py
+++ b/resources/lib/library_sync/init.py
@ -1,9 +1,7 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-
 from .full_sync import start
 from .websocket import store_websocket_message, process_websocket_messages, \
    WEBSOCKET_MESSAGES, PLAYSTATE_SESSIONS
 from .common import update_kodi_library, PLAYLIST_SYNC_ENABLED
-from .fanart import FanartThread, FanartTask
+from .additional_metadata import MetadataThread, ProcessMetadataTask
 from .sections import force_full_sync, delete_files, clear_window_vars
--- a/resources/lib/library_sync/additional_metadata.py
+++ b/resources/lib/library_sync/additional_metadata.py
@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+from logging import getLogger
+
+from . import additional_metadata_tmdb
+from ..plex_db import PlexDB
+from .. import backgroundthread, utils
+from .. import variables as v, app
+from ..exceptions import ProcessingNotDone
+
+
+logger = getLogger('PLEX.sync.metadata')
+
+BATCH_SIZE = 500
+
+SUPPORTED_METADATA = {
+    v.PLEX_TYPE_MOVIE: (
+        ('missing_trailers', additional_metadata_tmdb.process_trailers),
+        ('missing_fanart', additional_metadata_tmdb.process_fanart),
+    ),
+    v.PLEX_TYPE_SHOW: (
+        ('missing_fanart', additional_metadata_tmdb.process_fanart),
+    ),
+}
+
+
+def processing_is_activated(item_getter):
+    """Checks the PKC settings whether processing is even activated."""
+    if item_getter == 'missing_fanart':
+        return utils.settings('FanartTV') == 'true'
+    return True
+
+
+class MetadataThread(backgroundthread.KillableThread):
+    """This will potentially take hours!"""
+    def __init__(self, callback, refresh=False):
+        self.callback = callback
+        self.refresh = refresh
+        super(MetadataThread, self).__init__()
+
+    def should_suspend(self):
+        return self._suspended or app.APP.is_playing_video
+
+    def _process_in_batches(self, item_getter, processor, plex_type):
+        offset = 0
+        while True:
+            with PlexDB() as plexdb:
+                # Keep DB connection open only for a short period of time!
+                if self.refresh:
+                    # Simply grab every single item if we want to refresh
+                    func = plexdb.every_plex_id
+                else:
+                    func = getattr(plexdb, item_getter)
+                batch = list(func(plex_type, offset, BATCH_SIZE))
+            for plex_id in batch:
+                # Do the actual, time-consuming processing
+                if self.should_suspend() or self.should_cancel():
+                    raise ProcessingNotDone()
+                processor(plex_id, plex_type, self.refresh)
+            if len(batch) < BATCH_SIZE:
+                break
+            offset += BATCH_SIZE
+
+    def _loop(self):
+        for plex_type in SUPPORTED_METADATA:
+            for item_getter, processor in SUPPORTED_METADATA[plex_type]:
+                if not processing_is_activated(item_getter):
+                    continue
+                self._process_in_batches(item_getter, processor, plex_type)
+
+    def _run(self):
+        finished = False
+        while not finished:
+            try:
+                self._loop()
+            except ProcessingNotDone:
+                finished = False
+            else:
+                finished = True
+            if self.wait_while_suspended():
+                break
+        logger.info('MetadataThread finished completely: %s', finished)
+        self.callback(finished)
+
+    def run(self):
+        logger.info('Starting MetadataThread')
+        app.APP.register_metadata_thread(self)
+        try:
+            self._run()
+        except Exception:
+            utils.ERROR(notify=True)
+        finally:
+            app.APP.deregister_metadata_thread(self)
+
+
+class ProcessMetadataTask(backgroundthread.Task):
+    """This task will also be executed while library sync is suspended!"""
+    def setup(self, plex_id, plex_type, refresh=False):
+        self.plex_id = plex_id
+        self.plex_type = plex_type
+        self.refresh = refresh
+
+    def run(self):
+        if self.plex_type not in SUPPORTED_METADATA:
+            return
+        for item_getter, processor in SUPPORTED_METADATA[self.plex_type]:
+            if self.should_cancel():
+                # Just don't process this item at all. Next full sync will
+                # take care of it
+                return
+            if not processing_is_activated(item_getter):
+                continue
+            processor(self.plex_id, self.plex_type, self.refresh)
--- a/resources/lib/library_sync/additional_metadata_tmdb.py
+++ b/resources/lib/library_sync/additional_metadata_tmdb.py
@ -0,0 +1,159 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import logging
+import os
+import sys
+
+import xbmcvfs
+import xbmcaddon
+
+from ..plex_api import API
+from ..kodi_db import KodiVideoDB
+from ..plex_db import PlexDB
+from .. import itemtypes, plex_functions as PF, utils, variables as v
+
+# Import the existing Kodi add-on metadata.themoviedb.org.python
+__ADDON__ = xbmcaddon.Addon(id='metadata.themoviedb.org.python')
+__TEMP_PATH__ = os.path.join(__ADDON__.getAddonInfo('path'), 'python', 'lib')
+__BASE__ = xbmcvfs.translatePath(__TEMP_PATH__)
+sys.path.append(__BASE__)
+import tmdbscraper.tmdb as tmdb
+
+logger = logging.getLogger('PLEX.metadata_movies')
+PREFER_KODI_COLLECTION_ART = utils.settings('PreferKodiCollectionArt') == 'false'
+TMDB_SUPPORTED_IDS = ('tmdb', 'imdb')
+
+
+def get_tmdb_scraper(settings):
+    language = settings.getSettingString('language')
+    certcountry = settings.getSettingString('tmdbcertcountry')
+    # Simplify this in the future
+    # See https://github.com/croneter/PlexKodiConnect/issues/1657
+    search_language = settings.getSettingString('searchlanguage')
+    if search_language:
+        return tmdb.TMDBMovieScraper(settings, language, certcountry, search_language)
+    else:
+        return tmdb.TMDBMovieScraper(settings, language, certcountry)
+
+
+def get_tmdb_details(unique_ids):
+    settings = xbmcaddon.Addon(id='metadata.themoviedb.org.python')
+    details = get_tmdb_scraper(settings).get_details(unique_ids)
+    if 'error' in details:
+        logger.debug('Could not get tmdb details for %s. Error: %s',
+                     unique_ids, details)
+    return details
+
+
+def process_trailers(plex_id, plex_type, refresh=False):
+    done = True
+    try:
+        with PlexDB() as plexdb:
+            db_item = plexdb.item_by_id(plex_id, plex_type)
+        if not db_item:
+            logger.error('Could not get Kodi id for %s %s', plex_type, plex_id)
+            done = False
+            return
+        with KodiVideoDB() as kodidb:
+            trailer = kodidb.get_trailer(db_item['kodi_id'],
+                                         db_item['kodi_type'])
+        if trailer and (trailer.startswith(f'plugin://{v.ADDON_ID}') or
+                        not refresh):
+            # No need to get a trailer
+            return
+        logger.debug('Processing trailer for %s %s', plex_type, plex_id)
+        xml = PF.GetPlexMetadata(plex_id)
+        try:
+            xml[0].attrib
+        except (TypeError, IndexError, AttributeError):
+            logger.warn('Could not get metadata for %s. Skipping that %s '
+                     'for now', plex_id, plex_type)
+            done = False
+            return
+        api = API(xml[0])
+        if (not api.guids or
+                not [x for x in api.guids if x in TMDB_SUPPORTED_IDS]):
+            logger.debug('No unique ids found for %s %s, cannot get a trailer',
+                         plex_type, api.title())
+            return
+        trailer = get_tmdb_details(api.guids)
+        trailer = trailer.get('info', {}).get('trailer')
+        if trailer:
+            with KodiVideoDB() as kodidb:
+                kodidb.set_trailer(db_item['kodi_id'],
+                                   db_item['kodi_type'],
+                                   trailer)
+            logger.debug('Found a new trailer for %s %s: %s',
+                         plex_type, api.title(), trailer)
+        else:
+            logger.debug('No trailer found for %s %s', plex_type, api.title())
+    finally:
+        if done is True:
+            with PlexDB() as plexdb:
+                plexdb.set_trailer_synced(plex_id, plex_type)
+
+
+def process_fanart(plex_id, plex_type, refresh=False):
+    """
+    Will look for additional fanart for the plex_type item with plex_id.
+    Will check if we already got all artwork and only look if some are indeed
+    missing.
+    Will set the fanart_synced flag in the Plex DB if successful.
+    """
+    done = True
+    try:
+        artworks = None
+        with PlexDB() as plexdb:
+            db_item = plexdb.item_by_id(plex_id, plex_type)
+        if not db_item:
+            logger.error('Could not get Kodi id for %s %s', plex_type, plex_id)
+            done = False
+            return
+        if not refresh:
+            with KodiVideoDB() as kodidb:
+                artworks = kodidb.get_art(db_item['kodi_id'],
+                                          db_item['kodi_type'])
+            # Check if we even need to get additional art
+            for key in v.ALL_KODI_ARTWORK:
+                if key not in artworks:
+                    break
+            else:
+                return
+        xml = PF.GetPlexMetadata(plex_id)
+        try:
+            xml[0].attrib
+        except (TypeError, IndexError, AttributeError):
+            logger.debug('Could not get metadata for %s %s. Skipping that '
+                         'item for now', plex_type, plex_id)
+            done = False
+            return
+        api = API(xml[0])
+        if artworks is None:
+            artworks = api.artwork()
+        # Get additional missing artwork from fanart artwork sites
+        artworks = api.fanart_artwork(artworks)
+        with itemtypes.ITEMTYPE_FROM_PLEXTYPE[plex_type](None) as context:
+            context.set_fanart(artworks,
+                               db_item['kodi_id'],
+                               db_item['kodi_type'])
+        # Additional fanart for sets/collections
+        if plex_type == v.PLEX_TYPE_MOVIE:
+            for _, setname in api.collections():
+                logger.debug('Getting artwork for movie set %s', setname)
+                with KodiVideoDB() as kodidb:
+                    setid = kodidb.create_collection(setname)
+                external_set_artwork = api.set_artwork()
+                if external_set_artwork and PREFER_KODI_COLLECTION_ART:
+                    kodi_artwork = api.artwork(kodi_id=setid,
+                                               kodi_type=v.KODI_TYPE_SET)
+                    for art in kodi_artwork:
+                        if art in external_set_artwork:
+                            del external_set_artwork[art]
+                with itemtypes.Movie(None) as movie:
+                    movie.kodidb.modify_artwork(external_set_artwork,
+                                                setid,
+                                                v.KODI_TYPE_SET)
+    finally:
+        if done is True:
+            with PlexDB() as plexdb:
+                plexdb.set_fanart_synced(plex_id, plex_type)
--- a/resources/lib/library_sync/common.py
+++ b/resources/lib/library_sync/common.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import xbmc

--- a/resources/lib/library_sync/fanart.py
+++ b/resources/lib/library_sync/fanart.py
@ -1,154 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-from logging import getLogger
-
-from ..plex_api import API
-from ..plex_db import PlexDB
-from ..kodi_db import KodiVideoDB
-from .. import backgroundthread, utils
-from .. import itemtypes, plex_functions as PF, variables as v, app
-
-
-LOG = getLogger('PLEX.sync.fanart')
-
-SUPPORTED_TYPES = (v.PLEX_TYPE_MOVIE, v.PLEX_TYPE_SHOW)
-SYNC_FANART = (utils.settings('FanartTV') == 'true' and
-               utils.settings('usePlexArtwork') == 'true')
-PREFER_KODI_COLLECTION_ART = utils.settings('PreferKodiCollectionArt') == 'false'
-BATCH_SIZE = 500
-
-
-class FanartThread(backgroundthread.KillableThread):
-    """
-    This will potentially take hours!
-    """
-    def __init__(self, callback, refresh=False):
-        self.callback = callback
-        self.refresh = refresh
-        super(FanartThread, self).__init__()
-
-    def should_suspend(self):
-        return self._suspended or app.APP.is_playing_video
-
-    def run(self):
-        LOG.info('Starting FanartThread')
-        app.APP.register_fanart_thread(self)
-        try:
-            self._run()
-        except Exception:
-            utils.ERROR(notify=True)
-        finally:
-            app.APP.deregister_fanart_thread(self)
-
-    def _loop(self):
-        for typus in SUPPORTED_TYPES:
-            offset = 0
-            while True:
-                with PlexDB() as plexdb:
-                    # Keep DB connection open only for a short period of time!
-                    if self.refresh:
-                        batch = list(plexdb.every_plex_id(typus,
-                                                          offset,
-                                                          BATCH_SIZE))
-                    else:
-                        batch = list(plexdb.missing_fanart(typus,
-                                                           offset,
-                                                           BATCH_SIZE))
-                for plex_id in batch:
-                    # Do the actual, time-consuming processing
-                    if self.should_suspend() or self.should_cancel():
-                        return False
-                    process_fanart(plex_id, typus, self.refresh)
-                if len(batch) < BATCH_SIZE:
-                    break
-                offset += BATCH_SIZE
-        return True
-
-    def _run(self):
-        finished = False
-        while not finished:
-            finished = self._loop()
-            if self.wait_while_suspended():
-                break
-        LOG.info('FanartThread finished: %s', finished)
-        self.callback(finished)
-
-
-class FanartTask(backgroundthread.Task):
-    """
-    This task will also be executed while library sync is suspended!
-    """
-    def setup(self, plex_id, plex_type, refresh=False):
-        self.plex_id = plex_id
-        self.plex_type = plex_type
-        self.refresh = refresh
-
-    def run(self):
-        process_fanart(self.plex_id, self.plex_type, self.refresh)
-
-
-def process_fanart(plex_id, plex_type, refresh=False):
-    """
-    Will look for additional fanart for the plex_type item with plex_id.
-    Will check if we already got all artwork and only look if some are indeed
-    missing.
-    Will set the fanart_synced flag in the Plex DB if successful.
-    """
-    done = False
-    try:
-        artworks = None
-        with PlexDB() as plexdb:
-            db_item = plexdb.item_by_id(plex_id,
-                                        plex_type)
-        if not db_item:
-            LOG.error('Could not get Kodi id for plex id %s', plex_id)
-            return
-        if not refresh:
-            with KodiVideoDB() as kodidb:
-                artworks = kodidb.get_art(db_item['kodi_id'],
-                                          db_item['kodi_type'])
-            # Check if we even need to get additional art
-            for key in v.ALL_KODI_ARTWORK:
-                if key not in artworks:
-                    break
-            else:
-                done = True
-                return
-        xml = PF.GetPlexMetadata(plex_id)
-        try:
-            xml[0].attrib
-        except (TypeError, IndexError, AttributeError):
-            LOG.warn('Could not get metadata for %s. Skipping that item '
-                     'for now', plex_id)
-            return
-        api = API(xml[0])
-        if artworks is None:
-            artworks = api.artwork()
-        # Get additional missing artwork from fanart artwork sites
-        artworks = api.fanart_artwork(artworks)
-        with itemtypes.ITEMTYPE_FROM_PLEXTYPE[plex_type](None) as context:
-            context.set_fanart(artworks,
-                               db_item['kodi_id'],
-                               db_item['kodi_type'])
-        # Additional fanart for sets/collections
-        if plex_type == v.PLEX_TYPE_MOVIE:
-            for _, setname in api.collections():
-                LOG.debug('Getting artwork for movie set %s', setname)
-                with KodiVideoDB() as kodidb:
-                    setid = kodidb.create_collection(setname)
-                external_set_artwork = api.set_artwork()
-                if external_set_artwork and PREFER_KODI_COLLECTION_ART:
-                    kodi_artwork = api.artwork(kodi_id=setid,
-                                               kodi_type=v.KODI_TYPE_SET)
-                    for art in kodi_artwork:
-                        if art in external_set_artwork:
-                            del external_set_artwork[art]
-                with itemtypes.Movie(None) as movie:
-                    movie.kodidb.modify_artwork(external_set_artwork,
-                                                setid,
-                                                v.KODI_TYPE_SET)
-        done = True
-    finally:
-        if done is True:
-            with PlexDB() as plexdb:
-                plexdb.set_fanart_synced(plex_id, plex_type)
--- a/resources/lib/library_sync/fill_metadata_queue.py
+++ b/resources/lib/library_sync/fill_metadata_queue.py
@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
-from Queue import Full
+from queue import Full

 from . import common, sections
 from ..plex_db import PlexDB
--- a/resources/lib/library_sync/full_sync.py
+++ b/resources/lib/library_sync/full_sync.py
@ -1,8 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
-import Queue
+import queue

 import xbmcgui

@ -80,7 +79,7 @@ class FullSync(common.LibrarySyncMixin, bg.KillableThread):
    @utils.log_time
    def process_new_and_changed_items(self, section_queue, processing_queue):
        LOG.debug('Start working')
-        get_metadata_queue = Queue.Queue(maxsize=BACKLOG_QUEUE_SIZE)
+        get_metadata_queue = queue.Queue(maxsize=BACKLOG_QUEUE_SIZE)
        scanner_thread = FillMetadataQueue(self.repair,
                                           section_queue,
                                           get_metadata_queue,
@ -193,7 +192,7 @@ class FullSync(common.LibrarySyncMixin, bg.KillableThread):
            LOG.debug('Exiting threaded_get_generators')

    def full_library_sync(self):
-        section_queue = Queue.Queue()
+        section_queue = queue.Queue()
        processing_queue = bg.ProcessingQueue(maxsize=XML_QUEUE_SIZE)
        kinds = [
            (v.PLEX_TYPE_MOVIE, v.PLEX_TYPE_MOVIE),
--- a/resources/lib/library_sync/get_metadata.py
+++ b/resources/lib/library_sync/get_metadata.py
@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from . import common
--- a/resources/lib/library_sync/nodes.py
+++ b/resources/lib/library_sync/nodes.py
@ -1,10 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-import urllib
+import urllib.request, urllib.parse, urllib.error
 import copy

-from ..utils import etree
+import xml.etree.ElementTree as etree
 from .. import variables as v, utils

 ICON_PATH = 'special://home/addons/plugin.video.plexkodiconnect/icon.png'
@ -56,7 +55,7 @@ NODE_TYPES = {
         {
              'mode': 'browseplex',
              'key': ('/library/sections/{self.section_id}&%s'
-                      % urllib.urlencode({'sort': 'rating:desc'})),
+                      % urllib.parse.urlencode({'sort': 'rating:desc'})),
              'section_id': '{self.section_id}'
         },
         v.CONTENT_TYPE_MOVIE,
@ -84,7 +83,7 @@ NODE_TYPES = {
         {
              'mode': 'browseplex',
              'key': ('/library/sections/{self.section_id}&%s'
-                      % urllib.urlencode({'sort': 'random'})),
+                      % urllib.parse.urlencode({'sort': 'random'})),
              'section_id': '{self.section_id}'
         },
         v.CONTENT_TYPE_MOVIE,
@ -154,7 +153,7 @@ NODE_TYPES = {
         {
              'mode': 'browseplex',
              'key': ('/library/sections/{self.section_id}&%s'
-                      % urllib.urlencode({'sort': 'rating:desc'})),
+                      % urllib.parse.urlencode({'sort': 'rating:desc'})),
              'section_id': '{self.section_id}'
         },
         v.CONTENT_TYPE_SHOW,
@ -182,7 +181,7 @@ NODE_TYPES = {
         {
              'mode': 'browseplex',
              'key': ('/library/sections/{self.section_id}&%s'
-                      % urllib.urlencode({'sort': 'random'})),
+                      % urllib.parse.urlencode({'sort': 'random'})),
              'section_id': '{self.section_id}'
         },
         v.CONTENT_TYPE_SHOW,
@ -192,7 +191,7 @@ NODE_TYPES = {
         {
              'mode': 'browseplex',
              'key': ('/library/sections/{self.section_id}/recentlyViewed&%s'
-                      % urllib.urlencode({'type': v.PLEX_TYPE_NUMBER_FROM_PLEX_TYPE[v.PLEX_TYPE_EPISODE]})),
+                      % urllib.parse.urlencode({'type': v.PLEX_TYPE_NUMBER_FROM_PLEX_TYPE[v.PLEX_TYPE_EPISODE]})),
              'section_id': '{self.section_id}'
         },
         v.CONTENT_TYPE_EPISODE,
@ -236,7 +235,7 @@ def node_pms(section, node_name, args):
    else:
        folder = False
    xml = etree.Element('node',
-                        attrib={'order': unicode(section.order),
+                        attrib={'order': str(section.order),
                                'type': 'folder' if folder else 'filter'})
    etree.SubElement(xml, 'label').text = node_name
    etree.SubElement(xml, 'icon').text = ICON_PATH
@ -249,7 +248,7 @@ def node_ondeck(section, node_name):
    """
    For movies only - returns in-progress movies sorted by last played
    """
-    xml = etree.Element('node', attrib={'order': unicode(section.order),
+    xml = etree.Element('node', attrib={'order': str(section.order),
                                        'type': 'filter'})
    etree.SubElement(xml, 'match').text = 'all'
    rule = etree.SubElement(xml, 'rule', attrib={'field': 'tag',
@ -270,7 +269,7 @@ def node_ondeck(section, node_name):

 def node_recent(section, node_name):
    xml = etree.Element('node',
-                        attrib={'order': unicode(section.order),
+                        attrib={'order': str(section.order),
                                'type': 'filter'})
    etree.SubElement(xml, 'match').text = 'all'
    rule = etree.SubElement(xml, 'rule', attrib={'field': 'tag',
@ -299,7 +298,7 @@ def node_recent(section, node_name):


 def node_all(section, node_name):
-    xml = etree.Element('node', attrib={'order': unicode(section.order),
+    xml = etree.Element('node', attrib={'order': str(section.order),
                                        'type': 'filter'})
    etree.SubElement(xml, 'match').text = 'all'
    rule = etree.SubElement(xml, 'rule', attrib={'field': 'tag',
@ -316,7 +315,7 @@ def node_all(section, node_name):


 def node_recommended(section, node_name):
-    xml = etree.Element('node', attrib={'order': unicode(section.order),
+    xml = etree.Element('node', attrib={'order': str(section.order),
                                        'type': 'filter'})
    etree.SubElement(xml, 'match').text = 'all'
    rule = etree.SubElement(xml, 'rule', attrib={'field': 'tag',
@ -337,7 +336,7 @@ def node_recommended(section, node_name):


 def node_genres(section, node_name):
-    xml = etree.Element('node', attrib={'order': unicode(section.order),
+    xml = etree.Element('node', attrib={'order': str(section.order),
                                        'type': 'filter'})
    etree.SubElement(xml, 'match').text = 'all'
    rule = etree.SubElement(xml, 'rule', attrib={'field': 'tag',
@ -355,7 +354,7 @@ def node_genres(section, node_name):


 def node_sets(section, node_name):
-    xml = etree.Element('node', attrib={'order': unicode(section.order),
+    xml = etree.Element('node', attrib={'order': str(section.order),
                                        'type': 'filter'})
    etree.SubElement(xml, 'match').text = 'all'
    rule = etree.SubElement(xml, 'rule', attrib={'field': 'tag',
@ -374,7 +373,7 @@ def node_sets(section, node_name):


 def node_random(section, node_name):
-    xml = etree.Element('node', attrib={'order': unicode(section.order),
+    xml = etree.Element('node', attrib={'order': str(section.order),
                                        'type': 'filter'})
    etree.SubElement(xml, 'match').text = 'all'
    rule = etree.SubElement(xml, 'rule', attrib={'field': 'tag',
@ -392,7 +391,7 @@ def node_random(section, node_name):


 def node_lastplayed(section, node_name):
-    xml = etree.Element('node', attrib={'order': unicode(section.order),
+    xml = etree.Element('node', attrib={'order': str(section.order),
                                        'type': 'filter'})
    etree.SubElement(xml, 'match').text = 'all'
    rule = etree.SubElement(xml, 'rule', attrib={'field': 'tag',
--- a/resources/lib/library_sync/process_metadata.py
+++ b/resources/lib/library_sync/process_metadata.py
@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from . import common, sections
--- a/resources/lib/library_sync/sections.py
+++ b/resources/lib/library_sync/sections.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import copy

@ -10,7 +9,7 @@ from ..plex_api import API
 from .. import kodi_db
 from .. import itemtypes, path_ops
 from .. import plex_functions as PF, music, utils, variables as v, app
-from ..utils import etree
+import xml.etree.ElementTree as etree

 LOG = getLogger('PLEX.sync.sections')

@ -21,10 +20,10 @@ SHOULD_CANCEL = None
 LIBRARY_PATH = path_ops.translate_path('special://profile/library/video/')
 # The video library might not yet exist for this user - create it
 if not path_ops.exists(LIBRARY_PATH):
-    path_ops.copy_tree(
+    path_ops.copytree(
        src=path_ops.translate_path('special://xbmc/system/library/video'),
        dst=LIBRARY_PATH,
-        preserve_mode=0)  # dont copy permission bits so we have write access!
+        copy_function=path_ops.shutil.copyfile)
 PLAYLISTS_PATH = path_ops.translate_path("special://profile/playlists/video/")
 if not path_ops.exists(PLAYLISTS_PATH):
    path_ops.makedirs(PLAYLISTS_PATH)
@ -96,18 +95,16 @@ class Section(object):
                "'plex_type': '{self.plex_type}', "
                "'sync_to_kodi': {self.sync_to_kodi}, "
                "'last_sync': {self.last_sync}"
-                "}}").format(self=self).encode('utf-8')
-    __str__ = __repr__
+                "}}").format(self=self)

-    def __nonzero__(self):
+    def __bool__(self):
+        """bool(Section) returns True if section_id, name and section_type are set."""
        return (self.section_id is not None and
                self.name is not None and
                self.section_type is not None)

    def __eq__(self, section):
-        """
-        Sections compare equal if their section_id, name and plex_type (first
-        prio) OR section_type (if there is no plex_type is set) compare equal
+        """Sections compare equal if their section_id, name and plex_type (first prio) OR section_type (if there is no plex_type is set) compare equal.
        """
        if not isinstance(section, Section):
            return False
@ -239,7 +236,7 @@ class Section(object):
            {key: '{self.<Section attribute>}'}
        """
        args = copy.deepcopy(args)
-        for key, value in args.iteritems():
+        for key, value in args.items():
            args[key] = value.format(self=self)
        return utils.extend_url('plugin://%s' % v.ADDON_ID, args)

@ -268,7 +265,7 @@ class Section(object):
            args = {
                'mode': 'browseplex',
                'key': '/library/sections/%s' % self.section_id,
-                'section_id': unicode(self.section_id)
+                'section_id': str(self.section_id)
            }
            if not self.sync_to_kodi:
                args['synched'] = 'false'
@ -279,7 +276,7 @@ class Section(object):
            args = {
                'mode': 'browseplex',
                'key': '/library/sections/%s/all' % self.section_id,
-                'section_id': unicode(self.section_id)
+                'section_id': str(self.section_id)
            }
            if not self.sync_to_kodi:
                args['synched'] = 'false'
@ -321,7 +318,7 @@ class Section(object):
        if not path_ops.exists(path_ops.path.join(self.path, 'index.xml')):
            LOG.debug('Creating index.xml for section %s', self.name)
            xml = etree.Element('node',
-                                attrib={'order': unicode(self.order)})
+                                attrib={'order': str(self.order)})
            etree.SubElement(xml, 'label').text = self.name
            etree.SubElement(xml, 'icon').text = self.icon or nodes.ICON_PATH
            self._write_xml(xml, 'index.xml')
@ -714,7 +711,7 @@ def _clear_window_vars(index):
    utils.window('%s.path' % node, clear=True)
    utils.window('%s.id' % node, clear=True)
    # Just clear everything here, ignore the plex_type
-    for typus in (x[0] for y in nodes.NODE_TYPES.values() for x in y):
+    for typus in (x[0] for y in list(nodes.NODE_TYPES.values()) for x in y):
        for kind in WINDOW_ARGS:
            node = 'Plex.nodes.%s.%s.%s' % (index, typus, kind)
            utils.window(node, clear=True)
--- a/resources/lib/library_sync/websocket.py
+++ b/resources/lib/library_sync/websocket.py
@ -1,10 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from .common import update_kodi_library, PLAYLIST_SYNC_ENABLED
-from .fanart import SYNC_FANART, FanartTask
+from .additional_metadata import ProcessMetadataTask
 from ..plex_api import API
 from ..plex_db import PlexDB
 from .. import kodi_db
@ -85,9 +84,8 @@ def process_websocket_messages():
            continue
        else:
            successful, video, music = process_new_item_message(message)
-            if (successful and SYNC_FANART and
-                    message['plex_type'] in (v.PLEX_TYPE_MOVIE, v.PLEX_TYPE_SHOW)):
-                task = FanartTask()
+            if successful:
+                task = ProcessMetadataTask()
                task.setup(message['plex_id'],
                           message['plex_type'],
                           refresh=False)
@ -160,7 +158,7 @@ def store_timeline_message(data):
            continue
        status = int(message['state'])
        if typus == 'playlist' and PLAYLIST_SYNC_ENABLED:
-            playlists.websocket(plex_id=unicode(message['itemID']),
+            playlists.websocket(plex_id=str(message['itemID']),
                                status=status)
        elif status == 9:
            # Immediately and always process deletions (as the PMS will
--- a/resources/lib/loghandler.py
+++ b/resources/lib/loghandler.py
@ -1,34 +1,17 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 import logging
 import xbmc
 ###############################################################################
 LEVELS = {
    logging.ERROR: xbmc.LOGERROR,
    logging.WARNING: xbmc.LOGWARNING,
-    logging.INFO: xbmc.LOGNOTICE,
+    logging.INFO: xbmc.LOGINFO,
    logging.DEBUG: xbmc.LOGDEBUG
 }
 ###############################################################################


-def try_encode(uniString, encoding='utf-8'):
-    """
-    Will try to encode uniString (in unicode) to encoding. This possibly
-    fails with e.g. Android TV's Python, which does not accept arguments for
-    string.encode()
-    """
-    if isinstance(uniString, str):
-        # already encoded
-        return uniString
-    try:
-        uniString = uniString.encode(encoding, "ignore")
-    except TypeError:
-        uniString = uniString.encode()
-    return uniString
-
-
 def config():
    logger = logging.getLogger('PLEX')
    logger.addHandler(LogHandler())
@ -38,13 +21,7 @@ def config():
 class LogHandler(logging.StreamHandler):
    def __init__(self):
        logging.StreamHandler.__init__(self)
-        self.setFormatter(logging.Formatter(fmt=b"%(name)s: %(message)s"))
+        self.setFormatter(logging.Formatter(fmt='%(name)s: %(message)s'))

    def emit(self, record):
-        if isinstance(record.msg, unicode):
-            record.msg = record.msg.encode('utf-8')
-        try:
-            xbmc.log(self.format(record), level=LEVELS[record.levelno])
-        except UnicodeEncodeError:
-            xbmc.log(try_encode(self.format(record)),
-                     level=LEVELS[record.levelno])
+        xbmc.log(self.format(record), level=LEVELS[record.levelno])
--- a/resources/lib/migration.py
+++ b/resources/lib/migration.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from . import variables as v
@ -23,80 +22,13 @@ def check_migration():
        LOG.info('Already migrated to PKC version %s' % v.ADDON_VERSION)
        return

-    if not utils.compare_version(last_migration, '1.8.2'):
-        LOG.info('Migrating to version 1.8.1')
-        # Set the new PKC theMovieDB key
-        utils.settings('themoviedbAPIKey',
-                       value='19c90103adb9e98f2172c6a6a3d85dc4')
-
-    if not utils.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
-        utils.settings('ipaddress', value='')
-        utils.settings('port', value='')
-
-    if not utils.compare_version(last_migration, '2.7.6'):
-        LOG.info('Migrating to version 2.7.5')
-        from .library_sync.sections import delete_files
-        delete_files()
-
-    if not utils.compare_version(last_migration, '2.8.3'):
-        LOG.info('Migrating to version 2.8.2')
-        from .library_sync import sections
-        sections.clear_window_vars()
-        sections.delete_videonode_files()
-
-    if not utils.compare_version(last_migration, '2.8.7'):
-        LOG.info('Migrating to version 2.8.6')
-        # Need to delete the UNIQUE index that prevents creating several
-        # playlist entries with the same kodi_hash
+    if not utils.compare_version(last_migration, '3.0.4'):
+        LOG.info('Migrating to version 3.0.4')
+        # Add an additional column `trailer_synced` in the Plex movie table
        from .plex_db import PlexDB
        with PlexDB() as plexdb:
-            plexdb.cursor.execute('DROP INDEX IF EXISTS ix_playlists_3')
+            query = 'ALTER TABLE movie ADD trailer_synced BOOLEAN'
+            plexdb.cursor.execute(query)
            # Index will be automatically recreated on next PKC startup

-    if not utils.compare_version(last_migration, '2.8.9'):
-        LOG.info('Migrating to version 2.8.8')
-        from .library_sync import sections
-        sections.clear_window_vars()
-        sections.delete_videonode_files()
-
-    if not utils.compare_version(last_migration, '2.9.3'):
-        LOG.info('Migrating to version 2.9.2')
-        # Re-sync all playlists to Kodi
-        from .playlists import remove_synced_playlists
-        remove_synced_playlists()
-
-    if not utils.compare_version(last_migration, '2.9.7'):
-        LOG.info('Migrating to version 2.9.6')
-        # Allow for a new "Direct Stream" setting (number 2), so shift the
-        # last setting for "force transcoding"
-        current_playback_type = utils.cast(int, utils.settings('playType')) or 0
-        if current_playback_type == 2:
-            current_playback_type = 3
-        utils.settings('playType', value=str(current_playback_type))
-
-    if not utils.compare_version(last_migration, '2.9.8'):
-        LOG.info('Migrating to version 2.9.7')
-        # Force-scan every single item in the library - seems like we could
-        # loose some recently added items otherwise
-        # Caused by 65a921c3cc2068c4a34990d07289e2958f515156
-        from . import library_sync
-        library_sync.force_full_sync()
-
-    if not utils.compare_version(last_migration, '2.11.3'):
-        LOG.info('Migrating to version 2.11.2')
-        # Re-sync all playlists to Kodi
-        from .playlists import remove_synced_playlists
-        remove_synced_playlists()
-
-    if not utils.compare_version(last_migration, '2.12.2'):
-        LOG.info('Migrating to version 2.12.1')
-        # Sign user out to make sure he needs to sign in again
-        utils.settings('username', value='')
-        utils.settings('userid', value='')
-        utils.settings('plex_restricteduser', value='')
-        utils.settings('accessToken', value='')
-        utils.settings('plexAvatar', value='')
-
    utils.settings('last_migrated_PKC_version', value=v.ADDON_VERSION)
--- a/resources/lib/music.py
+++ b/resources/lib/music.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import re

--- a/resources/lib/path_ops.py
+++ b/resources/lib/path_ops.py
@ -14,41 +14,25 @@ WARNING: os.path won't really work with smb paths (possibly others). For
 xbmcvfs functions to work with smb paths, they need to be both in passwords.xml
 as well as sources.xml
 """
-from __future__ import absolute_import, division, unicode_literals
 import shutil
 import os
 from os import path  # allows to use path_ops.path.join, for example
-from distutils import dir_util
 import re

-import xbmc
 import xbmcvfs

-from .tools import unicode_paths
-
 # Kodi seems to encode in utf-8 in ALL cases (unlike e.g. the OS filesystem)
 KODI_ENCODING = 'utf-8'
 REGEX_FILE_NUMBERING = re.compile(r'''_(\d\d)\.\w+$''')


-def encode_path(path):
+def append_os_sep(path):
    """
-    Filenames and paths are not necessarily utf-8 encoded. Use this function
-    instead of try_encode/trydecode if working with filenames and paths!
-    (os.walk only feeds on encoded paths. sys.getfilesystemencoding returns None
-    for Raspberry Pi)
+    Appends either a '\\' or '/' - IRRELEVANT of the host OS!! (os.path.join is
+    dependant on the host OS)
    """
-    return unicode_paths.encode(path)
-
-
-def decode_path(path):
-    """
-    Filenames and paths are not necessarily utf-8 encoded. Use this function
-    instead of try_encode/trydecode if working with filenames and paths!
-    (os.walk only feeds on encoded paths. sys.getfilesystemencoding returns None
-    for Raspberry Pi)
-    """
-    return unicode_paths.decode(path)
+    separator = '/' if '/' in path else '\\'
+    return path if path.endswith(separator) else path + separator


 def translate_path(path):
@ -57,8 +41,7 @@ def translate_path(path):
    e.g. Converts 'special://masterprofile/script_data'
    -> '/home/user/XBMC/UserData/script_data' on Linux.
    """
-    translated = xbmc.translatePath(path.encode(KODI_ENCODING, 'strict'))
-    return translated.decode(KODI_ENCODING, 'strict')
+    return xbmcvfs.translatePath(path)


 def exists(path):
@ -66,7 +49,7 @@ def exists(path):
    Returns True if the path [unicode] exists. Folders NEED a trailing slash or
    backslash!!
    """
-    return xbmcvfs.exists(path.encode(KODI_ENCODING, 'strict')) == 1
+    return xbmcvfs.exists(path) == 1


 def rmtree(path, *args, **kwargs):
@ -80,12 +63,12 @@ def rmtree(path, *args, **kwargs):
    is false and onerror is None, an exception is raised.

    """
-    return shutil.rmtree(encode_path(path), *args, **kwargs)
+    return shutil.rmtree(path, *args, **kwargs)


 def copyfile(src, dst):
    """Copy data from src to dst"""
-    return shutil.copyfile(encode_path(src), encode_path(dst))
+    return shutil.copyfile(src, dst)


 def makedirs(path, *args, **kwargs):
@ -95,7 +78,7 @@ def makedirs(path, *args, **kwargs):
    mkdir, except that any intermediate path segment (not just the rightmost)
    will be created if it does not exist.  This is recursive.
    """
-    return os.makedirs(encode_path(path), *args, **kwargs)
+    return os.makedirs(path, *args, **kwargs)


 def remove(path):
@ -107,7 +90,7 @@ def remove(path):
    removed but the storage allocated to the file is not made available until
    the original file is no longer in use.
    """
-    return os.remove(encode_path(path))
+    return os.remove(path)


 def walk(top, topdown=True, onerror=None, followlinks=False):
@ -170,40 +153,57 @@ def walk(top, topdown=True, onerror=None, followlinks=False):

    """
    # Get all the results from os.walk and store them in a list
-    walker = list(os.walk(encode_path(top),
+    walker = list(os.walk(top,
                          topdown,
                          onerror,
                          followlinks))
    for top, dirs, nondirs in walker:
-        yield (decode_path(top),
-               [decode_path(x) for x in dirs],
-               [decode_path(x) for x in nondirs])
+        yield (top,
+               [x for x in dirs],
+               [x for x in nondirs])


-def copy_tree(src, dst, *args, **kwargs):
+def copytree(src, dst, *args, **kwargs):
    """
-    Copy an entire directory tree 'src' to a new location 'dst'.
+    Recursively copy an entire directory tree rooted at src to a directory named
+    dst and return the destination directory. dirs_exist_ok dictates whether to
+    raise an exception in case dst or any missing parent directory already
+    exists.

-    Both 'src' and 'dst' must be directory names.  If 'src' is not a
-    directory, raise DistutilsFileError.  If 'dst' does not exist, it is
-    created with 'mkpath()'.  The end result of the copy is that every
-    file in 'src' is copied to 'dst', and directories under 'src' are
-    recursively copied to 'dst'.  Return the list of files that were
-    copied or might have been copied, using their output name.  The
-    return value is unaffected by 'update' or 'dry_run': it is simply
-    the list of all files under 'src', with the names changed to be
-    under 'dst'.
+    Permissions and times of directories are copied with copystat(), individual
+    files are copied using copy2().

-    'preserve_mode' and 'preserve_times' are the same as for
-    'copy_file'; note that they only apply to regular files, not to
-    directories.  If 'preserve_symlinks' is true, symlinks will be
-    copied as symlinks (on platforms that support them!); otherwise
-    (the default), the destination of the symlink will be copied.
-    'update' and 'verbose' are the same as for 'copy_file'.
+    If symlinks is true, symbolic links in the source tree are represented as
+    symbolic links in the new tree and the metadata of the original links will
+    be copied as far as the platform allows; if false or omitted, the contents
+    and metadata of the linked files are copied to the new tree.
+
+    When symlinks is false, if the file pointed by the symlink doesn’t exist, an
+    exception will be added in the list of errors raised in an Error exception
+    at the end of the copy process. You can set the optional
+    ignore_dangling_symlinks flag to true if you want to silence this exception.
+    Notice that this option has no effect on platforms that don’t support
+    os.symlink().
+
+    If ignore is given, it must be a callable that will receive as its arguments
+    the directory being visited by copytree(), and a list of its contents, as
+    returned by os.listdir(). Since copytree() is called recursively, the ignore
+    callable will be called once for each directory that is copied. The callable
+    must return a sequence of directory and file names relative to the current
+    directory (i.e. a subset of the items in its second argument); these names
+    will then be ignored in the copy process. ignore_patterns() can be used to
+    create such a callable that ignores names based on glob-style patterns.
+
+    If exception(s) occur, an Error is raised with a list of reasons.
+
+    If copy_function is given, it must be a callable that will be used to copy
+    each file. It will be called with the source path and the destination path
+    as arguments. By default, copy2() is used, but any function that supports
+    the same signature (like copy()) can be used.
+
+    Raises an auditing event shutil.copytree with arguments src, dst.
    """
-    src = encode_path(src)
-    dst = encode_path(dst)
-    return dir_util.copy_tree(src, dst, *args, **kwargs)
+    return shutil.copytree(src, dst, *args, **kwargs)


 def basename(path):
--- a/resources/lib/pathtools/path.py
+++ b/resources/lib/pathtools/path.py
@ -38,7 +38,6 @@ Functions
 .. autofunction:: real_absolute_path
 .. autofunction:: parent_dir_path
 """
-
 import os.path
 from functools import partial

@ -72,7 +71,7 @@ def get_dir_walker(recursive, topdown=True, followlinks=False):
            try:
                yield next(os.walk(path, topdown=topdown, followlinks=followlinks))
            except NameError:
-                yield os.walk(path, topdown=topdown, followlinks=followlinks).next() #IGNORE:E1101
+                yield next(os.walk(path, topdown=topdown, followlinks=followlinks)) #IGNORE:E1101
    return walk


--- a/resources/lib/pathtools/patterns.py
+++ b/resources/lib/pathtools/patterns.py
@ -33,7 +33,6 @@ Functions
 .. autofunction:: match_path_against
 .. autofunction:: filter_paths
 """
-
 from fnmatch import fnmatch, fnmatchcase

 __all__ = ['match_path',
--- a/resources/lib/pathvalidate/init.py
+++ b/resources/lib/pathvalidate/init.py
@ -0,0 +1,35 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+from .__version__ import __author__, __copyright__, __email__, __license__, __version__
+from ._common import (
+    Platform,
+    ascii_symbols,
+    normalize_platform,
+    replace_unprintable_char,
+    unprintable_ascii_chars,
+    validate_null_string,
+    validate_pathtype,
+)
+from ._filename import FileNameSanitizer, is_valid_filename, sanitize_filename, validate_filename
+from ._filepath import (
+    FilePathSanitizer,
+    is_valid_filepath,
+    sanitize_file_path,
+    sanitize_filepath,
+    validate_file_path,
+    validate_filepath,
+)
+from ._ltsv import sanitize_ltsv_label, validate_ltsv_label
+from ._symbol import replace_symbol, validate_symbol
+from .error import (
+    ErrorReason,
+    InvalidCharError,
+    InvalidLengthError,
+    InvalidReservedNameError,
+    NullNameError,
+    ReservedNameError,
+    ValidationError,
+    ValidReservedNameError,
+)
--- a/resources/lib/pathvalidate/version.py
+++ b/resources/lib/pathvalidate/version.py
@ -0,0 +1,6 @@
+__author__ = "Tsuyoshi Hombashi"
+__copyright__ = "Copyright 2016, {}".format(__author__)
+__license__ = "MIT License"
+__version__ = "2.4.1"
+__maintainer__ = __author__
+__email__ = "tsuyoshi.hombashi@gmail.com"
--- a/resources/lib/pathvalidate/_base.py
+++ b/resources/lib/pathvalidate/_base.py
@ -0,0 +1,137 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+import abc
+import os
+from typing import Optional, Tuple, cast
+
+from ._common import PathType, Platform, PlatformType, normalize_platform, unprintable_ascii_chars
+from .error import ReservedNameError, ValidationError
+
+
+class BaseFile:
+    _INVALID_PATH_CHARS = "".join(unprintable_ascii_chars)
+    _INVALID_FILENAME_CHARS = _INVALID_PATH_CHARS + "/"
+    _INVALID_WIN_PATH_CHARS = _INVALID_PATH_CHARS + ':*?"<>|\t\n\r\x0b\x0c'
+    _INVALID_WIN_FILENAME_CHARS = _INVALID_FILENAME_CHARS + _INVALID_WIN_PATH_CHARS + "\\"
+
+    _ERROR_MSG_TEMPLATE = "invalid char found: invalids=({invalid}), value={value}"
+
+    @property
+    def platform(self) -> Platform:
+        return self.__platform
+
+    @property
+    def reserved_keywords(self) -> Tuple[str, ...]:
+        return tuple()
+
+    @property
+    def min_len(self) -> int:
+        return self._min_len
+
+    @property
+    def max_len(self) -> int:
+        return self._max_len
+
+    def __init__(
+        self,
+        min_len: Optional[int],
+        max_len: Optional[int],
+        check_reserved: bool,
+        platform_max_len: Optional[int] = None,
+        platform: PlatformType = None,
+    ) -> None:
+        self.__platform = normalize_platform(platform)
+        self._check_reserved = check_reserved
+
+        if min_len is None:
+            min_len = 1
+        self._min_len = max(min_len, 1)
+
+        if platform_max_len is None:
+            platform_max_len = self._get_default_max_path_len()
+
+        if max_len in [None, -1]:
+            self._max_len = platform_max_len
+        else:
+            self._max_len = cast(int, max_len)
+
+        self._max_len = min(self._max_len, platform_max_len)
+        self._validate_max_len()
+
+    def _is_posix(self) -> bool:
+        return self.platform == Platform.POSIX
+
+    def _is_universal(self) -> bool:
+        return self.platform == Platform.UNIVERSAL
+
+    def _is_linux(self) -> bool:
+        return self.platform == Platform.LINUX
+
+    def _is_windows(self) -> bool:
+        return self.platform == Platform.WINDOWS
+
+    def _is_macos(self) -> bool:
+        return self.platform == Platform.MACOS
+
+    def _validate_max_len(self) -> None:
+        if self.max_len < 1:
+            raise ValueError("max_len must be greater or equals to one")
+
+        if self.min_len > self.max_len:
+            raise ValueError("min_len must be lower than max_len")
+
+    def _get_default_max_path_len(self) -> int:
+        if self._is_linux():
+            return 4096
+
+        if self._is_windows():
+            return 260
+
+        if self._is_posix() or self._is_macos():
+            return 1024
+
+        return 260  # universal
+
+
+class AbstractValidator(BaseFile, metaclass=abc.ABCMeta):
+    @abc.abstractmethod
+    def validate(self, value: PathType) -> None:  # pragma: no cover
+        pass
+
+    def is_valid(self, value: PathType) -> bool:
+        try:
+            self.validate(value)
+        except (TypeError, ValidationError):
+            return False
+
+        return True
+
+    def _is_reserved_keyword(self, value: str) -> bool:
+        return value in self.reserved_keywords
+
+
+class AbstractSanitizer(BaseFile, metaclass=abc.ABCMeta):
+    @abc.abstractmethod
+    def sanitize(self, value: PathType, replacement_text: str = "") -> PathType:  # pragma: no cover
+        pass
+
+
+class BaseValidator(AbstractValidator):
+    def _validate_reserved_keywords(self, name: str) -> None:
+        if not self._check_reserved:
+            return
+
+        root_name = self.__extract_root_name(name)
+        if self._is_reserved_keyword(root_name.upper()):
+            raise ReservedNameError(
+                "'{}' is a reserved name".format(root_name),
+                reusable_name=False,
+                reserved_name=root_name,
+                platform=self.platform,
+            )
+
+    @staticmethod
+    def __extract_root_name(path: str) -> str:
+        return os.path.splitext(os.path.basename(path))[0]
--- a/resources/lib/pathvalidate/_common.py
+++ b/resources/lib/pathvalidate/_common.py
@ -0,0 +1,147 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+import enum
+import platform
+import re
+import string
+from pathlib import Path
+from typing import Any, List, Optional, Union, cast
+
+
+_re_whitespaces = re.compile(r"^[\s]+$")
+
+
+@enum.unique
+class Platform(enum.Enum):
+    POSIX = "POSIX"
+    UNIVERSAL = "universal"
+
+    LINUX = "Linux"
+    WINDOWS = "Windows"
+    MACOS = "macOS"
+
+
+PathType = Union[str, Path]
+PlatformType = Union[str, Platform, None]
+
+
+def is_pathlike_obj(value: PathType) -> bool:
+    return isinstance(value, Path)
+
+
+def validate_pathtype(
+    text: PathType, allow_whitespaces: bool = False, error_msg: Optional[str] = None
+) -> None:
+    from .error import ErrorReason, ValidationError
+
+    if _is_not_null_string(text) or is_pathlike_obj(text):
+        return
+
+    if allow_whitespaces and _re_whitespaces.search(str(text)):
+        return
+
+    if is_null_string(text):
+        if not error_msg:
+            error_msg = "the value must be a not empty"
+
+        raise ValidationError(
+            description=error_msg,
+            reason=ErrorReason.NULL_NAME,
+        )
+
+    raise TypeError("text must be a string: actual={}".format(type(text)))
+
+
+def validate_null_string(text: PathType, error_msg: Optional[str] = None) -> None:
+    # Deprecated: alias to validate_pathtype
+    validate_pathtype(text, False, error_msg)
+
+
+def preprocess(name: PathType) -> str:
+    if is_pathlike_obj(name):
+        name = str(name)
+
+    return cast(str, name)
+
+
+def is_null_string(value: Any) -> bool:
+    if value is None:
+        return True
+
+    try:
+        return len(value.strip()) == 0
+    except AttributeError:
+        return False
+
+
+def _is_not_null_string(value: Any) -> bool:
+    try:
+        return len(value.strip()) > 0
+    except AttributeError:
+        return False
+
+
+def _get_unprintable_ascii_chars() -> List[str]:
+    return [chr(c) for c in range(128) if chr(c) not in string.printable]
+
+
+unprintable_ascii_chars = tuple(_get_unprintable_ascii_chars())
+
+
+def _get_ascii_symbols() -> List[str]:
+    symbol_list = []  # type: List[str]
+
+    for i in range(128):
+        c = chr(i)
+
+        if c in unprintable_ascii_chars or c in string.digits + string.ascii_letters:
+            continue
+
+        symbol_list.append(c)
+
+    return symbol_list
+
+
+ascii_symbols = tuple(_get_ascii_symbols())
+
+__RE_UNPRINTABLE_CHARS = re.compile(
+    "[{}]".format(re.escape("".join(unprintable_ascii_chars))), re.UNICODE
+)
+
+
+def replace_unprintable_char(text: str, replacement_text: str = "") -> str:
+    try:
+        return __RE_UNPRINTABLE_CHARS.sub(replacement_text, text)
+    except (TypeError, AttributeError):
+        raise TypeError("text must be a string")
+
+
+def normalize_platform(name: PlatformType) -> Platform:
+    if isinstance(name, Platform):
+        return name
+
+    if name:
+        name = name.strip().lower()
+
+    if name == "posix":
+        return Platform.POSIX
+
+    if name == "auto":
+        name = platform.system().lower()
+
+    if name in ["linux"]:
+        return Platform.LINUX
+
+    if name and name.startswith("win"):
+        return Platform.WINDOWS
+
+    if name in ["mac", "macos", "darwin"]:
+        return Platform.MACOS
+
+    return Platform.UNIVERSAL
+
+
+def findall_to_str(match: List[Any]) -> str:
+    return ", ".join([repr(text) for text in match])
--- a/resources/lib/pathvalidate/_const.py
+++ b/resources/lib/pathvalidate/_const.py
@ -0,0 +1,16 @@
+_NTFS_RESERVED_FILE_NAMES = (
+    "$Mft",
+    "$MftMirr",
+    "$LogFile",
+    "$Volume",
+    "$AttrDef",
+    "$Bitmap",
+    "$Boot",
+    "$BadClus",
+    "$Secure",
+    "$Upcase",
+    "$Extend",
+    "$Quota",
+    "$ObjId",
+    "$Reparse",
+)  # Only in root directory
--- a/resources/lib/pathvalidate/_filename.py
+++ b/resources/lib/pathvalidate/_filename.py
@ -0,0 +1,341 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+import itertools
+import ntpath
+import posixpath
+import re
+from pathlib import Path
+from typing import Optional, Pattern, Tuple
+
+from ._base import AbstractSanitizer, BaseFile, BaseValidator
+from ._common import (
+    PathType,
+    Platform,
+    PlatformType,
+    findall_to_str,
+    is_pathlike_obj,
+    preprocess,
+    validate_pathtype,
+)
+from .error import ErrorReason, InvalidCharError, InvalidLengthError, ValidationError
+
+
+_DEFAULT_MAX_FILENAME_LEN = 255
+_RE_INVALID_FILENAME = re.compile(
+    "[{:s}]".format(re.escape(BaseFile._INVALID_FILENAME_CHARS)), re.UNICODE
+)
+_RE_INVALID_WIN_FILENAME = re.compile(
+    "[{:s}]".format(re.escape(BaseFile._INVALID_WIN_FILENAME_CHARS)), re.UNICODE
+)
+
+
+class FileNameSanitizer(AbstractSanitizer):
+    def __init__(
+        self,
+        min_len: Optional[int] = 1,
+        max_len: Optional[int] = _DEFAULT_MAX_FILENAME_LEN,
+        platform: PlatformType = None,
+        check_reserved: bool = True,
+    ) -> None:
+        super().__init__(
+            min_len=min_len,
+            max_len=max_len,
+            check_reserved=check_reserved,
+            platform_max_len=_DEFAULT_MAX_FILENAME_LEN,
+            platform=platform,
+        )
+
+        self._sanitize_regexp = self._get_sanitize_regexp()
+        self.__validator = FileNameValidator(
+            min_len=self.min_len,
+            max_len=self.max_len,
+            check_reserved=check_reserved,
+            platform=self.platform,
+        )
+
+    def sanitize(self, value: PathType, replacement_text: str = "") -> PathType:
+        try:
+            validate_pathtype(value, allow_whitespaces=True if not self._is_windows() else False)
+        except ValidationError as e:
+            if e.reason == ErrorReason.NULL_NAME:
+                return ""
+            raise
+
+        sanitized_filename = self._sanitize_regexp.sub(replacement_text, str(value))
+        sanitized_filename = sanitized_filename[: self.max_len]
+
+        try:
+            self.__validator.validate(sanitized_filename)
+        except ValidationError as e:
+            if e.reason == ErrorReason.RESERVED_NAME and e.reusable_name is False:
+                sanitized_filename = re.sub(
+                    re.escape(e.reserved_name), "{}_".format(e.reserved_name), sanitized_filename
+                )
+            elif e.reason == ErrorReason.INVALID_CHARACTER:
+                if self.platform in [Platform.UNIVERSAL, Platform.WINDOWS]:
+                    sanitized_filename = sanitized_filename.rstrip(" .")
+
+        if is_pathlike_obj(value):
+            return Path(sanitized_filename)
+
+        return sanitized_filename
+
+    def _get_sanitize_regexp(self) -> Pattern:
+        if self.platform in [Platform.UNIVERSAL, Platform.WINDOWS]:
+            return _RE_INVALID_WIN_FILENAME
+
+        return _RE_INVALID_FILENAME
+
+
+class FileNameValidator(BaseValidator):
+    _WINDOWS_RESERVED_FILE_NAMES = ("CON", "PRN", "AUX", "CLOCK$", "NUL") + tuple(
+        "{:s}{:d}".format(name, num)
+        for name, num in itertools.product(("COM", "LPT"), range(1, 10))
+    )
+    _MACOS_RESERVED_FILE_NAMES = (":",)
+
+    @property
+    def reserved_keywords(self) -> Tuple[str, ...]:
+        common_keywords = super().reserved_keywords
+
+        if self._is_universal():
+            return (
+                common_keywords
+                + self._WINDOWS_RESERVED_FILE_NAMES
+                + self._MACOS_RESERVED_FILE_NAMES
+            )
+
+        if self._is_windows():
+            return common_keywords + self._WINDOWS_RESERVED_FILE_NAMES
+
+        if self._is_posix() or self._is_macos():
+            return common_keywords + self._MACOS_RESERVED_FILE_NAMES
+
+        return common_keywords
+
+    def __init__(
+        self,
+        min_len: Optional[int] = 1,
+        max_len: Optional[int] = _DEFAULT_MAX_FILENAME_LEN,
+        platform: PlatformType = None,
+        check_reserved: bool = True,
+    ) -> None:
+        super().__init__(
+            min_len=min_len,
+            max_len=max_len,
+            check_reserved=check_reserved,
+            platform_max_len=_DEFAULT_MAX_FILENAME_LEN,
+            platform=platform,
+        )
+
+    def validate(self, value: PathType) -> None:
+        validate_pathtype(
+            value,
+            allow_whitespaces=False
+            if self.platform in [Platform.UNIVERSAL, Platform.WINDOWS]
+            else True,
+        )
+
+        unicode_filename = preprocess(value)
+        value_len = len(unicode_filename)
+
+        self.validate_abspath(unicode_filename)
+
+        if value_len > self.max_len:
+            raise InvalidLengthError(
+                "filename is too long: expected<={:d}, actual={:d}".format(self.max_len, value_len)
+            )
+        if value_len < self.min_len:
+            raise InvalidLengthError(
+                "filename is too short: expected>={:d}, actual={:d}".format(self.min_len, value_len)
+            )
+
+        self._validate_reserved_keywords(unicode_filename)
+
+        if self._is_universal() or self._is_windows():
+            self.__validate_win_filename(unicode_filename)
+        else:
+            self.__validate_unix_filename(unicode_filename)
+
+    def validate_abspath(self, value: str) -> None:
+        err = ValidationError(
+            description="found an absolute path ({}), expected a filename".format(value),
+            platform=self.platform,
+            reason=ErrorReason.FOUND_ABS_PATH,
+        )
+
+        if self._is_universal() or self._is_windows():
+            if ntpath.isabs(value):
+                raise err
+
+        if posixpath.isabs(value):
+            raise err
+
+    def __validate_unix_filename(self, unicode_filename: str) -> None:
+        match = _RE_INVALID_FILENAME.findall(unicode_filename)
+        if match:
+            raise InvalidCharError(
+                self._ERROR_MSG_TEMPLATE.format(
+                    invalid=findall_to_str(match), value=repr(unicode_filename)
+                )
+            )
+
+    def __validate_win_filename(self, unicode_filename: str) -> None:
+        match = _RE_INVALID_WIN_FILENAME.findall(unicode_filename)
+        if match:
+            raise InvalidCharError(
+                self._ERROR_MSG_TEMPLATE.format(
+                    invalid=findall_to_str(match), value=repr(unicode_filename)
+                ),
+                platform=Platform.WINDOWS,
+            )
+
+        if unicode_filename in (".", ".."):
+            return
+
+        if unicode_filename[-1] in (" ", "."):
+            raise InvalidCharError(
+                self._ERROR_MSG_TEMPLATE.format(
+                    invalid=re.escape(unicode_filename[-1]), value=repr(unicode_filename)
+                ),
+                platform=Platform.WINDOWS,
+                description="Do not end a file or directory name with a space or a period",
+            )
+
+
+def validate_filename(
+    filename: PathType,
+    platform: Optional[str] = None,
+    min_len: int = 1,
+    max_len: int = _DEFAULT_MAX_FILENAME_LEN,
+    check_reserved: bool = True,
+) -> None:
+    """Verifying whether the ``filename`` is a valid file name or not.
+
+    Args:
+        filename:
+            Filename to validate.
+        platform:
+            Target platform name of the filename.
+
+            .. include:: platform.txt
+        min_len:
+            Minimum length of the ``filename``. The value must be greater or equal to one.
+            Defaults to ``1``.
+        max_len:
+            Maximum length of the ``filename``. The value must be lower than:
+
+                - ``Linux``: 4096
+                - ``macOS``: 1024
+                - ``Windows``: 260
+                - ``universal``: 260
+
+            Defaults to ``255``.
+        check_reserved:
+            If |True|, check reserved names of the ``platform``.
+
+    Raises:
+        ValidationError (ErrorReason.INVALID_LENGTH):
+            If the ``filename`` is longer than ``max_len`` characters.
+        ValidationError (ErrorReason.INVALID_CHARACTER):
+            If the ``filename`` includes invalid character(s) for a filename:
+            |invalid_filename_chars|.
+            The following characters are also invalid for Windows platform:
+            |invalid_win_filename_chars|.
+        ValidationError (ErrorReason.RESERVED_NAME):
+            If the ``filename`` equals reserved name by OS.
+            Windows reserved name is as follows:
+            ``"CON"``, ``"PRN"``, ``"AUX"``, ``"NUL"``, ``"COM[1-9]"``, ``"LPT[1-9]"``.
+
+    Example:
+        :ref:`example-validate-filename`
+
+    See Also:
+        `Naming Files, Paths, and Namespaces - Win32 apps | Microsoft Docs
+        <https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file>`__
+    """
+
+    FileNameValidator(
+        platform=platform, min_len=min_len, max_len=max_len, check_reserved=check_reserved
+    ).validate(filename)
+
+
+def is_valid_filename(
+    filename: PathType,
+    platform: Optional[str] = None,
+    min_len: int = 1,
+    max_len: Optional[int] = None,
+    check_reserved: bool = True,
+) -> bool:
+    """Check whether the ``filename`` is a valid name or not.
+
+    Args:
+        filename:
+            A filename to be checked.
+
+    Example:
+        :ref:`example-is-valid-filename`
+
+    See Also:
+        :py:func:`.validate_filename()`
+    """
+
+    return FileNameValidator(
+        platform=platform, min_len=min_len, max_len=max_len, check_reserved=check_reserved
+    ).is_valid(filename)
+
+
+def sanitize_filename(
+    filename: PathType,
+    replacement_text: str = "",
+    platform: Optional[str] = None,
+    max_len: Optional[int] = _DEFAULT_MAX_FILENAME_LEN,
+    check_reserved: bool = True,
+) -> PathType:
+    """Make a valid filename from a string.
+
+    To make a valid filename the function does:
+
+        - Replace invalid characters as file names included in the ``filename``
+          with the ``replacement_text``. Invalid characters are:
+
+            - unprintable characters
+            - |invalid_filename_chars|
+            - for Windows (or universal) only: |invalid_win_filename_chars|
+
+        - Append underscore (``"_"``) at the tail of the name if sanitized name
+          is one of the reserved names by operating systems
+          (only when ``check_reserved`` is |True|).
+
+    Args:
+        filename: Filename to sanitize.
+        replacement_text:
+            Replacement text for invalid characters. Defaults to ``""``.
+        platform:
+            Target platform name of the filename.
+
+            .. include:: platform.txt
+        max_len:
+            Maximum length of the ``filename`` length. Truncate the name length if
+            the ``filename`` length exceeds this value.
+            Defaults to ``255``.
+        check_reserved:
+            If |True|, sanitize reserved names of the ``platform``.
+
+    Returns:
+        Same type as the ``filename`` (str or PathLike object):
+            Sanitized filename.
+
+    Raises:
+        ValueError:
+            If the ``filename`` is an invalid filename.
+
+    Example:
+        :ref:`example-sanitize-filename`
+    """
+
+    return FileNameSanitizer(
+        platform=platform, max_len=max_len, check_reserved=check_reserved
+    ).sanitize(filename, replacement_text)
--- a/resources/lib/pathvalidate/_filepath.py
+++ b/resources/lib/pathvalidate/_filepath.py
@ -0,0 +1,427 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+import ntpath
+import os.path
+import posixpath
+import re
+from pathlib import Path
+from typing import List, Optional, Pattern, Tuple  # noqa
+
+from ._base import AbstractSanitizer, BaseFile, BaseValidator
+from ._common import (
+    PathType,
+    Platform,
+    PlatformType,
+    findall_to_str,
+    is_pathlike_obj,
+    preprocess,
+    validate_pathtype,
+)
+from ._const import _NTFS_RESERVED_FILE_NAMES
+from ._filename import FileNameSanitizer, FileNameValidator
+from .error import (
+    ErrorReason,
+    InvalidCharError,
+    InvalidLengthError,
+    ReservedNameError,
+    ValidationError,
+)
+
+
+_RE_INVALID_PATH = re.compile("[{:s}]".format(re.escape(BaseFile._INVALID_PATH_CHARS)), re.UNICODE)
+_RE_INVALID_WIN_PATH = re.compile(
+    "[{:s}]".format(re.escape(BaseFile._INVALID_WIN_PATH_CHARS)), re.UNICODE
+)
+
+
+class FilePathSanitizer(AbstractSanitizer):
+    def __init__(
+        self,
+        min_len: Optional[int] = 1,
+        max_len: Optional[int] = None,
+        platform: PlatformType = None,
+        check_reserved: bool = True,
+        normalize: bool = True,
+    ) -> None:
+        super().__init__(
+            min_len=min_len,
+            max_len=max_len,
+            check_reserved=check_reserved,
+            platform=platform,
+        )
+
+        self._sanitize_regexp = self._get_sanitize_regexp()
+        self.__fpath_validator = FilePathValidator(
+            min_len=self.min_len,
+            max_len=self.max_len,
+            check_reserved=check_reserved,
+            platform=self.platform,
+        )
+        self.__fname_sanitizer = FileNameSanitizer(
+            min_len=self.min_len,
+            max_len=self.max_len,
+            check_reserved=check_reserved,
+            platform=self.platform,
+        )
+        self.__normalize = normalize
+
+        if self._is_universal() or self._is_windows():
+            self.__split_drive = ntpath.splitdrive
+        else:
+            self.__split_drive = posixpath.splitdrive
+
+    def sanitize(self, value: PathType, replacement_text: str = "") -> PathType:
+        if not value:
+            return ""
+
+        self.__fpath_validator.validate_abspath(value)
+
+        unicode_filepath = preprocess(value)
+
+        if self.__normalize:
+            unicode_filepath = os.path.normpath(unicode_filepath)
+
+        drive, unicode_filepath = self.__split_drive(unicode_filepath)
+        sanitized_path = self._sanitize_regexp.sub(replacement_text, unicode_filepath)
+        if self._is_windows():
+            path_separator = "\\"
+        else:
+            path_separator = "/"
+
+        sanitized_entries = []  # type: List[str]
+        if drive:
+            sanitized_entries.append(drive)
+        for entry in sanitized_path.replace("\\", "/").split("/"):
+            if entry in _NTFS_RESERVED_FILE_NAMES:
+                sanitized_entries.append("{}_".format(entry))
+                continue
+
+            sanitized_entry = str(self.__fname_sanitizer.sanitize(entry))
+            if not sanitized_entry:
+                if not sanitized_entries:
+                    sanitized_entries.append("")
+                continue
+
+            sanitized_entries.append(sanitized_entry)
+
+        sanitized_path = path_separator.join(sanitized_entries)
+
+        if is_pathlike_obj(value):
+            return Path(sanitized_path)
+
+        return sanitized_path
+
+    def _get_sanitize_regexp(self) -> Pattern:
+        if self.platform in [Platform.UNIVERSAL, Platform.WINDOWS]:
+            return _RE_INVALID_WIN_PATH
+
+        return _RE_INVALID_PATH
+
+
+class FilePathValidator(BaseValidator):
+    _RE_NTFS_RESERVED = re.compile(
+        "|".join("^/{}$".format(re.escape(pattern)) for pattern in _NTFS_RESERVED_FILE_NAMES),
+        re.IGNORECASE,
+    )
+    _MACOS_RESERVED_FILE_PATHS = ("/", ":")
+
+    @property
+    def reserved_keywords(self) -> Tuple[str, ...]:
+        common_keywords = super().reserved_keywords
+
+        if any([self._is_universal(), self._is_posix(), self._is_macos()]):
+            return common_keywords + self._MACOS_RESERVED_FILE_PATHS
+
+        if self._is_linux():
+            return common_keywords + ("/",)
+
+        return common_keywords
+
+    def __init__(
+        self,
+        min_len: Optional[int] = 1,
+        max_len: Optional[int] = None,
+        platform: PlatformType = None,
+        check_reserved: bool = True,
+    ) -> None:
+        super().__init__(
+            min_len=min_len,
+            max_len=max_len,
+            check_reserved=check_reserved,
+            platform=platform,
+        )
+
+        self.__fname_validator = FileNameValidator(
+            min_len=min_len, max_len=max_len, check_reserved=check_reserved, platform=platform
+        )
+
+        if self._is_universal() or self._is_windows():
+            self.__split_drive = ntpath.splitdrive
+        else:
+            self.__split_drive = posixpath.splitdrive
+
+    def validate(self, value: PathType) -> None:
+        validate_pathtype(
+            value,
+            allow_whitespaces=False
+            if self.platform in [Platform.UNIVERSAL, Platform.WINDOWS]
+            else True,
+        )
+        self.validate_abspath(value)
+
+        _drive, value = self.__split_drive(str(value))
+        if not value:
+            return
+
+        filepath = os.path.normpath(value)
+        unicode_filepath = preprocess(filepath)
+        value_len = len(unicode_filepath)
+
+        if value_len > self.max_len:
+            raise InvalidLengthError(
+                "file path is too long: expected<={:d}, actual={:d}".format(self.max_len, value_len)
+            )
+        if value_len < self.min_len:
+            raise InvalidLengthError(
+                "file path is too short: expected>={:d}, actual={:d}".format(
+                    self.min_len, value_len
+                )
+            )
+
+        self._validate_reserved_keywords(unicode_filepath)
+        unicode_filepath = unicode_filepath.replace("\\", "/")
+        for entry in unicode_filepath.split("/"):
+            if not entry or entry in (".", ".."):
+                continue
+
+            self.__fname_validator._validate_reserved_keywords(entry)
+
+        if self._is_universal() or self._is_windows():
+            self.__validate_win_filepath(unicode_filepath)
+        else:
+            self.__validate_unix_filepath(unicode_filepath)
+
+    def validate_abspath(self, value: PathType) -> None:
+        value = str(value)
+        is_posix_abs = posixpath.isabs(value)
+        is_nt_abs = ntpath.isabs(value)
+        err_object = ValidationError(
+            description=(
+                "an invalid absolute file path ({}) for the platform ({}).".format(
+                    value, self.platform.value
+                )
+                + " to avoid the error, specify an appropriate platform correspond"
+                + " with the path format, or 'auto'."
+            ),
+            platform=self.platform,
+            reason=ErrorReason.MALFORMED_ABS_PATH,
+        )
+
+        if any([self._is_windows() and is_nt_abs, self._is_linux() and is_posix_abs]):
+            return
+
+        if self._is_universal() and any([is_posix_abs, is_nt_abs]):
+            ValidationError(
+                description=(
+                    "{}. expected a platform independent file path".format(
+                        "POSIX absolute file path found"
+                        if is_posix_abs
+                        else "NT absolute file path found"
+                    )
+                ),
+                platform=self.platform,
+                reason=ErrorReason.MALFORMED_ABS_PATH,
+            )
+
+        if any([self._is_windows(), self._is_universal()]) and is_posix_abs:
+            raise err_object
+
+        drive, _tail = ntpath.splitdrive(value)
+        if not self._is_windows() and drive and is_nt_abs:
+            raise err_object
+
+    def __validate_unix_filepath(self, unicode_filepath: str) -> None:
+        match = _RE_INVALID_PATH.findall(unicode_filepath)
+        if match:
+            raise InvalidCharError(
+                self._ERROR_MSG_TEMPLATE.format(
+                    invalid=findall_to_str(match), value=repr(unicode_filepath)
+                )
+            )
+
+    def __validate_win_filepath(self, unicode_filepath: str) -> None:
+        match = _RE_INVALID_WIN_PATH.findall(unicode_filepath)
+        if match:
+            raise InvalidCharError(
+                self._ERROR_MSG_TEMPLATE.format(
+                    invalid=findall_to_str(match), value=repr(unicode_filepath)
+                ),
+                platform=Platform.WINDOWS,
+            )
+
+        _drive, value = self.__split_drive(unicode_filepath)
+        if value:
+            match_reserved = self._RE_NTFS_RESERVED.search(value)
+            if match_reserved:
+                reserved_name = match_reserved.group()
+                raise ReservedNameError(
+                    "'{}' is a reserved name".format(reserved_name),
+                    reusable_name=False,
+                    reserved_name=reserved_name,
+                    platform=self.platform,
+                )
+
+
+def validate_filepath(
+    file_path: PathType,
+    platform: Optional[str] = None,
+    min_len: int = 1,
+    max_len: Optional[int] = None,
+    check_reserved: bool = True,
+) -> None:
+    """Verifying whether the ``file_path`` is a valid file path or not.
+
+    Args:
+        file_path:
+            File path to validate.
+        platform:
+            Target platform name of the file path.
+
+            .. include:: platform.txt
+        min_len:
+            Minimum length of the ``file_path``. The value must be greater or equal to one.
+            Defaults to ``1``.
+        max_len:
+            Maximum length of the ``file_path`` length. If the value is |None|,
+            automatically determined by the ``platform``:
+
+                - ``Linux``: 4096
+                - ``macOS``: 1024
+                - ``Windows``: 260
+                - ``universal``: 260
+        check_reserved:
+            If |True|, check reserved names of the ``platform``.
+
+    Raises:
+        ValidationError (ErrorReason.INVALID_CHARACTER):
+            If the ``file_path`` includes invalid char(s):
+            |invalid_file_path_chars|.
+            The following characters are also invalid for Windows platform:
+            |invalid_win_file_path_chars|
+        ValidationError (ErrorReason.INVALID_LENGTH):
+            If the ``file_path`` is longer than ``max_len`` characters.
+        ValidationError:
+            If ``file_path`` include invalid values.
+
+    Example:
+        :ref:`example-validate-file-path`
+
+    See Also:
+        `Naming Files, Paths, and Namespaces - Win32 apps | Microsoft Docs
+        <https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file>`__
+    """
+
+    FilePathValidator(
+        platform=platform, min_len=min_len, max_len=max_len, check_reserved=check_reserved
+    ).validate(file_path)
+
+
+def validate_file_path(file_path, platform=None, max_path_len=None):
+    # Deprecated
+    validate_filepath(file_path, platform, max_path_len)
+
+
+def is_valid_filepath(
+    file_path: PathType,
+    platform: Optional[str] = None,
+    min_len: int = 1,
+    max_len: Optional[int] = None,
+    check_reserved: bool = True,
+) -> bool:
+    """Check whether the ``file_path`` is a valid name or not.
+
+    Args:
+        file_path:
+            A filepath to be checked.
+
+    Example:
+        :ref:`example-is-valid-filepath`
+
+    See Also:
+        :py:func:`.validate_filepath()`
+    """
+
+    return FilePathValidator(
+        platform=platform, min_len=min_len, max_len=max_len, check_reserved=check_reserved
+    ).is_valid(file_path)
+
+
+def sanitize_filepath(
+    file_path: PathType,
+    replacement_text: str = "",
+    platform: Optional[str] = None,
+    max_len: Optional[int] = None,
+    check_reserved: bool = True,
+    normalize: bool = True,
+) -> PathType:
+    """Make a valid file path from a string.
+
+    To make a valid file path the function does:
+
+        - replace invalid characters for a file path within the ``file_path``
+          with the ``replacement_text``. Invalid characters are as follows:
+
+            - unprintable characters
+            - |invalid_file_path_chars|
+            - for Windows (or universal) only: |invalid_win_file_path_chars|
+
+        - Append underscore (``"_"``) at the tail of the name if sanitized name
+          is one of the reserved names by operating systems
+          (only when ``check_reserved`` is |True|).
+
+    Args:
+        file_path:
+            File path to sanitize.
+        replacement_text:
+            Replacement text for invalid characters.
+            Defaults to ``""``.
+        platform:
+            Target platform name of the file path.
+
+            .. include:: platform.txt
+        max_len:
+            Maximum length of the ``file_path`` length. Truncate the name if the ``file_path``
+            length exceedd this value. If the value is |None|,
+            ``max_len`` will automatically determined by the ``platform``:
+
+                - ``Linux``: 4096
+                - ``macOS``: 1024
+                - ``Windows``: 260
+                - ``universal``: 260
+        check_reserved:
+            If |True|, sanitize reserved names of the ``platform``.
+        normalize:
+            If |True|, normalize the the file path.
+
+    Returns:
+        Same type as the argument (str or PathLike object):
+            Sanitized filepath.
+
+    Raises:
+        ValueError:
+            If the ``file_path`` is an invalid file path.
+
+    Example:
+        :ref:`example-sanitize-file-path`
+    """
+
+    return FilePathSanitizer(
+        platform=platform, max_len=max_len, check_reserved=check_reserved, normalize=normalize
+    ).sanitize(file_path, replacement_text)
+
+
+def sanitize_file_path(file_path, replacement_text="", platform=None, max_path_len=None):
+    # Deprecated
+    return sanitize_filepath(file_path, platform, max_path_len)
--- a/resources/lib/pathvalidate/_ltsv.py
+++ b/resources/lib/pathvalidate/_ltsv.py
@ -0,0 +1,45 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+import re
+
+from ._common import preprocess, validate_pathtype
+from .error import InvalidCharError
+
+
+__RE_INVALID_LTSV_LABEL = re.compile("[^0-9A-Za-z_.-]", re.UNICODE)
+
+
+def validate_ltsv_label(label: str) -> None:
+    """
+    Verifying whether ``label`` is a valid
+    `Labeled Tab-separated Values (LTSV) <http://ltsv.org/>`__ label or not.
+
+    :param label: Label to validate.
+    :raises pathvalidate.ValidationError:
+        If invalid character(s) found in the ``label`` for a LTSV format label.
+    """
+
+    validate_pathtype(label, allow_whitespaces=False, error_msg="label is empty")
+
+    match_list = __RE_INVALID_LTSV_LABEL.findall(preprocess(label))
+    if match_list:
+        raise InvalidCharError(
+            "invalid character found for a LTSV format label: {}".format(match_list)
+        )
+
+
+def sanitize_ltsv_label(label: str, replacement_text: str = "") -> str:
+    """
+    Replace all of the symbols in text.
+
+    :param label: Input text.
+    :param replacement_text: Replacement text.
+    :return: A replacement string.
+    :rtype: str
+    """
+
+    validate_pathtype(label, allow_whitespaces=False, error_msg="label is empty")
+
+    return __RE_INVALID_LTSV_LABEL.sub(replacement_text, preprocess(label))
--- a/resources/lib/pathvalidate/_symbol.py
+++ b/resources/lib/pathvalidate/_symbol.py
@ -0,0 +1,110 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+import re
+from typing import Sequence
+
+from ._common import ascii_symbols, preprocess, unprintable_ascii_chars
+from .error import InvalidCharError
+
+
+__RE_UNPRINTABLE = re.compile(
+    "[{}]".format(re.escape("".join(unprintable_ascii_chars))), re.UNICODE
+)
+__RE_SYMBOL = re.compile(
+    "[{}]".format(re.escape("".join(ascii_symbols + unprintable_ascii_chars))), re.UNICODE
+)
+
+
+def validate_unprintable(text: str) -> None:
+    # deprecated
+    match_list = __RE_UNPRINTABLE.findall(preprocess(text))
+    if match_list:
+        raise InvalidCharError("unprintable character found: {}".format(match_list))
+
+
+def replace_unprintable(text: str, replacement_text: str = "") -> str:
+    # deprecated
+    try:
+        return __RE_UNPRINTABLE.sub(replacement_text, preprocess(text))
+    except (TypeError, AttributeError):
+        raise TypeError("text must be a string")
+
+
+def validate_symbol(text: str) -> None:
+    """
+    Verifying whether symbol(s) included in the ``text`` or not.
+
+    Args:
+        text:
+            Input text to validate.
+
+    Raises:
+        ValidationError (ErrorReason.INVALID_CHARACTER):
+            If symbol(s) included in the ``text``.
+    """
+
+    match_list = __RE_SYMBOL.findall(preprocess(text))
+    if match_list:
+        raise InvalidCharError("invalid symbols found: {}".format(match_list))
+
+
+def replace_symbol(
+    text: str,
+    replacement_text: str = "",
+    exclude_symbols: Sequence[str] = [],
+    is_replace_consecutive_chars: bool = False,
+    is_strip: bool = False,
+) -> str:
+    """
+    Replace all of the symbols in the ``text``.
+
+    Args:
+        text:
+            Input text.
+        replacement_text:
+            Replacement text.
+        exclude_symbols:
+            Symbols that exclude from the replacement.
+        is_replace_consecutive_chars:
+            If |True|, replace consecutive multiple ``replacement_text`` characters
+            to a single character.
+        is_strip:
+            If |True|, strip ``replacement_text`` from the beginning/end of the replacement text.
+
+    Returns:
+        A replacement string.
+
+    Example:
+
+        :ref:`example-sanitize-symbol`
+    """
+
+    if exclude_symbols:
+        regexp = re.compile(
+            "[{}]".format(
+                re.escape(
+                    "".join(set(ascii_symbols + unprintable_ascii_chars) - set(exclude_symbols))
+                )
+            ),
+            re.UNICODE,
+        )
+    else:
+        regexp = __RE_SYMBOL
+
+    try:
+        new_text = regexp.sub(replacement_text, preprocess(text))
+    except TypeError:
+        raise TypeError("text must be a string")
+
+    if not replacement_text:
+        return new_text
+
+    if is_replace_consecutive_chars:
+        new_text = re.sub("{}+".format(re.escape(replacement_text)), replacement_text, new_text)
+
+    if is_strip:
+        new_text = new_text.strip(replacement_text)
+
+    return new_text
--- a/resources/lib/pathvalidate/argparse.py
+++ b/resources/lib/pathvalidate/argparse.py
@ -0,0 +1,68 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+from argparse import ArgumentTypeError
+
+from ._common import PathType
+from ._filename import sanitize_filename, validate_filename
+from ._filepath import sanitize_filepath, validate_filepath
+from .error import ValidationError
+
+
+def validate_filename_arg(value: str) -> str:
+    if not value:
+        return ""
+
+    try:
+        validate_filename(value)
+    except ValidationError as e:
+        raise ArgumentTypeError(e)
+
+    return value
+
+
+def validate_filepath_arg(value: str) -> str:
+    if not value:
+        return ""
+
+    try:
+        validate_filepath(value, platform="auto")
+    except ValidationError as e:
+        raise ArgumentTypeError(e)
+
+    return value
+
+
+def sanitize_filename_arg(value: str) -> PathType:
+    if not value:
+        return ""
+
+    return sanitize_filename(value)
+
+
+def sanitize_filepath_arg(value: str) -> PathType:
+    if not value:
+        return ""
+
+    return sanitize_filepath(value, platform="auto")
+
+
+def filename(value: PathType) -> PathType:  # pragma: no cover
+    # Deprecated
+    try:
+        validate_filename(value)
+    except ValidationError as e:
+        raise ArgumentTypeError(e)
+
+    return sanitize_filename(value)
+
+
+def filepath(value: PathType) -> PathType:  # pragma: no cover
+    # Deprecated
+    try:
+        validate_filepath(value)
+    except ValidationError as e:
+        raise ArgumentTypeError(e)
+
+    return sanitize_filepath(value)
--- a/resources/lib/pathvalidate/click.py
+++ b/resources/lib/pathvalidate/click.py
@ -0,0 +1,74 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+import click
+
+from ._common import PathType
+from ._filename import sanitize_filename, validate_filename
+from ._filepath import sanitize_filepath, validate_filepath
+from .error import ValidationError
+
+
+def validate_filename_arg(ctx, param, value) -> str:
+    if not value:
+        return ""
+
+    try:
+        validate_filename(value)
+    except ValidationError as e:
+        raise click.BadParameter(str(e))
+
+    return value
+
+
+def validate_filepath_arg(ctx, param, value) -> str:
+    if not value:
+        return ""
+
+    try:
+        validate_filepath(value)
+    except ValidationError as e:
+        raise click.BadParameter(str(e))
+
+    return value
+
+
+def sanitize_filename_arg(ctx, param, value) -> PathType:
+    if not value:
+        return ""
+
+    return sanitize_filename(value)
+
+
+def sanitize_filepath_arg(ctx, param, value) -> PathType:
+    if not value:
+        return ""
+
+    return sanitize_filepath(value)
+
+
+def filename(ctx, param, value):  # pragma: no cover
+    # Deprecated
+    if not value:
+        return None
+
+    try:
+        validate_filename(value)
+    except ValidationError as e:
+        raise click.BadParameter(str(e))
+
+    return sanitize_filename(value)
+
+
+def filepath(ctx, param, value):  # pragma: no cover
+    # Deprecated
+    if not value:
+        return None
+
+    try:
+        validate_filepath(value)
+    except ValidationError as e:
+        raise click.BadParameter(str(e))
+
+    return sanitize_filepath(value)
--- a/resources/lib/pathvalidate/error.py
+++ b/resources/lib/pathvalidate/error.py
@ -0,0 +1,155 @@
+"""
+.. codeauthor:: Tsuyoshi Hombashi <tsuyoshi.hombashi@gmail.com>
+"""
+
+import enum
+from typing import Optional, cast
+
+from ._common import Platform
+
+
+@enum.unique
+class ErrorReason(enum.Enum):
+    """
+    Validation error reasons.
+    """
+
+    FOUND_ABS_PATH = "FOUND_ABS_PATH"  #: found an absolute path when expecting a file name
+    NULL_NAME = "NULL_NAME"  #: empty value
+    INVALID_CHARACTER = "INVALID_CHARACTER"  #: found invalid characters(s) in a value
+    INVALID_LENGTH = "INVALID_LENGTH"  #: found invalid string length
+    MALFORMED_ABS_PATH = "MALFORMED_ABS_PATH"  #: found invalid absolute path format
+    RESERVED_NAME = "RESERVED_NAME"  #: found a reserved name by a platform
+
+
+class ValidationError(ValueError):
+    """
+    Exception class of validation errors.
+
+    .. py:attribute:: reason
+
+        The cause of the error.
+
+        Returns:
+            :py:class:`~pathvalidate.error.ErrorReason`:
+    """
+
+    @property
+    def platform(self) -> Platform:
+        return self.__platform
+
+    @property
+    def reason(self) -> Optional[ErrorReason]:
+        return self.__reason
+
+    @property
+    def description(self) -> str:
+        return self.__description
+
+    @property
+    def reserved_name(self) -> str:
+        return self.__reserved_name
+
+    @property
+    def reusable_name(self) -> bool:
+        return self.__reusable_name
+
+    def __init__(self, *args, **kwargs):
+        self.__platform = kwargs.pop("platform", None)
+        self.__reason = kwargs.pop("reason", None)
+        self.__description = kwargs.pop("description", None)
+        self.__reserved_name = kwargs.pop("reserved_name", None)
+        self.__reusable_name = kwargs.pop("reusable_name", None)
+
+        try:
+            super().__init__(*args[0], **kwargs)
+        except IndexError:
+            super().__init__(*args, **kwargs)
+
+    def __str__(self) -> str:
+        item_list = []
+
+        if Exception.__str__(self):
+            item_list.append(Exception.__str__(self))
+
+        if self.reason:
+            item_list.append("reason={}".format(cast(ErrorReason, self.reason).value))
+        if self.platform:
+            item_list.append("target-platform={}".format(self.platform.value))
+        if self.description:
+            item_list.append("description={}".format(self.description))
+        if self.__reusable_name is not None:
+            item_list.append("reusable_name={}".format(self.reusable_name))
+
+        return ", ".join(item_list).strip()
+
+    def __repr__(self, *args, **kwargs):
+        return self.__str__(*args, **kwargs)
+
+
+class NullNameError(ValidationError):
+    """
+    Exception raised when a name is empty.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        kwargs["reason"] = ErrorReason.NULL_NAME
+
+        super().__init__(args, **kwargs)
+
+
+class InvalidCharError(ValidationError):
+    """
+    Exception raised when includes invalid character(s) within a string.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        kwargs["reason"] = ErrorReason.INVALID_CHARACTER
+
+        super().__init__(args, **kwargs)
+
+
+class InvalidLengthError(ValidationError):
+    """
+    Exception raised when a string too long/short.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        kwargs["reason"] = ErrorReason.INVALID_LENGTH
+
+        super().__init__(args, **kwargs)
+
+
+class ReservedNameError(ValidationError):
+    """
+    Exception raised when a string matched a reserved name.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        kwargs["reason"] = ErrorReason.RESERVED_NAME
+
+        super().__init__(args, **kwargs)
+
+
+class ValidReservedNameError(ReservedNameError):
+    """
+    Exception raised when a string matched a reserved name.
+    However, it can be used as a name.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        kwargs["reusable_name"] = True
+
+        super().__init__(args, **kwargs)
+
+
+class InvalidReservedNameError(ReservedNameError):
+    """
+    Exception raised when a string matched a reserved name.
+    Moreover, the reserved name is invalid as a name.
+    """
+
+    def __init__(self, *args, **kwargs) -> None:
+        kwargs["reusable_name"] = False
+
+        super().__init__(args, **kwargs)
--- a/resources/lib/websocket/tests/init.py
+++ b/resources/lib/websocket/tests/init.py
--- a/resources/lib/playback.py
+++ b/resources/lib/playback.py
@ -3,7 +3,6 @@
 """
 Used to kick off Kodi playback
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 import datetime
@ -22,7 +21,7 @@ from . import exceptions
 LOG = getLogger('PLEX.playback')
 # Do we need to return ultimately with a setResolvedUrl?
 RESOLVE = True
-TRY_TO_SEEK_FOR = 300  # =30 seconds
+TRY_TO_SEEK_FOR = 300  # =300 seconds
 IGNORE_SECONDS_AT_START = 15
 ###############################################################################

@ -297,7 +296,7 @@ def resume_dialog(resume):
    resume = datetime.timedelta(seconds=resume)
    LOG.debug('Showing PKC resume dialog for resume: %s', resume)
    answ = utils.dialog('contextmenu',
-                        [utils.lang(12022).replace('{0:s}', '{0}').format(unicode(resume)),
+                        [utils.lang(12022).replace('{0:s}', '{0}').format(str(resume)),
                         utils.lang(12021)])
    if answ == -1:
        return
@ -361,7 +360,7 @@ def _prep_playlist_stack(xml, resume):
                # path = path.replace('plugin.video.plexkodiconnect.movies',
                #                     'plugin.video.plexkodiconnect', 1)
                listitem = api.listitem()
-                listitem.setPath(path.encode('utf-8'))
+                listitem.setPath(path)
            else:
                # Will add directly via the Kodi DB
                path = None
@ -462,7 +461,7 @@ def _conclude_playback(playqueue, pos):
        _ensure_resolve()
        return
    listitem = item.api.listitem(listitem=transfer.PKCListItem, resume=False)
-    listitem.setPath(item.file.encode('utf-8'))
+    listitem.setPath(item.file)
    if item.playmethod != v.PLAYBACK_METHOD_DIRECT_PATH:
        listitem.setSubtitles(item.api.cache_external_subs())
    transfer.send(listitem)
@ -529,13 +528,13 @@ def process_indirect(key, offset, resolve=True):
        return

    item.file = playurl
-    listitem.setPath(utils.try_encode(playurl))
+    listitem.setPath(playurl)
    playqueue.items.append(item)
    if resolve is True:
        transfer.send(listitem)
    else:
        thread = Thread(target=app.APP.player.play,
-                        args={'item': utils.try_encode(playurl),
+                        args={'item': playurl,
                              'listitem': listitem})
        thread.setDaemon(True)
        LOG.debug('Done initializing PKC playback, starting Kodi player')
@ -600,8 +599,8 @@ def threaded_playback(kodi_playlist, startpos, offset):
        # RuntimeError: XBMC is not playing any media file
        pass
    i = 0
-    answ = js.seek_to(offset * 1000)
-    while 'error' in answ:
+    answ = None
+    while answ is None or (answ and 'error' in answ):
        # Kodi sometimes returns {u'message': u'Failed to execute method.',
        # u'code': -32100} if user quickly switches videos
        if app.APP.monitor.waitForAbort(0.1):
@ -611,5 +610,5 @@ def threaded_playback(kodi_playlist, startpos, offset):
        if i > TRY_TO_SEEK_FOR:
            LOG.error('Failed to seek to %s. Error: %s', offset, answ)
            return
-        answ = js.seek_to(offset * 1000)
+        answ = js.seek_to(offset)
    LOG.debug('Seek to offset %s successful', offset)
--- a/resources/lib/playback_decision.py
+++ b/resources/lib/playback_decision.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from requests import exceptions

@ -373,7 +372,7 @@ def setup_transcoding_audio_subtitle_prefs(mediastreams, part_id):
            if stream.get('default'):
                audio_default = audio_numb
            audio_streams_list.append(index)
-            audio_streams.append(track.encode('utf-8'))
+            audio_streams.append(track)
            audio_numb += 1

        # Subtitles
@ -399,7 +398,7 @@ def setup_transcoding_audio_subtitle_prefs(mediastreams, part_id):
                track = "%s - %s" % (track, utils.lang(39709))  # Forced
            track = "%s (%s)" % (track, utils.lang(39710))  # burn-in
            subtitle_streams_list.append(index)
-            subtitle_streams.append(track.encode('utf-8'))
+            subtitle_streams.append(track)
            sub_num += 1

    if audio_numb > 1:
@ -439,8 +438,7 @@ def setup_transcoding_audio_subtitle_prefs(mediastreams, part_id):
                LOG.info('User chose to not burn-in any subtitles')
            else:
                LOG.info('User chose to burn-in subtitle %s: %s',
-                         select_subs_index,
-                         subtitle_streams[resp].decode('utf-8'))
+                         select_subs_index, subtitle_streams[resp])
                select_subs_index = subtitle_streams_list[resp - 1]
    # Now prep the PMS for our choice
    PF.change_subtitle(select_subs_index, part_id)
--- a/resources/lib/playback_starter.py
+++ b/resources/lib/playback_starter.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from . import utils, playback, context_entry, transfer, backgroundthread
--- a/resources/lib/playlist_func.py
+++ b/resources/lib/playlist_func.py
@ -3,7 +3,6 @@
 """
 Collection of functions associated with Kodi and Plex playlists and playqueues
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from .plex_api import API
@ -80,12 +79,8 @@ class Playqueue_Object(object):
                "'repeat': {self.repeat}, "
                "'kodi_playlist_playback': {self.kodi_playlist_playback}, "
                "'pkc_edit': {self.pkc_edit}, ".format(self=self))
-        answ = answ.encode('utf-8')
        # Since list.__repr__ will return string, not unicode
-        return answ + b"'items': {self.items}}}".format(self=self)
-
-    def __str__(self):
-        return self.__repr__()
+        return answ + "'items': {self.items}}}".format(self=self)

    def is_pkc_clear(self):
        """
@ -184,9 +179,11 @@ class PlaylistItem(object):
        # Get the Plex audio and subtitle streams in the same order as Kodi
        # uses them (Kodi uses indexes to activate them, not ids like Plex)
        self._streams_have_been_processed = False
+        self._video_streams = None
        self._audio_streams = None
        self._subtitle_streams = None
        # Which Kodi streams are active?
+        self.current_kodi_video_stream = None
        self.current_kodi_audio_stream = None
        # False means "deactivated", None means "we do not have a Kodi
        # equivalent for this Plex subtitle"
@ -206,6 +203,12 @@ class PlaylistItem(object):
    def uri(self):
        return self._uri

+    @property
+    def video_streams(self):
+        if not self._streams_have_been_processed:
+            self._process_streams()
+        return self._video_streams
+
    @property
    def audio_streams(self):
        if not self._streams_have_been_processed:
@ -218,7 +221,19 @@ class PlaylistItem(object):
            self._process_streams()
        return self._subtitle_streams

-    def __unicode__(self):
+    @property
+    def current_plex_video_stream(self):
+        return self.plex_stream_index(self.current_kodi_video_stream, 'video')
+
+    @property
+    def current_plex_audio_stream(self):
+        return self.plex_stream_index(self.current_kodi_audio_stream, 'audio')
+
+    @property
+    def current_plex_sub_stream(self):
+        return self.plex_stream_index(self.current_kodi_sub_stream, 'subtitle')
+
+    def __repr__(self):
        return ("{{"
                "'id': {self.id}, "
                "'plex_id': {self.plex_id}, "
@ -234,9 +249,6 @@ class PlaylistItem(object):
                "'force_transcode': {self.force_transcode}, "
                "'part': {self.part}".format(self=self))

-    def __repr__(self):
-        return self.__unicode__().encode('utf-8')
-
    def _process_streams(self):
        """
        Builds audio and subtitle streams and enables matching between Plex
@ -252,6 +264,13 @@ class PlaylistItem(object):
        # the same in Kodi and Plex
        self._audio_streams = [x for x in self.api.plex_media_streams()
                               if x.get('streamType') == '2']
+        # Same for video streams
+        self._video_streams = [x for x in self.api.plex_media_streams()
+                               if x.get('streamType') == '1']
+        if len(self._video_streams) == 1:
+            # Add a selected = "1" attribute to let our logic stand!
+            # Missing if there is only 1 video stream present
+            self._video_streams[0].set('selected', '1')
        self._streams_have_been_processed = True

    def _get_iterator(self, stream_type):
@ -259,6 +278,17 @@ class PlaylistItem(object):
            return self.audio_streams
        elif stream_type == 'subtitle':
            return self.subtitle_streams
+        elif stream_type == 'video':
+            return self.video_streams
+
+    def init_kodi_streams(self):
+        """
+        Initializes all streams after Kodi has started playing this video
+        """
+        self.current_kodi_video_stream = js.get_current_video_stream_index(v.KODI_VIDEO_PLAYER_ID)
+        self.current_kodi_audio_stream = js.get_current_audio_stream_index(v.KODI_VIDEO_PLAYER_ID)
+        self.current_kodi_sub_stream = False if not js.get_subtitle_enabled(v.KODI_VIDEO_PLAYER_ID) \
+            else js.get_current_subtitle_stream_index(v.KODI_VIDEO_PLAYER_ID)

    def plex_stream_index(self, kodi_stream_index, stream_type):
        """
@ -269,6 +299,8 @@ class PlaylistItem(object):
        """
        if stream_type == 'audio':
            return int(self.audio_streams[kodi_stream_index].get('id'))
+        elif stream_type == 'video':
+            return int(self.video_streams[kodi_stream_index].get('id'))
        elif stream_type == 'subtitle':
            try:
                return int(self.subtitle_streams[kodi_stream_index].get('id'))
@ -332,10 +364,39 @@ class PlaylistItem(object):
        PF.change_audio_stream(plex_stream_index, self.api.part_id())
        self.current_kodi_audio_stream = kodi_stream_index

+    def on_kodi_video_stream_change(self, kodi_stream_index):
+        """
+        Call this method if Kodi changed its video stream and you want Plex to
+        know. kodi_stream_index [int]
+        """
+        plex_stream_index = int(self.video_streams[kodi_stream_index].get('id'))
+        LOG.debug('Changing Plex video stream to %s, Kodi index %s',
+                  plex_stream_index, kodi_stream_index)
+        PF.change_video_stream(plex_stream_index, self.api.part_id())
+        self.current_kodi_video_stream = kodi_stream_index
+
    def switch_to_plex_streams(self):
+        self.switch_to_plex_stream('video')
        self.switch_to_plex_stream('audio')
        self.switch_to_plex_stream('subtitle')

+    @staticmethod
+    def _set_kodi_stream_if_different(kodi_index, typus):
+        if typus == 'video':
+            current = js.get_current_video_stream_index(v.KODI_VIDEO_PLAYER_ID)
+            if current != kodi_index:
+                LOG.debug('Switching video stream')
+                app.APP.player.setVideoStream(kodi_index)
+            else:
+                LOG.debug('Not switching video stream (no change)')
+        elif typus == 'audio':
+            current = js.get_current_audio_stream_index(v.KODI_VIDEO_PLAYER_ID)
+            if current != kodi_index:
+                LOG.debug('Switching audio stream')
+                app.APP.player.setAudioStream(kodi_index)
+            else:
+                LOG.debug('Not switching audio stream (no change)')
+
    def switch_to_plex_stream(self, typus):
        try:
            plex_index, language_tag = self.active_plex_stream_index(typus)
@ -359,22 +420,34 @@ class PlaylistItem(object):
            # If we're choosing an "illegal" index, this function does
            # need seem to fail nor log any errors
            if typus == 'audio':
-                app.APP.player.setAudioStream(kodi_index)
-            else:
+                self._set_kodi_stream_if_different(kodi_index, 'audio')
+            elif typus == 'subtitle':
                app.APP.player.setSubtitleStream(kodi_index)
                app.APP.player.showSubtitles(True)
+            elif typus == 'video':
+                self._set_kodi_stream_if_different(kodi_index, 'video')
        if typus == 'audio':
            self.current_kodi_audio_stream = kodi_index
-        else:
+        elif typus == 'subtitle':
            self.current_kodi_sub_stream = kodi_index
+        elif typus == 'video':
+            self.current_kodi_video_stream = kodi_index

    def on_av_change(self, playerid):
+        """
+        Call this method if Kodi reports an "AV-Change"
+        (event "Player.OnAVChange")
+        """
+        kodi_video_stream = js.get_current_video_stream_index(playerid)
        kodi_audio_stream = js.get_current_audio_stream_index(playerid)
        sub_enabled = js.get_subtitle_enabled(playerid)
        kodi_sub_stream = js.get_current_subtitle_stream_index(playerid)
        # Audio
        if kodi_audio_stream != self.current_kodi_audio_stream:
            self.on_kodi_audio_stream_change(kodi_audio_stream)
+        # Video
+        if kodi_video_stream != self.current_kodi_video_stream:
+            self.on_kodi_video_stream_change(kodi_audio_stream)
        # Subtitles - CURRENTLY BROKEN ON THE KODI SIDE!
        # current_kodi_sub_stream may also be zero
        subs_off = (None, False)
@ -384,6 +457,32 @@ class PlaylistItem(object):
                     and kodi_sub_stream != self.current_kodi_sub_stream)):
            self.on_kodi_subtitle_stream_change(kodi_sub_stream, sub_enabled)

+    def on_plex_stream_change(self, plex_data):
+        """
+        Call this method if Plex Companion wants to change streams
+        """
+        if 'audioStreamID' in plex_data:
+            plex_index = int(plex_data['audioStreamID'])
+            kodi_index = self.kodi_stream_index(plex_index, 'audio')
+            self._set_kodi_stream_if_different(kodi_index, 'audio')
+            self.current_kodi_audio_stream = kodi_index
+        if 'videoStreamID' in plex_data:
+            plex_index = int(plex_data['videoStreamID'])
+            kodi_index = self.kodi_stream_index(plex_index, 'video')
+            self._set_kodi_stream_if_different(kodi_index, 'video')
+            self.current_kodi_video_stream = kodi_index
+        if 'subtitleStreamID' in plex_data:
+            plex_index = int(plex_data['subtitleStreamID'])
+            if plex_index == 0:
+                app.APP.player.showSubtitles(False)
+                kodi_index = False
+            else:
+                kodi_index = self.kodi_stream_index(plex_index, 'subtitle')
+                if kodi_index:
+                    app.APP.player.setSubtitleStream(kodi_index)
+                    app.APP.player.showSubtitles(True)
+            self.current_kodi_sub_stream = kodi_index
+

 def playlist_item_from_kodi(kodi_item):
    """
@ -921,4 +1020,4 @@ def get_plextype_from_xml(xml):
    except (TypeError, IndexError, AttributeError):
        LOG.error('Could not get plex metadata for plex id %s', plex_id)
        return
-    return new_xml[0].attrib.get('type').decode('utf-8')
+    return new_xml[0].attrib.get('type')
--- a/resources/lib/playlists/init.py
+++ b/resources/lib/playlists/init.py
@ -11,7 +11,6 @@

 .. autoclass:: websocket
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from sqlite3 import OperationalError

--- a/resources/lib/playlists/common.py
+++ b/resources/lib/playlists/common.py
@ -1,8 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
-import Queue
+import queue
 import time
 import os
 import hashlib
@ -60,7 +59,7 @@ class Playlist(object):
        self.kodi_type = None
        self.kodi_hash = None

-    def __unicode__(self):
+    def __repr__(self):
        return ("{{"
                "'plex_id': {self.plex_id}, "
                "'plex_name': '{self.plex_name}', "
@ -71,16 +70,14 @@ class Playlist(object):
                "'kodi_hash': '{self.kodi_hash}'"
                "}}").format(self=self)

-    def __repr__(self):
-        return self.__unicode__().encode('utf-8')
-
-    def __str__(self):
-        return self.__repr__()
-
    def __bool__(self):
-        return (self.plex_id and self.plex_updatedat and self.plex_name and
-                self._kodi_path and self.kodi_filename and self.kodi_type and
-                self.kodi_hash)
+        return all((bool(self.plex_id),
+                    bool(self.plex_updatedat),
+                    bool(self.plex_name),
+                    bool(self._kodi_path),
+                    bool(self.kodi_filename),
+                    bool(self.kodi_type),
+                    bool(self.kodi_hash)))

    # Used for comparison of playlists
    @property
@ -127,12 +124,12 @@ def kodi_playlist_hash(path):

    There are probably way more efficient ways out there to do this
    """
-    stat = os.stat(path_ops.encode_path(path))
+    stat = os.stat(path)
    # stat.st_size is of type long; stat.st_mtime is of type float - hash both
    m = hashlib.md5()
-    m.update(repr(stat.st_size))
-    m.update(repr(stat.st_mtime))
-    return m.hexdigest().decode('utf-8')
+    m.update(repr(stat.st_size).encode())
+    m.update(repr(stat.st_mtime).encode())
+    return m.hexdigest()


 class PlaylistQueue(OrderedSetQueue):
@ -183,7 +180,7 @@ class PlaylistObserver(Observer):
        while time.time() - start < timeout:
            try:
                new_event, new_watch = event_queue.get(block=False)
-            except Queue.Empty:
+            except queue.Empty:
                app.APP.monitor.waitForAbort(0.2)
            else:
                event_queue.task_done()
--- a/resources/lib/playlists/db.py
+++ b/resources/lib/playlists/db.py
@ -4,14 +4,14 @@
 Synced playlists are stored in our plex.db. Interact with it through this
 module
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from .common import Playlist
 from ..plex_db import PlexDB
 from ..kodi_db import kodiid_from_filename
-from .. import path_ops, utils, variables as v
+from .. import utils, variables as v
 from ..exceptions import PlaylistError
+
 ###############################################################################
 LOG = getLogger('PLEX.playlists.db')

@ -94,7 +94,7 @@ def m3u_to_plex_ids(playlist):
    Adapter to process *.m3u playlist files. Encoding is not uniform!
    """
    plex_ids = list()
-    with open(path_ops.encode_path(playlist.kodi_path), 'rb') as f:
+    with open(playlist.kodi_path, 'rb') as f:
        text = f.read()
    try:
        text = text.decode(v.M3U_ENCODING)
--- a/resources/lib/playlists/kodi_pl.py
+++ b/resources/lib/playlists/kodi_pl.py
@ -3,7 +3,6 @@
 """
 Create and delete playlists on the Kodi side of things
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import re

@ -124,7 +123,7 @@ def _write_playlist_to_file(playlist, xml):
    text += '\n'
    text = text.encode(v.M3U_ENCODING, 'ignore')
    try:
-        with open(path_ops.encode_path(playlist.kodi_path), 'wb') as f:
+        with open(playlist.kodi_path, 'wb') as f:
            f.write(text)
    except EnvironmentError as err:
        LOG.error('Could not write Kodi playlist file: %s', playlist)
--- a/resources/lib/playlists/plex_pl.py
+++ b/resources/lib/playlists/plex_pl.py
@ -3,7 +3,6 @@
 """
 Create and delete playlists on the Plex side of things
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from . import pms, db
--- a/resources/lib/playlists/pms.py
+++ b/resources/lib/playlists/pms.py
@ -4,7 +4,6 @@
 Functions to communicate with the currently connected PMS in order to
 manipulate playlists
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from ..plex_api import API
@ -51,12 +50,12 @@ def initialize(playlist, plex_id):
    """
    LOG.debug('Initializing the playlist with Plex id %s on the Plex side: %s',
              plex_id, playlist)
+    url_path = utils.quote(f'/library/metadata/{plex_id}', safe='')
    params = {
        'type': v.PLEX_PLAYLIST_TYPE_FROM_KODI[playlist.kodi_type],
        'title': playlist.plex_name,
        'smart': 0,
-        'uri': ('library://None/item/%s' % (utils.quote('/library/metadata/%s'
-                                                        % plex_id, safe='')))
+        'uri': (f'library://None/item/{url_path}')
    }
    xml = DU().downloadUrl(url='{server}/playlists',
                           action_type='POST',
@ -78,9 +77,9 @@ def add_item(playlist, plex_id):
    Will set playlist.plex_updatedat
    Raises PlaylistError if that did not work out.
    """
+    url_path = utils.quote(f'/library/metadata/{plex_id}', safe='')
    params = {
-        'uri': ('library://None/item/%s' % (utils.quote('/library/metadata/%s'
-                                                        % plex_id, safe='')))
+        'uri': f'library://None/item/{url_path}'
    }
    xml = DU().downloadUrl(url='{server}/playlists/%s/items' % playlist.plex_id,
                           action_type='PUT',
@ -108,7 +107,7 @@ def add_items(playlist, plex_ids):
        'smart': 0,
        'uri': ('server://%s/com.plexapp.plugins.library/library/metadata/%s'
                % (app.CONN.machine_identifier,
-                   ','.join(unicode(x) for x in plex_ids)))
+                   ','.join(str(x) for x in plex_ids)))
    }
    xml = DU().downloadUrl(url='{server}/playlists/',
                           action_type='POST',
--- a/resources/lib/playqueue.py
+++ b/resources/lib/playqueue.py
@ -3,7 +3,6 @@
 """
 Monitors the Kodi playqueue and adjusts the Plex playqueue accordingly
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import copy

--- a/resources/lib/plex_api/init.py
+++ b/resources/lib/plex_api/init.py
@ -3,8 +3,6 @@
 """
 plex_api interfaces with all Plex Media Server (and plex.tv) xml responses
 """
-from __future__ import absolute_import, division, unicode_literals
-
 from .base import Base
 from .artwork import Artwork
 from .file import File
--- a/resources/lib/plex_api/artwork.py
+++ b/resources/lib/plex_api/artwork.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger

 from ..kodi_db import KodiVideoDB, KodiMusicDB
@ -48,10 +47,9 @@ class Artwork(object):
            except ValueError:
                # e.g. playlists
                pass
-            artwork = '%s?width=%s&height=%s' % (artwork, width, height)
-        artwork = ('%s/photo/:/transcode?width=1920&height=1920&'
-                   'minSize=1&upscale=0&url=%s'
-                   % (app.CONN.server, utils.quote(artwork)))
+            artwork = f'{artwork}?width={width}&height={height}'
+        artwork = (f'{app.CONN.server}/photo/:/transcode?width=1920&height=1920&'
+                   f'minSize=1&upscale=0&url={utils.quote(artwork)}')
        artwork = self.attach_plex_token_to_url(artwork)
        return artwork

@ -71,7 +69,7 @@ class Artwork(object):
            # either the season or the show
            return artworks
        for kodi_artwork, plex_artwork in \
-                v.KODI_TO_PLEX_ARTWORK_EPISODE.iteritems():
+                v.KODI_TO_PLEX_ARTWORK_EPISODE.items():
            art = self.one_artwork(plex_artwork)
            if art:
                artworks[kodi_artwork] = art
@ -109,7 +107,7 @@ class Artwork(object):
                with KodiMusicDB(lock=False) as kodidb:
                    return kodidb.get_art(kodi_id, kodi_type)

-        for kodi_artwork, plex_artwork in v.KODI_TO_PLEX_ARTWORK.iteritems():
+        for kodi_artwork, plex_artwork in v.KODI_TO_PLEX_ARTWORK.items():
            art = self.one_artwork(plex_artwork)
            if art:
                artworks[kodi_artwork] = art
--- a/resources/lib/plex_api/base.py
+++ b/resources/lib/plex_api/base.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from re import sub

@ -100,6 +99,13 @@ class Base(object):
        """
        return self.xml.get('type')

+    @property
+    def subtype(self):
+        """
+        Returns the subtype of media, e.g. 'clip' as string or None.
+        """
+        return self.xml.get('subtype')
+
    @property
    def section_id(self):
        self.check_db()
@ -375,9 +381,9 @@ class Base(object):
            total = int(self.xml.attrib['leafCount'])
            watched = int(self.xml.attrib['viewedLeafCount'])
            return {
-                'totalepisodes': unicode(total),
-                'watchedepisodes': unicode(watched),
-                'unwatchedepisodes': unicode(total - watched)
+                'totalepisodes': str(total),
+                'watchedepisodes': str(watched),
+                'unwatchedepisodes': str(total - watched)
            }
        except (KeyError, TypeError):
            pass
--- a/resources/lib/plex_api/fanart_lookup.py
+++ b/resources/lib/plex_api/fanart_lookup.py
@ -1,6 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from re import sub
 from string import punctuation
@ -32,7 +31,7 @@ def external_item_id(title, year, plex_type, collection):
    parameters = {
        'api_key': API_KEY,
        'language': v.KODILANGUAGE,
-        'query': title.encode('utf-8')
+        'query': title
    }
    data = DU().downloadUrl(url,
                            authenticate=False,
--- a/resources/lib/plex_api/file.py
+++ b/resources/lib/plex_api/file.py
@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-
 from .. import utils, variables as v, app


--- a/resources/lib/plex_api/media.py
+++ b/resources/lib/plex_api/media.py
@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
+import re

 from ..utils import cast
 from ..downloadutils import DownloadUtils as DU
@ -11,6 +11,9 @@ from .. import plex_functions as PF
 LOG = getLogger('PLEX.api')


+REGEX_VIDEO_FILENAME = re.compile(r'''\/file\.[a-zA-Z0-9]{1,5}$''')
+
+
 class Media(object):
    def optimized_for_streaming(self):
        """
@ -28,6 +31,21 @@ class Media(object):
        """
        return self.xml[0][self.part].get(key, self.xml[0].get(key))

+    def _from_stream_or_part(self, key):
+        """
+        Retrieves XML data 'key' first from the very first stream. If
+        unsuccessful, tries to retrieve the data from the active part.
+
+        If all fails, None is returned.
+        """
+        try:
+            value = self.xml[0][self.part][0].get(key)
+        except IndexError:
+            value = None
+        if value is None:
+            value = self.xml[0][self.part].get(key)
+        return value
+
    def intro_markers(self):
        """
        Returns a list of tuples with floats (startTimeOffset, endTimeOffset)
@ -72,6 +90,19 @@ class Media(object):
            answ['bitDepth'] = None
        return answ

+    def audio_codec(self):
+        """
+        Returns the audio codec.  If any data is not found on a part-level, the
+        Media-level data is returned. If that also fails (e.g. for old trailers,
+        None is returned)
+        """
+        return {
+            'bitrate': cast(int, self._from_stream_or_part('bitrate')),
+            'samplingrate': cast(int, self._from_stream_or_part('samplingRate')),
+            'channels': cast(int, self._from_stream_or_part('channels')),
+            'gain': cast(float, self._from_stream_or_part('gain'))
+        }
+
    def picture_codec(self):
        """
        Returns the exif metadata of pictures. This does NOT seem to be used
@ -259,6 +290,12 @@ class Media(object):
        headers = clientinfo.getXArgsDeviceInfo()
        if action == v.PLAYBACK_METHOD_DIRECT_PLAY:
            path = self.xml[self.mediastream][self.part].get('key')
+            # Kodi 19 will try to look for subtitles in the directory containing the file.
+            # '/' and '/file.*'' both point to the file, and Kodi will happily try to read
+            # the whole file without recognizing it isn't a directory.
+            # To get around that, we omit the filename here since it is unnecessary.
+            # We do this for library videos only, not for e.g. trailers (does not work)
+            path = REGEX_VIDEO_FILENAME.sub('/', path, count=1)
            # e.g. Trailers already feature an '?'!
            return utils.extend_url(app.CONN.server + path, headers)
        # Direct Streaming and Transcoding
@ -326,7 +363,7 @@ class Media(object):
                      response.status_code, response.text)
            return
        LOG.debug('Writing temp subtitle to %s', path)
-        with open(path_ops.encode_path(path), 'wb') as f:
+        with open(path, 'wb') as f:
            f.write(response.content)
        return path

@ -341,7 +378,8 @@ class Media(object):
            force_check : Will always try to check validity of path
                         Will also skip confirmation dialog if path not found
            folder     : Set to True if path is a folder
-            omit_check  : Will entirely omit validity check if True
+            omit_check  : Will entirely omit validity check if True. Will
+                          be superseded by force_check!
        """
        if path is None:
            return
@ -357,7 +395,13 @@ class Media(object):
                path = 'smb:' + path.replace('\\', '/')
        if app.SYNC.escape_path:
            path = utils.escape_path(path, app.SYNC.escape_path_safe_chars)
-        if (app.SYNC.path_verified and not force_check) or omit_check:
+        if force_check:
+            pass
+        elif omit_check:
+            return path
+        elif not app.SYNC.check_media_file_existence:
+            return path
+        elif app.SYNC.path_verified:
            return path

        # exist() needs a / or \ at the end to work for directories
--- a/resources/lib/plex_api/playback.py
+++ b/resources/lib/plex_api/playback.py
@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-
 from ..utils import cast


--- a/resources/lib/plex_api/user.py
+++ b/resources/lib/plex_api/user.py
@ -1,7 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, division, unicode_literals
-
 from ..utils import cast
 from .. import timing, variables as v, app

--- a/resources/lib/plex_companion.py
+++ b/resources/lib/plex_companion.py
@ -3,10 +3,9 @@
 """
 The Plex Companion master python file
 """
-from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
-from Queue import Empty
+from queue import Empty
 from socket import SHUT_RDWR
 from xbmc import executebuiltin

@ -143,11 +142,11 @@ class PlexCompanion(backgroundthread.KillableThread):
        app.CONN.plex_transient_token = data.get('key')
        params = {
            'mode': 'plex_node',
-            'key': '{server}%s' % data.get('key'),
+            'key': f"{{server}}{data.get('key')}",
            'offset': data.get('offset')
        }
-        handle = 'RunPlugin(plugin://%s)' % utils.extend_url(v.ADDON_ID, params)
-        executebuiltin(handle.encode('utf-8'))
+        handle = f'RunPlugin(plugin://{utils.extend_url(v.ADDON_ID, params)})'
+        executebuiltin(handle)

    @staticmethod
    def _process_playlist(data):
@ -192,19 +191,7 @@ class PlexCompanion(backgroundthread.KillableThread):
        playqueue = PQ.get_playqueue_from_type(
            v.KODI_PLAYLIST_TYPE_FROM_PLEX_TYPE[data['type']])
        pos = js.get_position(playqueue.playlistid)
-        if 'audioStreamID' in data:
-            index = playqueue.items[pos].kodi_stream_index(
-                data['audioStreamID'], 'audio')
-            app.APP.player.setAudioStream(index)
-        elif 'subtitleStreamID' in data:
-            if data['subtitleStreamID'] == '0':
-                app.APP.player.showSubtitles(False)
-            else:
-                index = playqueue.items[pos].kodi_stream_index(
-                    data['subtitleStreamID'], 'subtitle')
-                app.APP.player.setSubtitleStream(index)
-        else:
-            LOG.error('Unknown setStreams command: %s', data)
+        playqueue.items[pos].on_plex_stream_change(data)

    @staticmethod
    def _process_refresh(data):
@ -301,7 +288,7 @@ class PlexCompanion(backgroundthread.KillableThread):
            start_count = 0
            while True:
                try:
-                    httpd = listener.ThreadedHTTPServer(
+                    httpd = listener.PKCHTTPServer(
                        client,
                        subscription_manager,
                        ('', v.COMPANION_PORT),
@ -335,7 +322,7 @@ class PlexCompanion(backgroundthread.KillableThread):
            try:
                message_count += 1
                if httpd:
-                    if not thread.isAlive():
+                    if not thread.is_alive():
                        # Use threads cause the method will stall
                        thread = Thread(target=httpd.handle_request)
                        thread.start()
--- a/Show more
+++ b/Show more