Merge branch 'beta-version'

README.md

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

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.2.12" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.2.13" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -73,7 +73,13 @@
     <summary lang="uk_UA">Нативна інтеграція Plex в Kodi</summary>
     <description lang="uk_UA">Підключає Kodi до серверу Plex. Цей плагін передбачає, що ви керуєте всіма своїми відео за допомогою Plex (і ніяк не Kodi). Ви можете втратити дані, які вже зберігаються у відео та музичних БД Kodi (оскільки цей плагін безпосередньо їх змінює). Використовуйте на свій страх і ризик!</description>
     <disclaimer lang="uk_UA">Використовуйте на свій ризик</disclaimer>
-    <news>version 2.2.12 (beta only):
+    <news>version 2.2.13 (beta only):
+- Fix library sync crash
+- Fix switching to __future__ module
+- Fix "Prefer Kodi Artwork" toggle doing the exact opposite
+- Fix "Prefer Kodi artwork" setting not being visible
+
+version 2.2.12 (beta only):
 - Fix slow sync. Fix endless sync of corrupted PMS elements
 - Refactor playlist code
 - Fix FutureWarning

changelog.txt

@@ -1,3 +1,9 @@
+version 2.2.13 (beta only):
+- Fix library sync crash
+- Fix switching to __future__ module
+- Fix "Prefer Kodi Artwork" toggle doing the exact opposite
+- Fix "Prefer Kodi artwork" setting not being visible
+
 version 2.2.12 (beta only):
 - Fix slow sync. Fix endless sync of corrupted PMS elements
 - Refactor playlist code

resources/lib/artwork.py

@@ -1,6 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, division, unicode_literals
-###############################################################################
 from logging import getLogger
 from Queue import Queue, Empty
 from urllib import quote_plus, unquote

resources/lib/clientinfo.py

@@ -1,6 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, division, unicode_literals
-###############################################################################
 from logging import getLogger
 
 from . import utils

resources/lib/command_pipeline.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 import logging
 from threading import Thread
 from xbmc import sleep

resources/lib/companion.py

@@ -1,6 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 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
 

resources/lib/context.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import xbmcgui
 

resources/lib/context_entry.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import xbmc
 import xbmcgui

resources/lib/downloadutils.py

@@ -1,6 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, division, unicode_literals
-###############################################################################
 from logging import getLogger
 import xml.etree.ElementTree as etree
 import requests

resources/lib/entrypoint.py

