--- misc/xbmc/plugin.video.todic/default.py 2016/11/24 18:55:35 3150 +++ misc/xbmc/plugin.video.todic/default.py 2016/12/01 13:43:40 3158 @@ -3,7 +3,7 @@ ''' Todic plugin for XBMC - Version 0.0.21a + Version 0.1.3 ''' import sys @@ -60,7 +60,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 +80,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 @@ -122,29 +109,32 @@ 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,14 +143,12 @@ self.lastReport = now self.reportPlaytime("playing") - - - def reportPlaytime(self, subaction): - url = __backend__ + "&action=playbacktime&subaction=" + subaction + "&time=" + str( self.playingPosition ) - open_url_safe(url) - print "[Todic] reportPlaytime:" + url - + 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): @@ -205,7 +193,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 @@ -222,7 +210,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=" @@ -242,12 +230,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' @@ -298,12 +286,38 @@ 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")) ) + 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() @@ -325,11 +339,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( @@ -354,7 +368,7 @@ if xbmc.Player().isPlaying(): if os.path.isfile(subtitlesfile): player.setSubtitles(subtitlesfile) - print 'TODIC started subtitles' + print '[Todic] started subtitles' else: player.disableSubtitles() @@ -381,8 +395,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") @@ -394,8 +408,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")