Post merge fix

pull/5/head
Sergey Shramchenko 2016-03-17 23:04:48 +02:00
parent fe40d79f2c
commit 27e68911bf
1 changed files with 1 additions and 3 deletions

View File

@ -1467,9 +1467,7 @@ class Core:
if not torrent: torrent = Downloader.Torrent(self.userStorageDirectory, if not torrent: torrent = Downloader.Torrent(self.userStorageDirectory,
torrentFilesDirectory=self.torrentFilesDirectory) torrentFilesDirectory=self.torrentFilesDirectory)
self.__settings__.setSetting("lastTorrent", torrent.saveTorrent(url)) self.__settings__.setSetting("lastTorrent", torrent.saveTorrent(url))
self.drawFolder(torrent, tdir, url, 'openTorrent', thumbnail, save_folder)
def drawFolder(self, torrent, tdir, url, vstyle, thumbnail='', save_folder=''):
hasSize = False hasSize = False
contentList = [] contentList = []
for filedict in torrent.getContentList(): for filedict in torrent.getContentList():
@ -1505,7 +1503,7 @@ class Core:
link = {'url': identifier, 'thumbnail': thumbnail, 'save_folder':save_folder} link = {'url': identifier, 'thumbnail': thumbnail, 'save_folder':save_folder}
self.drawItem(title, 'playTorrent', link, image=thumbnail, isFolder=False, self.drawItem(title, 'playTorrent', link, image=thumbnail, isFolder=False,
action2=ids_video.rstrip(','), contextMenu=contextMenu, replaceMenu=False, fileSize=filesize) action2=ids_video.rstrip(','), contextMenu=contextMenu, replaceMenu=False, fileSize=filesize)
view_style(vstyle) view_style('openTorrent')
p_handle = int(sys.argv[1]) p_handle = int(sys.argv[1])
try: try:
xbmcplugin.addSortMethod(p_handle, xbmcplugin.SORT_METHOD_LABEL) xbmcplugin.addSortMethod(p_handle, xbmcplugin.SORT_METHOD_LABEL)