@@ -1,9 +1,10 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#
+"""
-# Loads of different functions called in SEPARATE Python instances through
+Loads of different functions called in SEPARATE Python instances through
-# e.g. plugin://... calls. Hence be careful to only rely on window variables.
+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
 from sys import argv
 from urllib import urlencode

resources/lib/initialsetup.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from Queue import Queue
 import xml.etree.ElementTree as etree

resources/lib/itemtypes.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from ntpath import dirname
 from datetime import datetime
@@ -119,7 +120,7 @@ class Items(object):
                 setid = self.kodi_db.create_collection(setname)
                 external_set_artwork = api.set_artwork()
                 if (external_set_artwork and
-                        utils.settings('PreferKodiCollectionArt') == 'false'):
+                        utils.settings('PreferKodiCollectionArt') == 'true'):
                     # Need to make sure we are not overwriting existing Plex
                     # collection artwork
                     plex_artwork = api.artwork(kodi_id=setid,

resources/lib/json_rpc.py

@@ -1,7 +1,10 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 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
 

resources/lib/kodidb_functions.py

@@ -1,8 +1,9 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#
+"""
-# Connect to the Kodi databases (video and music) and operate on them
+Connect to the Kodi databases (video and music) and operate on them
-#
+"""
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from ntpath import dirname
 from sqlite3 import IntegrityError

resources/lib/kodimonitor.py

@@ -1,6 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 PKC Kodi Monitoring implementation
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from json import loads
 from threading import Thread

resources/lib/library_sync/fanart.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 from Queue import Empty

resources/lib/library_sync/get_metadata.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 from Queue import Empty

resources/lib/library_sync/process_metadata.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 from Queue import Empty

resources/lib/library_sync/sync_info.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread, Lock
 from xbmc import sleep

resources/lib/librarysync.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 import Queue

resources/lib/loghandler.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 import logging
 import xbmc
 ###############################################################################

resources/lib/migration.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 
 from . import variables as v

resources/lib/music.py

@@ -1,4 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from xml.etree.ElementTree import ParseError
 

resources/lib/path_ops.py

@@ -1,12 +1,16 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# File and Path operations
+"""
-#
+File and Path operations
-# Kodi xbmc*.*() functions usually take utf-8 encoded commands, thus try_encode
+
-# works.
+Kodi xbmc*.*() functions usually take utf-8 encoded commands, thus try_encode
-# Unfortunatly, working with filenames and paths seems to require an encoding in
+works.
-# the OS' getfilesystemencoding - it will NOT always work with unicode paths.
+Unfortunatly, working with filenames and paths seems to require an encoding in
-# However, sys.getfilesystemencoding might return None.
+the OS' getfilesystemencoding - it will NOT always work with unicode paths.
-# Feed unicode to all the functions below and you're fine.
+However, sys.getfilesystemencoding might return None.
+Feed unicode to all the functions below and you're fine.
+"""
+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

resources/lib/pickler.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from cPickle import dumps, loads
 from xbmcgui import Window
 from xbmc import log, LOGDEBUG

resources/lib/pkc_listitem.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from xbmcgui import ListItem
 
 

resources/lib/playback.py

@@ -1,6 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 Used to kick off Kodi playback
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 from xbmc import Player, sleep

resources/lib/playback_starter.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 from urlparse import parse_qsl

resources/lib/playlist_func.py

@@ -3,6 +3,7 @@
 """
 Collection of functions associated with Kodi and Plex playlists and playqueues
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import urllib
 from urlparse import parse_qsl, urlsplit

resources/lib/playlists/__init__.py

@@ -14,6 +14,7 @@ Triggers a full re-sync of playlists
 
 PlaylistError is thrown if anything wierd happens
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 
 from .common import Playlist, PlaylistError, PlaylistObserver

resources/lib/playlists/common.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import Queue
 import time
@@ -64,6 +65,8 @@ class Playlist(object):
         self.kodi_hash = None
 
     def __repr__(self):
