diff --git a/resources/lib/utils.py b/resources/lib/utils.py index 52f9c81f..4c11baac 100644 --- a/resources/lib/utils.py +++ b/resources/lib/utils.py @@ -418,8 +418,8 @@ def reset(): addon = xbmcaddon.Addon() addondir = xbmc.translatePath(addon.getAddonInfo('profile')).decode('utf-8') dataPath = "%ssettings.xml" % addondir - xbmcvfs.delete(dataPath) - logMsg("EMBY", "Deleting: settings.xml", 1) + xbmcvfs.delete(dataPath.encode('utf-8')) + logMsg("PLEX", "Deleting: settings.xml", 1) dialog.ok( heading="Emby for Kodi", @@ -676,9 +676,9 @@ def passwordsXML(): sound=False) def playlistXSP(mediatype, tagname, viewid, viewtype="", delete=False): - # Tagname is in unicode - actions: add or delete - tagname = tagname.encode('utf-8') - + """ + Feed with tagname as unicode + """ path = xbmc.translatePath("special://profile/playlists/video/").decode('utf-8') if viewtype == "mixed": plname = "%s - %s" % (tagname, mediatype) @@ -688,15 +688,15 @@ def playlistXSP(mediatype, tagname, viewid, viewtype="", delete=False): xsppath = "%sPlex %s.xsp" % (path, viewid) # Create the playlist directory - if not xbmcvfs.exists(path): + if not xbmcvfs.exists(path.encode('utf-8')): logMsg("PLEX", "Creating directory: %s" % path, 1) - xbmcvfs.mkdirs(path) + xbmcvfs.mkdirs(path.encode('utf-8')) # Only add the playlist if it doesn't already exists - if xbmcvfs.exists(xsppath): - + if xbmcvfs.exists(xsppath.encode('utf-8')): + logMsg('Path %s does exist' % xsppath, 1) if delete: - xbmcvfs.delete(xsppath) + xbmcvfs.delete(xsppath.encode('utf-8')) logMsg("PLEX", "Successfully removed playlist: %s." % tagname, 1) return @@ -707,21 +707,22 @@ def playlistXSP(mediatype, tagname, viewid, viewtype="", delete=False): } logMsg("Plex", "Writing playlist file to: %s" % xsppath, 1) try: - f = xbmcvfs.File(xsppath, 'w') + f = xbmcvfs.File(xsppath.encode('utf-8'), 'wb') except: logMsg("Plex", "Failed to create playlist: %s" % xsppath, -1) return else: - f.write( + f.write(( '\n' '\n\t' 'Plex %s\n\t' 'all\n\t' '\n\t\t' '%s\n\t' - '' + '\n' '' % (itemtypes.get(mediatype, mediatype), plname, tagname)) + .encode('utf-8')) f.close() logMsg("Plex", "Successfully added playlist: %s" % tagname) @@ -729,26 +730,26 @@ def deletePlaylists(): # Clean up the playlists path = xbmc.translatePath("special://profile/playlists/video/").decode('utf-8') - dirs, files = xbmcvfs.listdir(path) + dirs, files = xbmcvfs.listdir(path.encode('utf-8')) for file in files: - if file.decode('utf-8').startswith('Emby'): - xbmcvfs.delete("%s%s" % (path, file)) + if file.decode('utf-8').startswith('Plex'): + xbmcvfs.delete(("%s%s" % (path, file.decode('utf-8'))).encode('utf-8')) def deleteNodes(): # Clean up video nodes import shutil path = xbmc.translatePath("special://profile/library/video/").decode('utf-8') - dirs, files = xbmcvfs.listdir(path) + dirs, files = xbmcvfs.listdir(path.encode('utf-8')) for dir in dirs: - if dir.decode('utf-8').startswith('Emby'): + if dir.decode('utf-8').startswith('Plex'): try: shutil.rmtree("%s%s" % (path, dir.decode('utf-8'))) except: - logMsg("EMBY", "Failed to delete directory: %s" % dir.decode('utf-8')) + logMsg("PLEX", "Failed to delete directory: %s" % dir.decode('utf-8')) for file in files: - if file.decode('utf-8').startswith('emby'): + if file.decode('utf-8').startswith('plex'): try: - xbmcvfs.delete("%s%s" % (path, file.decode('utf-8'))) + xbmcvfs.delete(("%s%s" % (path, file.decode('utf-8'))).encode('utf-8')) except: - logMsg("EMBY", "Failed to file: %s" % file.decode('utf-8')) \ No newline at end of file + logMsg("PLEX", "Failed to file: %s" % file.decode('utf-8')) \ No newline at end of file diff --git a/resources/lib/videonodes.py b/resources/lib/videonodes.py index 40865369..f5f68f9c 100644 --- a/resources/lib/videonodes.py +++ b/resources/lib/videonodes.py @@ -65,21 +65,21 @@ class VideoNodes(object): "special://profile/library/video/Plex-%s/" % dirname).decode('utf-8') # Verify the video directory - if not xbmcvfs.exists(path): + if not xbmcvfs.exists(path.encode('utf-8')): shutil.copytree( src=xbmc.translatePath("special://xbmc/system/library/video").decode('utf-8'), dst=xbmc.translatePath("special://profile/library/video").decode('utf-8')) - xbmcvfs.exists(path) + xbmcvfs.exists(path.encode('utf-8')) # Create the node directory - if not xbmcvfs.exists(nodepath) and not mediatype == "photo": + if not xbmcvfs.exists(nodepath.encode('utf-8')) and not mediatype == "photo": # We need to copy over the default items - xbmcvfs.mkdirs(nodepath) + xbmcvfs.mkdirs(nodepath.encode('utf-8')) else: if delete: - dirs, files = xbmcvfs.listdir(nodepath) + dirs, files = xbmcvfs.listdir(nodepath.encode('utf-8')) for file in files: - xbmcvfs.delete(nodepath + file) + xbmcvfs.delete((nodepath + file).encode('utf-8')) self.logMsg("Sucessfully removed videonode: %s." % tagname, 1) return @@ -239,7 +239,7 @@ class VideoNodes(object): # To do: add our photos nodes to kodi picture sources somehow continue - if xbmcvfs.exists(nodeXML): + if xbmcvfs.exists(nodeXML.encode('utf-8')): # Don't recreate xml if already exists continue