--- misc/xbmc/plugin.video.todic/default.py 2015/06/14 16:42:08 2591 +++ misc/xbmc/plugin.video.todic/default.py 2015/06/29 11:34:00 2592 @@ -3,7 +3,7 @@ ''' Todic plugin for XBMC - Version 0.0.10 + Version 0.0.13 ''' import sys @@ -26,6 +26,45 @@ fanartImage = os.path.join(__addon__.getAddonInfo('path'), 'fanart.jpg') datapath = xbmc.translatePath('special://profile/addon_data/plugin.video.todic/') +ADDON_PATH = __addon__.getAddonInfo('path') +SkinMasterPath = os.path.join(ADDON_PATH, 'skins' ) + '/' +MySkinPath = (os.path.join(SkinMasterPath, '720p')) + '/' +MySkin = 'main.xml' + + +class TodicMovieDialog(xbmcgui.WindowXMLDialog): + def __new__(cls): + return super(TodicMovieDialog, cls).__new__(cls, "main.xml", ADDON_PATH) + + def __init__(self): + super(TodicMovieDialog, self).__init__() + + def onClick( self, controlId ): + print "OnClick: " + str(controlId) + + if (controlId == 50): + self.close() + play_real_video(self.url, self.name) + + if ( controlId == 98 ): + self.close() + + + def onInit(self): + + print "ONINIT" + self.getControl( 1 ).setLabel( self.name); + self.getControl( 2 ).setLabel( self.description ); + + def setUrl( self, url): + self.url = url + + def setName( self, name ): + self.name = name + + def setDescription( self, description ): + self.description = description + class TodicPlayer(xbmc.Player): def __init__(self, *args, **kwargs): @@ -166,7 +205,7 @@ description = description.encode('UTF-8') - u = sys.argv[0] + "?mode=" + urllib.quote(mode) + "&name=" + urllib.quote(name) + "&url=" + urllib.quote(url) + u = sys.argv[0] + "?mode=" + urllib.quote(mode) + "&name=" + urllib.quote(name) + "&url=" + urllib.quote(url) + "&description=" + urllib.quote(description) ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url = u, listitem = listitem, isFolder = folder, totalItems = l) if (endlist == True): @@ -175,8 +214,20 @@ -def play_video(url, name): - xml = open_url(url) +def play_video(url, name,description): + if (description == None or description == ""): + play_real_video(url,name) + else: + d = TodicMovieDialog() + d.setUrl( url) + d.setName( name ) + d.setDescription( description ) + + d.doModal() + + +def play_real_video(url, name): + xml = open_url(url) print 'TODIC url: ' + str(url) print 'TODIC xml: '+ xml @@ -298,6 +349,7 @@ url = None name = None mode = None +description = None try: url = urllib.unquote_plus(params["url"]) @@ -311,6 +363,10 @@ mode = int(params["mode"]) except: pass +try: + description = urllib.unquote_plus(params["description"]) +except: + pass try: open_url("http://todic.dk") @@ -340,7 +396,7 @@ elif mode == 50: - play_video(url, name) + play_video(url, name, description)