--- misc/xbmc/plugin.video.todic/default.py 2017/09/18 18:06:48 3211 +++ misc/xbmc/plugin.video.todic/default.py 2019/03/10 21:37:47 3259 @@ -3,7 +3,7 @@ ''' Todic plugin for XBMC - Version 1.7 + Version 1.8.1 ''' import sys @@ -27,15 +27,16 @@ __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__ + __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__ + __backend__ = "https://todic.dk/xbmc-beta.php?xbmckey=" + __key__ +print( "[Todic] entrypoint: " + __entrypoint__ ) +print( "[Todic] backend: " + __backend__ ) +print( "[Todic] version: " + __addon__.getAddonInfo('version') ) fanartImage = os.path.join(__addon__.getAddonInfo('path'), 'movie_bg_blur.jpg') datapath = xbmc.translatePath( @@ -57,7 +58,7 @@ self.position = 0 def onClick(self, controlId): - print "[Todic] MovieDialog OnClick: " + str(controlId) + print( "[Todic] MovieDialog OnClick: " + str(controlId) ) if (controlId == 50): self.close() @@ -72,7 +73,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) @@ -93,7 +94,7 @@ #self.getControl(40).setWidth(int(self.starwidth)) def setDetailsDoc(self, detailsDoc): - print "[Todic] MovieDialog setDetailsDoc:" + print( "[Todic] MovieDialog setDetailsDoc:") self.imdbrating = getText(detailsDoc.getElementsByTagName("imdbrating")) self.moviegroups = getText(detailsDoc.getElementsByTagName("moviegroups")) self.playlength = getText(detailsDoc.getElementsByTagName("playlength")) @@ -119,46 +120,50 @@ self.started = False self.playingPosition = 0.0 self.lastReport = 0 - print "[TodicPlayer] init" + print( "[TodicPlayer] init") def onPlayBackStarted(self): self.started = True - print "[TodicPlayer] : started" + 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" + print( "[TodicPlayer] : stopped") self.reportPlaytime("stopped") def onPlayBackPaused(self): - print "[TodicPlayer] : paused" + print( "[TodicPlayer] : paused") self.reportPlaytime("paused") def onPlayBackResumed(self): - print "[TodicPlayer] : resumed" + print( "[TodicPlayer] : resumed") self.reportPlaytime("resumed") def onPlayBackEnded(self): self.stopped = True - print "[TodicPlayer] : ended" + 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.lastReport = now - self.reportPlaytime("playing") + 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 + print( "[Todic] reportPlaytime:" + url) open_url_safe(url) @@ -205,13 +210,16 @@ 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) def rootMenu(): + kodi_ver = xbmc.getInfoLabel('System.BuildVersion') + plugin_ver = __addon__.getAddonInfo('version') + msgurl = __backend__ + "&action=messages&kodi=" + urllib.quote_plus(kodi_ver) + "&todicplugin=" + urllib.quote_plus(plugin_ver) - msg = open_url(__backend__ + "&action=messages") + msg = open_url(msgurl) msg = msg.strip() if msg != "": @@ -242,12 +250,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' @@ -274,12 +282,16 @@ # print "url:" + url # print "thumb:" + thumb listitem = xbmcgui.ListItem( - label=name, label2='test', iconImage='DefaultFolder.png', thumbnailImage=thumb) + label=name, label2='test', iconImage='DefaultFolder.png') listitem.setProperty('Fanart_Image', fanartImage) + listitem.addContextMenuItems([('Refresh', 'Container.Refresh')]) + if mode == '50': infoLabels = {} infoLabels['title'] = name infoLabels['playcount'] = playcount + if playcount > 0: + listitem.setArt( {'thumb': thumb} ) #not pretty - but at least we can show a different icon for unwatched/watched in kodi18 listitem.setInfo('video', infoLabels) name = name.encode('UTF-8') @@ -301,9 +313,9 @@ param1 = parse_parameter_string(url) clipkey = param1["clipkey"] - print "[Todic] ClipKey:" + clipkey + print( "[Todic] ClipKey:" + clipkey) detailurl = __backend__ + "&action=clipdetails&clipkey=" + clipkey - print "[Todic] detailURL = " + detailurl + print( "[Todic] detailURL = " + detailurl) xml = open_url(detailurl) @@ -311,7 +323,7 @@ savedPosition = int( getText(clipDetailsDoc.getElementsByTagName("position")) ) description = getText(clipDetailsDoc.getElementsByTagName("description")) except: - print "[Todic] Unexpected error:", sys.exc_info()[0] + print( "[Todic] Unexpected error:", sys.exc_info()[0] ) if (description == None or description == ""): if (savedPosition > 0): @@ -335,60 +347,30 @@ def play_real_video(url, name, position): xml = open_url(url) - print '[Todic] url: ' + str(url) - print '[Todic] xml: ' + xml - print '[Todic] pos: ' + str(position) + 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() - player.play(str(url), listitem) - - # kan ikke loade subtitles hvis foerend playeren koerer - count = 0 - while not xbmc.Player().isPlaying(): - xbmc.sleep(250) - count += 1 - if count > 10: - break + listitem.setProperty('StartOffset', str(position) ) + if len(subtitleurl) > 0: + listitem.setSubtitles([subtitleurl]) - if xbmc.Player().isPlaying(): - if os.path.isfile(subtitlesfile): - player.setSubtitles(subtitlesfile) - print '[Todic] started subtitles' - else: - player.showSubtitles(False) - - - 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) + player = TodicPlayer() + player.play(str(url), listitem) #Holder python kørernde indtil at det bliver bedt om at stoppe