From 4c058b199faa39fcad060b6b4cbd3307dc456402 Mon Sep 17 00:00:00 2001 From: inpos Date: Sat, 19 Mar 2016 20:41:43 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D1=8E=D0=BD=D0=B8=D0=BA=D0=BE=D0=B4=20-=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D1=8E=D0=BD=D0=B8=D0=BA=D0=BE=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inposloader.py | 4 ++-- functions.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Inposloader.py b/Inposloader.py index 6f5caf3..c6c456c 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, localize_path, 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) From fc526e5ed814fb7225fb69ec27661d2d61f60a28 Mon Sep 17 00:00:00 2001 From: inpos Date: Sat, 19 Mar 2016 20:44:25 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BB=D0=B8=D1=88=D0=BD=D1=8F=D1=8F=20?= =?UTF-8?q?=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inposloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Inposloader.py b/Inposloader.py index c6c456c..7045d8e 100644 --- a/Inposloader.py +++ b/Inposloader.py @@ -29,7 +29,7 @@ import xbmcgui import xbmcvfs import xbmcaddon import Localization -from functions import encode_msg, localize_path, isSubtitle, is_writable, file_url +from functions import encode_msg, isSubtitle, is_writable, file_url import os