Merge branch 'hotfixes'

README.md

@@ -1,5 +1,5 @@
-[![stable version](https://img.shields.io/badge/stable_version-1.8.8-blue.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect/bin/repository.plexkodiconnect/repository.plexkodiconnect-1.0.0.zip) 
+[![stable version](https://img.shields.io/badge/stable_version-1.8.9-blue.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect/bin/repository.plexkodiconnect/repository.plexkodiconnect-1.0.0.zip) 
-[![beta version](https://img.shields.io/badge/beta_version-1.8.8-red.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect_BETA/bin-BETA/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.0.zip)
+[![beta version](https://img.shields.io/badge/beta_version-1.8.9-red.svg?maxAge=60&style=flat) ](https://dl.bintray.com/croneter/PlexKodiConnect_BETA/bin-BETA/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.0.zip)
 
 [![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/Installation)
 [![FAQ](https://img.shields.io/badge/wiki-FAQ-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/faq)

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="1.8.8" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="1.8.9" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.3.0" />
@@ -59,7 +59,11 @@
     <summary lang="da_DK">Indbygget Integration af Plex i Kodi</summary>
     <description lang="da_DK">Tilslut Kodi til din Plex Media Server. Dette plugin forudsætter, at du administrere alle dine videoer med Plex (og ikke med Kodi). Du kan miste data som allerede er gemt i Kodi video og musik-databaser (dette plugin ændrer direkte i dem). Brug på eget ansvar!</description>
     <disclaimer lang="da_DK">Brug på eget ansvar</disclaimer>
-    <news>version 1.8.8
+    <news>version 1.8.9
+- Fix playback not starting in some circumstances 
+- Deactivate some annoying popups on install 
+
+version 1.8.8
 - Fix playback not starting in some circumstances
 - Fix first artist "missing" tag (Reset your DB!) 
 - Update Czech translation

changelog.txt

@@ -1,3 +1,7 @@
+version 1.8.9
+- Fix playback not starting in some circumstances 
+- Deactivate some annoying popups on install 
+
 version 1.8.8
 - Fix playback not starting in some circumstances
 - Fix first artist "missing" tag (Reset your DB!) 

resources/lib/PlexAPI.py

@@ -49,7 +49,7 @@ from xbmcvfs import exists
 import clientinfo as client
 from downloadutils import DownloadUtils
 from utils import window, settings, language as lang, tryDecode, tryEncode, \
-    DateToKodi, exists_dir
+    DateToKodi, exists_dir, slugify
 from PlexFunctions import PMSHttpsEnabled
 import plexdb_functions as plexdb
 import variables as v
@@ -2396,10 +2396,13 @@ class API():
             return
         else:
             log.debug('Writing temp subtitle to %s' % path)
-            r.encoding = 'utf-8'
+            try:
                 with open(path, 'wb') as f:
-                # r.content does not always seem to be encoded!
+                    f.write(r.content)
-                f.write(tryEncode(r.content))
+            except UnicodeEncodeError:
+                log.debug('Need to slugify the filename %s' % path)
+                with open(slugify(path), 'wb') as f:
+                    f.write(r.content)
             return path
 
     def GetKodiPremierDate(self):

resources/lib/initialsetup.py

@@ -496,10 +496,10 @@ class InitialSetup():
 
         # 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=lang(29999), line1=lang(39076))
+        # dialog.ok(heading=lang(29999), line1=lang(39076))
 
         # Need to tell about our image source for collections: themoviedb.org
-        dialog.ok(heading=lang(29999), line1=lang(39717))
+        # dialog.ok(heading=lang(29999), line1=lang(39717))
         # Make sure that we only ask these questions upon first installation
         settings('InstallQuestionsAnswered', value='true')
 

resources/lib/utils.py

@@ -221,6 +221,16 @@ def tryDecode(string, encoding='utf-8'):
     return string
 
 
+def slugify(text):
+    """
+    Normalizes text (in unicode or string) to e.g. enable safe filenames.
+    Returns unicode
+    """
+    if not isinstance(text, unicode):
+        text = unicode(text)
+    return unicode(normalize('NFKD', text).encode('ascii', 'ignore'))
+
+
 def escape_html(string):
     """
     Escapes the following: