--- misc/xbmc/plugin.video.todic/default.py 2016/11/24 19:55:00 3151 +++ misc/xbmc/plugin.video.todic/default.py 2017/09/18 06:48:10 3210 @@ -3,7 +3,7 @@ ''' Todic plugin for XBMC - Version 0.0.21b + Version 1.7 ''' import sys @@ -24,7 +24,17 @@ __addon__ = xbmcaddon.Addon(id='plugin.video.todic') __key__ = __addon__.getSetting('xbmckey').lower() +__entrypoint__ = __addon__.getSetting('entrypoint').lower() __backend__ = "https://todic.dk/xbmc.php?xbmckey=" + __key__ + +if __entrypoint__ == "alternative": + __backend__ = "https://alt.todic.dk/xbmc.php?xbmckey=" + __key__ + +if __entrypoint__ == "testing": + __backend__ = "https://todic.dk/xbmc-beta.php?xbmckey=" + __key__ + + + fanartImage = os.path.join(__addon__.getAddonInfo('path'), 'movie_bg_blur.jpg') datapath = xbmc.translatePath( 'special://profile/addon_data/plugin.video.todic/') @@ -60,7 +70,7 @@ def onInit(self): - print "[Todic] MovieDialog ONINIT" + print "[Todic] MovieDialog onInit" self.getControl(1).setLabel(self.name) self.getControl(2).setLabel(self.moviegroups) self.getControl(3).setLabel(self.description) @@ -80,29 +90,16 @@ #self.starwidth = (float(self.imdbrating) / 10.0) * orig_img_width #self.getControl(40).setWidth(int(self.starwidth)) + def setDetailsDoc(self, detailsDoc): + print "[Todic] MovieDialog setDetailsDoc:" + self.imdbrating = getText(detailsDoc.getElementsByTagName("imdbrating")) + self.moviegroups = getText(detailsDoc.getElementsByTagName("moviegroups")) + self.playlength = getText(detailsDoc.getElementsByTagName("playlength")) + self.codecdetails = getText(detailsDoc.getElementsByTagName("codecdetails")) + self.position = int( getText(detailsDoc.getElementsByTagName("position")) ) + def setUrl(self, url): - print "[Todic] MovieDialog SETURL:" + url self.url = url - self.fetchClipDetails() - - - - def fetchClipDetails(self): - param1 = parse_parameter_string(self.url) - - self.clipkey = param1["clipkey"] - print "CLIPKEY:" + self.clipkey - detailurl = __backend__ + "&action=clipdetails&clipkey=" + self.clipkey - print "[Todic] detailURL = " + detailurl - - xml = open_url(detailurl) - - doc = parseString(xml) - self.imdbrating = getText(doc.getElementsByTagName("imdbrating")) - self.moviegroups = getText(doc.getElementsByTagName("moviegroups")) - self.playlength = getText(doc.getElementsByTagName("playlength")) - self.codecdetails = getText(doc.getElementsByTagName("codecdetails")) - self.position = int( getText(doc.getElementsByTagName("position")) ) def setName(self, name): self.name = name @@ -115,36 +112,39 @@ def __init__(self, *args, **kwargs): # xbmc.Player.__init__(selv,*args,**kwargs) - xbmc.Player.__init__(self, xbmc.PLAYER_CORE_MPLAYER) + xbmc.Player.__init__(self) self.stopped = False self.started = False self.playingPosition = 0.0 self.lastReport = 0 print "[TodicPlayer] init" -# @catchall def onPlayBackStarted(self): self.started = True print "[TodicPlayer] : started" -# super.onPlayBackStarted() #When user presses stop, we report back the the position registered in the last call to self.tick() def onPlayBackStopped(self): self.stopped = True print "[TodicPlayer] : stopped" self.reportPlaytime("stopped") -# url = __backend__ + "&action=playbacktime&subaction=stopped&time=" + str( self.playingPosition ) -# open_url_safe(url) + + def onPlayBackPaused(self): + print "[TodicPlayer] : paused" + self.reportPlaytime("paused") + + def onPlayBackResumed(self): + print "[TodicPlayer] : resumed" + self.reportPlaytime("resumed") def onPlayBackEnded(self): self.stopped = True print "[TodicPlayer] : ended" self.reportPlaytime("ended") -# url = __backend__ + "&action=playbacktime&subaction=ended&time=" - # open_url_safe(url) def tick(self): + #print "[Todic] Tick: " + str( self.isPlaying() ) if ( self.isPlaying() ): self.playingPosition = self.getTime() now = time() @@ -153,16 +153,12 @@ self.lastReport = now self.reportPlaytime("playing") - - - def reportPlaytime(self, subaction): if (self.playingPosition > 60): url = __backend__ + "&action=playbacktime&subaction=" + subaction + "&time=" + str( self.playingPosition ) print "[Todic] reportPlaytime:" + url open_url_safe(url) - def getText2(nodelist): @@ -207,7 +203,7 @@ try: return open_url(url) except: - print "[Todic ]Some error during open_url call to ", url + print "[Todic] Some error during open_url call to ", url @@ -224,7 +220,7 @@ # Adde xtra items to root menu listitem = xbmcgui.ListItem( - label="Søg film ...", iconImage='DefaultFolder.png', thumbnailImage='DefaultFolder.png') + label="Søg Film ...", iconImage='DefaultFolder.png', thumbnailImage='DefaultFolder.png') listitem.setProperty('Fanart_Image', fanartImage) u = sys.argv[0] + "?mode=10&name=" @@ -244,12 +240,12 @@ def buildList(url, title, endlist=True): - print '[TODIC]:' + str(url) + print '[Todic]:' + str(url) link = open_url(url) doc = parseString(link) ty = doc.getElementsByTagName("meta")[0].getAttribute("type") - print '[TODIC]' + str(ty) + print '[Todic]' + str(ty) if ty == 'clipList': mode = '50' @@ -260,12 +256,11 @@ entries = doc.getElementsByTagName("entry") l = len(entries) - description = '' + for entry in entries: name = getText(entry.getElementsByTagName("title")) url = getText(entry.getElementsByTagName("url")) thumb = getText(entry.getElementsByTagName("cover")) - description = getText(entry.getElementsByTagName("description")) playcount = getText(entry.getElementsByTagName("playcount")) @@ -276,22 +271,19 @@ # print "name:" + name # print "url:" + url # print "thumb:" + thumb -# print "description:" + description listitem = xbmcgui.ListItem( label=name, label2='test', iconImage='DefaultFolder.png', thumbnailImage=thumb) listitem.setProperty('Fanart_Image', fanartImage) if mode == '50': infoLabels = {} infoLabels['title'] = name - infoLabels['plot'] = description infoLabels['playcount'] = playcount listitem.setInfo('video', infoLabels) name = name.encode('UTF-8') - description = description.encode('UTF-8') u = sys.argv[0] + "?mode=" + urllib.quote(mode) + "&name=" + urllib.quote( - name) + "&url=" + urllib.quote(url) + "&description=" + urllib.quote(description) + name) + "&url=" + urllib.quote(url) xbmcplugin.addDirectoryItem( handle=int(sys.argv[1]), url=u, listitem=listitem, isFolder=folder, totalItems=l) @@ -299,13 +291,41 @@ xbmcplugin.endOfDirectory(int(sys.argv[1])) -def play_video(url, name, description): +def play_video(url, name): + description = "" + playPosition = 0 + savedPosition = 0 + try: + param1 = parse_parameter_string(url) + clipkey = param1["clipkey"] + + print "[Todic] ClipKey:" + clipkey + detailurl = __backend__ + "&action=clipdetails&clipkey=" + clipkey + print "[Todic] detailURL = " + detailurl + + xml = open_url(detailurl) + + clipDetailsDoc = parseString(xml) + savedPosition = int( getText(clipDetailsDoc.getElementsByTagName("position")) ) + description = getText(clipDetailsDoc.getElementsByTagName("description")) + except: + print "[Todic] Unexpected error:", sys.exc_info()[0] + if (description == None or description == ""): - play_real_video(url, name, 0) + if (savedPosition > 0): + dialog = xbmcgui.Dialog() + #yes / true -afspil fra position + answer = dialog.yesno(heading='Todic', line1='Afspil fra sidste position', nolabel='Fra start', yeslabel='Fortsæt') + if (answer == True): + playPosition = savedPosition + + play_real_video(url, name, playPosition) + else: d = TodicMovieDialog() - d.setUrl(url) + d.setDetailsDoc(clipDetailsDoc) d.setName(name) + d.setUrl(url) d.setDescription(description) d.doModal() @@ -327,11 +347,11 @@ if os.path.isfile(subtitlesfile): os.unlink(subtitlesfile) - print '[TODIC] subs: ' + str(subtitleurl) + print '[Todic] subs: ' + str(subtitleurl) if len(subtitleurl) > 0: subtitles = open_url(subtitleurl) SaveFile(subtitlesfile, subtitles) - print 'TODIC downloaded subtitles' + print '[Todic] downloaded subtitles' image = xbmc.getInfoImage('ListItem.Thumb') listitem = xbmcgui.ListItem( @@ -340,7 +360,7 @@ listitem.setProperty('ResumeTime', '300') listitem.setProperty('TotalTime', '3000') - player = TodicPlayer(xbmc.PLAYER_CORE_AUTO) + player = TodicPlayer() player.play(str(url), listitem) # kan ikke loade subtitles hvis foerend playeren koerer @@ -356,9 +376,9 @@ if xbmc.Player().isPlaying(): if os.path.isfile(subtitlesfile): player.setSubtitles(subtitlesfile) - print 'TODIC started subtitles' + print '[Todic] started subtitles' else: - player.disableSubtitles() + player.showSubtitles(False) if (position > 0): @@ -383,8 +403,8 @@ url = __backend__ + "&action=search&search=" + \ urllib.quote_plus(search) - # print "[TODIC] Search start: " + search - # print "[TODIC] Search url: " + url + # print "[Todic] Search start: " + search + # print "[Todic] Search url: " + url buildList(url, "søgning") @@ -396,8 +416,8 @@ url = __backend__ + "&action=searchseries&search=" + \ urllib.quote_plus(search) - # print "[TODIC] Search start: " + search - # print "[TODIC] Search url: " + url + # print "[Todic] Search start: " + search + # print "[Todic] Search url: " + url buildList(url, "serie søgning") @@ -453,7 +473,6 @@ url = None name = None mode = None -description = None #print params @@ -470,10 +489,6 @@ mode = int(params["mode"]) except: pass -try: - description = urllib.unquote_plus(params["description"]) -except: - pass @@ -507,4 +522,4 @@ elif mode == 50: - play_video(url, name, description) + play_video(url, name)