--- misc/xbmc/plugin.video.todic/default.py 2016/11/23 09:44:02 3146 +++ misc/xbmc/plugin.video.todic/default.py 2019/02/28 11:03:28 3250 @@ -3,7 +3,7 @@ ''' Todic plugin for XBMC - Version 0.0.18 + Version 1.7.3 ''' import sys @@ -24,7 +24,19 @@ __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__ + +print( "[Todic] entrypoint: " + __entrypoint__ ) +print( "[Todic] backend: " + __backend__ ) + + fanartImage = os.path.join(__addon__.getAddonInfo('path'), 'movie_bg_blur.jpg') datapath = xbmc.translatePath( 'special://profile/addon_data/plugin.video.todic/') @@ -42,49 +54,54 @@ def __init__(self): super(TodicMovieDialog, self).__init__() + self.position = 0 def onClick(self, controlId): - print "OnClick: " + str(controlId) + print( "[Todic] MovieDialog OnClick: " + str(controlId) ) if (controlId == 50): self.close() - play_real_video(self.url, self.name) + play_real_video(self.url, self.name, 0) + + if (controlId == 51): + self.close() + play_real_video(self.url, self.name, self.position) if (controlId == 98): self.close() def onInit(self): - print "ONINIT" + print( "[Todic] MovieDialog onInit" ) self.getControl(1).setLabel(self.name) self.getControl(2).setLabel(self.moviegroups) self.getControl(3).setLabel(self.description) self.getControl(10).setLabel(self.playlength) self.getControl(11).setLabel(self.codecdetails) - orig_img_width = self.getControl(40).getWidth() - self.starwidth = (float(self.imdbrating) / 10.0) * orig_img_width - self.getControl(40).setWidth(int(self.starwidth)) + if (self.position > 0): + self.getControl(51).setVisible(True) + self.getControl(50).setPosition(100, 570) + self.getControl(51).setPosition(450, 570) + self.getControl(50).controlLeft( self.getControl(51) ) + self.getControl(50).controlRight( self.getControl(51) ) + else: + self.getControl(51).setVisible(False) + + #orig_img_width = self.getControl(40).getWidth() + #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 "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 - - 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")) def setName(self, name): self.name = name @@ -97,49 +114,57 @@ 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" + print( "[TodicPlayer] init") -# @catchall def onPlayBackStarted(self): self.started = True - print "[TodicPlayer] : started" -# super.onPlayBackStarted() + print( "[TodicPlayer] : started") #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" - url = __backend__ + "&action=playbacktime&subaction=stopped&time=" + str( self.playingPosition ) - open_url_safe(url) + print( "[TodicPlayer] : stopped") + self.reportPlaytime("stopped") + + 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" - url = __backend__ + "&action=playbacktime&subaction=ended&time=" - open_url_safe(url) + print( "[TodicPlayer] : ended") + self.reportPlaytime("ended") def tick(self): + #print "[Todic] Tick: " + str( self.isPlaying() ) if ( self.isPlaying() ): - self.playingPosition = self.getTime() - now = time() - #print "[Todic] tick " + str(now) + " " + str(self.lastReport) + " : " +str(now - self.lastReport) - if ( (now - self.lastReport) > 60.0): - self.reportPlaytime() - self.lastReport = now - + tmpTime = self.getTime() + #only report time if it has changed in the mean time + if tmpTime != self.playingPosition: + self.playingPosition = tmpTime + now = time() + #print "[Todic] tick " + str(now) + " " + str(self.lastReport) + " : " +str(now - self.lastReport) + if ( (now - self.lastReport) > 60.0): + 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 reportPlaytime(self): - url = __backend__ + "&action=playbacktime&subaction=playing&time=" + str( self.playingPosition ) - open_url_safe(url) - print "[Todic] reportPlaytime:" + url - def getText2(nodelist): @@ -184,7 +209,7 @@ try: return open_url(url) except: - print "Some error during open_url call to ", url + print( "[Todic] Some error during open_url call to ", url) @@ -201,7 +226,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=" @@ -221,12 +246,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' @@ -237,14 +262,14 @@ 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")) + if playcount == '': playcount = '0' playcount = int(playcount) @@ -252,22 +277,21 @@ # 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) + listitem.addContextMenuItems([('Refresh', 'Container.Refresh')]) + 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) @@ -275,45 +299,71 @@ 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) + 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() -def play_real_video(url, name): +def play_real_video(url, name, position): xml = open_url(url) - print 'TODIC url: ' + str(url) - print 'TODIC xml: ' + xml + print( '[Todic] url: ' + str(url) ) + print( '[Todic] xml: ' + xml ) + print( '[Todic] pos: ' + str(position) ) doc = parseString(xml) url = getText(doc.getElementsByTagName("url")) subtitleurl = getText(doc.getElementsByTagName("subtitles")) - subtitlesfile = os.path.join(datapath, 'temp.srt') - # if old srt file exists delete it first - if os.path.isfile(subtitlesfile): - os.unlink(subtitlesfile) - print '[TODIC] subs: ' + str(subtitleurl) - if len(subtitleurl) > 0: - subtitles = open_url(subtitleurl) - SaveFile(subtitlesfile, subtitles) - print 'TODIC downloaded subtitles' + print( '[Todic] subs: ' + str(subtitleurl) ) image = xbmc.getInfoImage('ListItem.Thumb') listitem = xbmcgui.ListItem( label=name, iconImage='DefaultVideo.png', thumbnailImage=image) listitem.setInfo(type="Video", infoLabels={"Title": name}) + listitem.setProperty('ResumeTime', '300') + listitem.setProperty('TotalTime', '3000') - player = TodicPlayer(xbmc.PLAYER_CORE_AUTO) + if len(subtitleurl) > 0: + listitem.setSubtitles([subtitleurl]) + + player = TodicPlayer() player.play(str(url), listitem) # kan ikke loade subtitles hvis foerend playeren koerer @@ -324,21 +374,23 @@ if count > 10: break + + if xbmc.Player().isPlaying(): - if os.path.isfile(subtitlesfile): - player.setSubtitles(subtitlesfile) - print 'TODIC started subtitles' - else: - player.disableSubtitles() - #Holder python kørernde indtil at det bliver bedt om at stoppe - while (not xbmc.abortRequested): - player.tick() - xbmc.sleep(250) + if (position > 0): + while (player.getTotalTime() == 0.0): #Vent indtil vi har beregnet hvor langt klippet er + xbmc.sleep(250) + + print( "[Todic] totalTime " + str( player.getTotalTime() )) + player.seekTime(position) + #Holder python kørernde indtil at det bliver bedt om at stoppe + while (not xbmc.abortRequested): + player.tick() + xbmc.sleep(500) -# player.callbackLoop() def search(): @@ -348,8 +400,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") @@ -361,8 +413,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") @@ -418,7 +470,9 @@ url = None name = None mode = None -description = None + + +#print params try: url = urllib.unquote_plus(params["url"]) @@ -432,10 +486,9 @@ mode = int(params["mode"]) except: pass -try: - description = urllib.unquote_plus(params["description"]) -except: - pass + + + try: open_url("http://todic.dk") @@ -466,4 +519,4 @@ elif mode == 50: - play_video(url, name, description) + play_video(url, name)