Merge pull request #61 from viorel-m/master

Fix Kodi17 context menu when is default action, fix kickass contenter movie thumb
pull/15/head
DiMartinoXBMC 2016-11-24 18:06:13 +03:00 committed by GitHub
commit 0656286fa6
2 changed files with 23 additions and 3 deletions

24
Core.py
View File

@ -1693,8 +1693,28 @@ class Core:
xbmcplugin.endOfDirectory(handle=int(sys.argv[1]), succeeded=True) xbmcplugin.endOfDirectory(handle=int(sys.argv[1]), succeeded=True)
def context(self, params={}): def context(self, params={}):
xbmc.executebuiltin("Action(ContextMenu)") if int(self.version_check()[:2]) < 17:
sys.exit() xbmc.executebuiltin("Action(ContextMenu)")
sys.exit()
else:
fixed = xbmcgui.Dialog().contextmenu(list=[(self.localize('Open')),
(self.localize('Download via Libtorrent')),
(self.localize('Download via T-client'))])
if fixed == 0:
xbmc.executebuiltin('XBMC.Container.Update(%s)' %
('%s?action=%s&url=%s') %
(sys.argv[0], 'openTorrent', params['url']))
elif fixed == 1:
xbmc.executebuiltin('XBMC.RunPlugin(%s)' %
('%s?action=%s&url=%s') %
(sys.argv[0], 'downloadLibtorrent', params['url']))
elif fixed == 2:
xbmc.executebuiltin('XBMC.RunPlugin(%s)' %
('%s?action=%s&url=%s') %
(sys.argv[0], 'downloadFilesList', params['url']))
def version_check(self):
return xbmc.getInfoLabel( "System.BuildVersion" )
def downloadFilesList(self, params={}): def downloadFilesList(self, params={}):
from resources.utorrent.net import Download from resources.utorrent.net import Download

View File

@ -143,7 +143,7 @@ class KickAssSo(Content.Content):
'kinopoisk': ''} 'kinopoisk': ''}
try: try:
img = result.find('a', {'class': 'movieCover'}).find('img').get('src') img = result.find('a', {'class': 'movieCover'}).find('img').get('src')
movieInfo['poster'] = 'http:' + img movieInfo['poster'] = img if img.startswith('http:') else 'http:' + img
except: except:
pass pass
try: try: