--- misc/xbmc/plugin.video.todic/default.py 2019/02/18 17:38:13 3244 +++ misc/xbmc/plugin.video.todic/default.py 2021/02/20 10:08:38 3262 @@ -3,7 +3,7 @@ ''' Todic plugin for XBMC - Version 1.7.1 + Version 1.9.0 ''' import sys @@ -13,9 +13,10 @@ import xbmc import xbmcaddon import xbmcgui +import xbmcvfs import xbmcplugin import urllib -import urllib2 +import urllib.request # import pprint @@ -27,18 +28,19 @@ __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( +datapath = xbmcvfs.translatePath( 'special://profile/addon_data/plugin.video.todic/') ADDON_PATH = __addon__.getAddonInfo('path') @@ -57,7 +59,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 +74,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 +95,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,42 +121,42 @@ 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() ) + #print( "[Todic] Tick: " + str( self.isPlaying() ) ) if ( self.isPlaying() ): - tmpTime = self.getTime(): + 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) + #print( "[Todic] tick " + str(now) + " " + str(self.lastReport) + " : " +str(now - self.lastReport) ) if ( (now - self.lastReport) > 60.0): self.lastReport = now self.reportPlaytime("playing") @@ -162,7 +164,7 @@ 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) @@ -196,11 +198,12 @@ def open_url(url): - req = urllib2.Request(url) - content = urllib2.urlopen(req) - data = content.read() - content.close() - return data + with urllib.request.urlopen(url) as req: + #data = response.read() + #return data + charset=req.info().get_content_charset() + content=req.read().decode(charset) + return content # wraps open url in a catch-all exception handler @@ -209,24 +212,28 @@ 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.parse.quote(kodi_ver) + "&todicplugin=" + urllib.parse.quote(plugin_ver) - msg = open_url(__backend__ + "&action=messages") + msg = open_url(msgurl) msg = msg.strip() if msg != "": + print("[Todic] rootMenu Dialog =" + str(msg)) dialog = xbmcgui.Dialog() dialog.ok('XBMC Todic', msg) buildList(__backend__, "", False) # call default list # Adde xtra items to root menu - listitem = xbmcgui.ListItem( - label="Søg Film ...", iconImage='DefaultFolder.png', thumbnailImage='DefaultFolder.png') + listitem = xbmcgui.ListItem(label="Søg Film ...") + listitem.setArt( { 'icon':'DefaultFolder.png', 'thumb':'DefaultFolder.png'} ) listitem.setProperty('Fanart_Image', fanartImage) u = sys.argv[0] + "?mode=10&name=" @@ -234,8 +241,8 @@ handle=int(sys.argv[1]), url=u, listitem=listitem, isFolder=True) # add search series - listitem = xbmcgui.ListItem( - label="Søg Serier ...", iconImage='DefaultFolder.png', thumbnailImage='DefaultFolder.png') + listitem = xbmcgui.ListItem(label="Søg Serier ...") + listitem.setArt( { 'icon':'DefaultFolder.png', 'thumb':'DefaultFolder.png'} ) listitem.setProperty('Fanart_Image', fanartImage) u = sys.argv[0] + "?mode=11&name=" @@ -246,12 +253,12 @@ def buildList(url, title, endlist=True): - print '[Todic]:' + str(url) + print( '[Todic::buildList]:' + 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' @@ -276,20 +283,24 @@ # print "name:" + name # print "url:" + url -# print "thumb:" + thumb - listitem = xbmcgui.ListItem( - label=name, label2='test', iconImage='DefaultFolder.png', thumbnailImage=thumb) +# print "thumb:" + thumbi + listitem = xbmcgui.ListItem(label=name, label2='test') + listitem.setArt( {'icon': 'DefaultFolder.png'} ) listitem.setProperty('Fanart_Image', fanartImage) + listitem.addContextMenuItems([('Refresh', 'Container.Refresh')]) + listitem.setArt( {'thumb': thumb} ) + 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') - u = sys.argv[0] + "?mode=" + urllib.quote(mode) + "&name=" + urllib.quote( - name) + "&url=" + urllib.quote(url) + u = sys.argv[0] + "?mode=" + urllib.parse.quote(mode) + "&name=" + urllib.parse.quote(name) + "&url=" + urllib.parse.quote(url) xbmcplugin.addDirectoryItem( handle=int(sys.argv[1]), url=u, listitem=listitem, isFolder=folder, totalItems=l) @@ -305,9 +316,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) @@ -315,7 +326,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): @@ -339,66 +350,39 @@ 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: ' + str(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 = xbmcgui.ListItem(label=name) + listitem.setArt( {'icon': 'DefaultVideo.png', 'thumb':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 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) + if len(subtitleurl) > 0: + listitem.setSubtitles([subtitleurl]) - 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 - while (not xbmc.abortRequested): + kodiMonitor = xbmc.Monitor() + + + while (not kodiMonitor.abortRequested()): player.tick() - xbmc.sleep(500) + kodiMonitor.waitForAbort( 1 ) @@ -407,7 +391,7 @@ if (search != None and search != ""): url = __backend__ + "&action=search&search=" + \ - urllib.quote_plus(search) + urllib.parse.quote(search) # print "[Todic] Search start: " + search # print "[Todic] Search url: " + url @@ -420,7 +404,7 @@ if (search != None and search != ""): url = __backend__ + "&action=searchseries&search=" + \ - urllib.quote_plus(search) + urllib.parse.quote(search) # print "[Todic] Search start: " + search # print "[Todic] Search url: " + url @@ -431,6 +415,8 @@ #=================================== Tool Box ======================================= # shows a more userfriendly notification def showMessage(heading, message): + print( "[Todic::showMessage] " + str(message) ) + print( message ) duration = 15 * 1000 xbmc.executebuiltin('XBMC.Notification("%s", "%s", %s)' % (heading, message, duration)) @@ -484,11 +470,11 @@ #print params try: - url = urllib.unquote_plus(params["url"]) + url = urllib.parse.unquote(params["url"]) except: pass try: - name = urllib.unquote_plus(params["name"]) + name = urllib.parse.unquote(params["name"]) except: pass try: @@ -496,11 +482,13 @@ except: pass - +print( "[Todic] url=" + str(url)) +print( "[Todic] name=" + str(name)) +print( "[Todic] mode=" + str(mode)) try: - open_url("http://todic.dk") + open_url("https://todic.dk") except: showMessage("Fejl", "Kunne ikke forbinde til todic.dk") exit()