diff --git a/Inposloader.py b/Inposloader.py index 6f5caf3..7045d8e 100644 --- a/Inposloader.py +++ b/Inposloader.py @@ -29,7 +29,7 @@ import xbmcgui import xbmcvfs import xbmcaddon import Localization -from functions import localize_path, isSubtitle, is_writable, file_url +from functions import encode_msg, isSubtitle, is_writable, file_url import os @@ -607,7 +607,7 @@ class InposPlayer(xbmc.Player): def _get_status_lines(self, s, f): return [ - localize_path(self.display_name), + encode_msg(self.display_name), "%.2f%% %s" % (f.progress * 100, self.localize(STATE_STRS[s.state])), "D:%.2f%s U:%.2f%s S:%d P:%d" % (s.download_rate, self.localize('kb/s'), s.upload_rate, self.localize('kb/s'), diff --git a/functions.py b/functions.py index 3f4f15d..3ca767a 100644 --- a/functions.py +++ b/functions.py @@ -423,10 +423,10 @@ def cutFolder(contentList, tdir=None): if len(contentList) > 1: common_folder = contentList[0][0] debug('[cutFolder]: common_folder '+common_folder) - if u'\\' in common_folder: - common_folder = common_folder.split(u'\\')[0] - elif u'/' in common_folder: - common_folder = common_folder.split(u'/')[0] + if '\\' in common_folder: + common_folder = common_folder.split('\\')[0] + elif '/' in common_folder: + common_folder = common_folder.split('/')[0] common = True for item in contentList: @@ -441,10 +441,10 @@ def cutFolder(contentList, tdir=None): #debug('[cutFolder]: item[0] '+item[0]) - if u'\\' in item[0]: - dir = item[0].split(u'\\')[0] - elif u'/' in item[0]: - dir = item[0].split(u'/')[0] + if '\\' in item[0]: + dir = item[0].split('\\')[0] + elif '/' in item[0]: + dir = item[0].split('/')[0] elif not tdir: contentListNew.append(item)