+        for attr in self.__dict__:
+            LOG.debug('attr %s: %s', attr, type(attr))
         return ("{{"
                 "'plex_id': {self.plex_id}, "
                 "'plex_name': '{self.plex_name}', "

resources/lib/playlists/db.py

@@ -4,6 +4,7 @@
 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, PlaylistError

resources/lib/playlists/kodi_pl.py

@@ -3,6 +3,7 @@
 """
 Create and delete playlists on the Kodi side of things
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 
 from .common import Playlist, PlaylistError

resources/lib/playlists/plex_pl.py

@@ -3,6 +3,7 @@
 """
 Create and delete playlists on the Plex side of things
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 
 from .common import PlaylistError

resources/lib/playlists/pms.py

@@ -4,6 +4,7 @@
 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
 import urllib
 

resources/lib/playqueue.py

@@ -1,6 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 Monitors the Kodi playqueue and adjusts the Plex playqueue accordingly
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 import xbmc

resources/lib/playutils.py

@@ -1,6 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, division, unicode_literals
-###############################################################################
 from logging import getLogger
 
 from .downloadutils import DownloadUtils as DU

resources/lib/plex_api.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
 Taken from iBaa, https://github.com/iBaa/PlexConnect
@@ -29,6 +30,7 @@ http://stackoverflow.com/questions/2407126/python-urllib2-basic-auth-problem
 http://stackoverflow.com/questions/111945/is-there-any-way-to-do-http-put-in-python
 (and others...)
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from re import sub
 from urllib import urlencode, unquote, quote

resources/lib/plex_companion.py

@@ -1,6 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 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

resources/lib/plex_functions.py

@@ -1,4 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from urllib import urlencode, quote_plus
 from ast import literal_eval

resources/lib/plex_tv.py

@@ -1,4 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from xbmc import sleep, executebuiltin
 

resources/lib/plexbmchelper/httppersist.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import httplib
 import traceback

resources/lib/plexbmchelper/listener.py

@@ -1,6 +1,9 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 Plex Companion listener
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from re import sub
 from SocketServer import ThreadingMixIn

resources/lib/plexbmchelper/plexgdm.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 PlexGDM.py - Version 0.2
 
@@ -21,6 +23,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 MA 02110-1301, USA.
 """
+from __future__ import absolute_import, division, unicode_literals
 import logging
 import socket
 import threading

resources/lib/plexbmchelper/subscribers.py

@@ -1,7 +1,10 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 Manages getting playstate from Kodi and sending it to the PMS as well as
 subscribed Plex Companion clients.
 """
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 

resources/lib/plexdb_functions.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from . import utils
 from . import variables as v
 

resources/lib/service_entry.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 import logging
 import sys
 import xbmc

resources/lib/state.py

@@ -1,5 +1,9 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# THREAD SAFE
+"""
+THREAD SAFE
+"""
+from __future__ import absolute_import, division, unicode_literals
 from threading import Lock, RLock
 
 

resources/lib/userclient.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from threading import Thread
 

resources/lib/utils.py

@@ -1,8 +1,9 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 """
 Various functions and decorators for PKC
 """
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 from cProfile import Profile
 from pstats import Stats

resources/lib/variables.py

@@ -1,4 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, unicode_literals
 import os
 import sys
 import xbmc

resources/lib/videonodes.py

@@ -1,5 +1,6 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-###############################################################################
+from __future__ import absolute_import, division, unicode_literals
 from logging import getLogger
 import xml.etree.ElementTree as etree
 import xbmc

resources/lib/websocket.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 """
 websocket - WebSocket client library for Python
 
@@ -18,8 +20,6 @@ Copyright (C) 2010 Hiroki Ohtani(liris)
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 """
-
-
 import socket
 
 try:

resources/lib/websocket_client.py

@@ -1,18 +1,13 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
-
-###############################################################################
 from logging import getLogger
-import websocket
 from json import loads
 import xml.etree.ElementTree as etree
 from threading import Thread
 from ssl import CERT_NONE
 from xbmc import sleep
 
-from . import utils
+from . import websocket, utils, companion, state, variables as v
-from . import companion
-from . import state
-from . import variables as v
 
 ###############################################################################
 

resources/settings.xml

@@ -131,9 +131,9 @@
 
 	<category label="30544"><!-- artwork -->
 		<setting id="enableTextureCache" label="30512"  type="bool" default="true" /> <!-- Cache all artwork for a smooth Kodi experience -->
-		<setting id="FanartTV" label="30539" type="bool" default="false" /><!-- Download additional art from FanArtTV -->
+        <setting id="PreferKodiCollectionArt" label="30543" type="bool" default="true" /><!-- Prefer Kodi artwork for collections -->
-        <setting id="PreferKodiCollectionArt" label="30543" type="bool" default="true" visible="eq(-1,true)" subsetting="true"/><!-- Prefer Kodi artwork for collections -->
+        <setting id="FanartTV" label="30539" type="bool" default="false" /><!-- Download additional art from FanArtTV -->
-		<setting label="39222" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect/?mode=fanart)" option="close" visible="eq(-2,true)" subsetting="true" /> <!-- Look for missing fanart on FanartTV now -->
+		<setting label="39222" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect/?mode=fanart)" option="close" visible="eq(-1,true)" subsetting="true" /> <!-- Look for missing fanart on FanartTV now -->
         <setting id="imageSyncNotifications" label="30008" type="bool" default="true" /><!-- Enable notifications for image caching -->
         <setting id="imageSyncDuringPlayback" label="30009" type="bool" default="true" /><!-- Enable image caching during Kodi playback (restart Kodi!) -->
 		<setting label="39020" type="action" action="RunPlugin(plugin://plugin.video.plexkodiconnect/?mode=texturecache)" option="close" /> <!-- Cache all images to Kodi texture cache now -->