--- misc/xbmc/plugin.video.todic/default.py 2019/02/28 11:10:40 3251 +++ misc/xbmc/plugin.video.todic/default.py 2021/02/19 21:39:29 3261 @@ -3,7 +3,7 @@ ''' Todic plugin for XBMC - Version 1.7.3 + 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,6 +28,7 @@ __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__ @@ -35,10 +37,10 @@ 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') @@ -146,7 +148,7 @@ self.reportPlaytime("ended") def tick(self): - #print "[Todic] Tick: " + str( self.isPlaying() ) + #print( "[Todic] Tick: " + str( self.isPlaying() ) ) if ( self.isPlaying() ): tmpTime = self.getTime() @@ -154,7 +156,7 @@ 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") @@ -196,11 +198,9 @@ 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 response: + data = response.read() + return data # wraps open url in a catch-all exception handler @@ -214,8 +214,11 @@ 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 != "": @@ -225,8 +228,8 @@ 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 +237,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,7 +249,7 @@ def buildList(url, title, endlist=True): - print( '[Todic]:' + str(url) ) + print( '[Todic::buildList]:' + str(url) ) link = open_url(url) doc = parseString(link) @@ -276,22 +279,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) @@ -342,7 +347,7 @@ def play_real_video(url, name, position): xml = open_url(url) print( '[Todic] url: ' + str(url) ) - print( '[Todic] xml: ' + xml ) + print( '[Todic] xml: ' + str(xml) ) print( '[Todic] pos: ' + str(position) ) doc = parseString(xml) @@ -354,8 +359,8 @@ 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('StartOffset', str(position) ) @@ -366,20 +371,14 @@ 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 - - #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 ) @@ -388,7 +387,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 @@ -401,7 +400,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 @@ -412,6 +411,8 @@ #=================================== Tool Box ======================================= # shows a more userfriendly notification def showMessage(heading, message): + print( "[Todic::showMessage] " + message) + print( message ) duration = 15 * 1000 xbmc.executebuiltin('XBMC.Notification("%s", "%s", %s)' % (heading, message, duration)) @@ -465,11 +466,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: @@ -479,9 +480,8 @@ - try: - open_url("http://todic.dk") + open_url("https://todic.dk") except: showMessage("Fejl", "Kunne ikke forbinde til todic.dk") exit()