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

Merge pull request #42 from srg70/master 

Old player fix
pull/3/head
DiMartinoXBMC 2016-03-16 01:00:53 +03:00
parent ef6584dd8c b45b8641eb
commit 1974c5a41a
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Libtorrent.py
View File

@ -123,25 +123,32 @@ class Libtorrent:
log('Exception: ' + str(e)) log('Exception: ' + str(e))
xbmcvfs.delete(torrentFile) xbmcvfs.delete(torrentFile)
return return
#baseName = localize_path(os.path.basename(self.getFilePath()))
if not xbmcvfs.exists(self.torrentFilesPath): self.torrentFile = torrentFile
xbmcvfs.mkdirs(self.torrentFilesPath)
newFile = self.torrentFilesPath + self.md5(torrentUrl) + '.torrent'
if newFile != torrentFile:
if xbmcvfs.exists(newFile):
xbmcvfs.delete(newFile)
if not xbmcvfs.exists(newFile):
try:
xbmcvfs.rename(torrentFile, newFile)
except Exception, e:
log('Unable to rename torrent file from %s to %s in Torrent::renameTorrent. Exception: %s' %
(torrentFile, newFile, str(e)))
return
self.torrentFile = newFile
if not self.torrentFileInfo:
e=self.lt.bdecode(xbmcvfs.File(self.torrentFile,'rb').read())
self.torrentFileInfo = self.lt.torrent_info(e)
return self.torrentFile return self.torrentFile
#baseName = localize_path(os.path.basename(self.getFilePath()))
#if not xbmcvfs.exists(self.torrentFilesPath):
# xbmcvfs.mkdirs(self.torrentFilesPath)
#newFile = self.torrentFilesPath + self.md5(
# torrentUrl) + '.torrent' #self.md5(baseName) + '.' +
#if xbmcvfs.exists(newFile):
# log('saveTorrent: delete file ' + newFile)
# xbmcvfs.delete(newFile)
#if not xbmcvfs.exists(newFile):
# try:
# renamed = xbmcvfs.rename(torrentFile, newFile)
# log('saveTorrent: xbmcvfs.rename %s %s to %s' %(torrentFile, newFile, str(renamed)))
# except Exception, e:
# log('Unable to rename torrent file from %s to %s in Torrent::renameTorrent. Exception: %s' %
# (torrentFile, newFile, str(e)))
# return
#self.torrentFile = newFile
#if not self.torrentFileInfo:
# e=self.lt.bdecode(xbmcvfs.File(self.torrentFile,'rb').read())
# self.torrentFileInfo = self.lt.torrent_info(e)
# log('torrentFileInfo (saveTorrent2)=' + str(self.torrentFileInfo))
#return self.torrentFile
def getMagnetInfo(self): def getMagnetInfo(self):
magnetSettings = { magnetSettings = {
@ -424,7 +431,7 @@ class Libtorrent:
#'storage_mode': self.lt.storage_mode_t(1), #'storage_mode': self.lt.storage_mode_t(1),
'paused': False, 'paused': False,
#'auto_managed': False, #'auto_managed': False,
#'duplicate_is_error': True 'duplicate_is_error': True
} }
if self.save_resume_data: if self.save_resume_data:
log('loading resume data') log('loading resume data')