ukamnya
/
plugin.video.torrenter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rus fixes

pull/3/head
DiMartinoXBMC 2016-03-14 20:38:33 +03:00
parent ccfcbf6089
commit ef6584dd8c
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Libtorrent.py
View File

@ -126,17 +126,17 @@ class Libtorrent:
#baseName = localize_path(os.path.basename(self.getFilePath())) #baseName = localize_path(os.path.basename(self.getFilePath()))
if not xbmcvfs.exists(self.torrentFilesPath): if not xbmcvfs.exists(self.torrentFilesPath):
xbmcvfs.mkdirs(self.torrentFilesPath) xbmcvfs.mkdirs(self.torrentFilesPath)
newFile = self.torrentFilesPath + self.md5( newFile = self.torrentFilesPath + self.md5(torrentUrl) + '.torrent'
torrentUrl) + '.torrent' #self.md5(baseName) + '.' + if newFile != torrentFile:
if xbmcvfs.exists(newFile): if xbmcvfs.exists(newFile):
xbmcvfs.delete(newFile) xbmcvfs.delete(newFile)
if not xbmcvfs.exists(newFile): if not xbmcvfs.exists(newFile):
try: try:
xbmcvfs.rename(torrentFile, newFile) xbmcvfs.rename(torrentFile, newFile)
except Exception, e: except Exception, e:
log('Unable to rename torrent file from %s to %s in Torrent::renameTorrent. Exception: %s' % log('Unable to rename torrent file from %s to %s in Torrent::renameTorrent. Exception: %s' %
(torrentFile, newFile, str(e))) (torrentFile, newFile, str(e)))
return return
self.torrentFile = newFile self.torrentFile = newFile
if not self.torrentFileInfo: if not self.torrentFileInfo:
e=self.lt.bdecode(xbmcvfs.File(self.torrentFile,'rb').read()) e=self.lt.bdecode(xbmcvfs.File(self.torrentFile,'rb').read())

15
functions.py
View File

@ -2049,14 +2049,17 @@ def localize_path(path):
import chardet import chardet
if not isinstance(path, unicode): path = path.decode(chardet.detect(path)['encoding']) if not isinstance(path, unicode): path = path.decode(chardet.detect(path)['encoding'])
if not sys.platform.startswith('win'): if not sys.platform.startswith('win'):
path = path.encode(True and sys.getfilesystemencoding() or 'utf-8') path = encode_msg(path)
return path return path
def delocalize_path(path): def encode_msg(msg):
import chardet try:
if not isinstance(path, unicode): path = path.decode(chardet.detect(path)['encoding']) msg = isinstance(msg, unicode) and msg.encode(True and sys.getfilesystemencoding() or 'utf-8') or msg
path = path.encode('utf-8') except:
return path import traceback
log(traceback.format_exc())
msg = msg.encode('utf-8')
return msg
def get_platform(): def get_platform():
ret = { ret = {