stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
marco
2021-11-06 14:46:59 +01:00
parent 06239735f5 5fec26bd6c
commit 802fcc3a13
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
specials/trailertools.py
+10 -7
View File
@@ -216,7 +216,7 @@ def youtube_search(item):
scrapedtitle = "%s" % scrapedtitle scrapedtitle = "%s" % scrapedtitle
url = urlparse.urljoin('https://www.youtube.com/', scrapedurl) url = urlparse.urljoin('https://www.youtube.com/', scrapedurl)
itemlist.append(del_id(item.clone(title=scrapedtitle, title2='Youtube - ' + scrapedduration, action="play", server="youtube", itemlist.append(del_id(item.clone(title=scrapedtitle, title2='Youtube - ' + scrapedduration, action="play", server="youtube",
url=url, thumbnail=scrapedthumbnail))) url=url, thumbnail=scrapedthumbnail, window=True)))
# next_page = scrapertools.find_single_match(data, '<a href="([^"]+)"[^>]+><span class="yt-uix-button-content">') # next_page = scrapertools.find_single_match(data, '<a href="([^"]+)"[^>]+><span class="yt-uix-button-content">')
# if next_page != "": # if next_page != "":
# next_page = urlparse.urljoin("https://www.youtube.com", next_page) # next_page = urlparse.urljoin("https://www.youtube.com", next_page)
@@ -252,7 +252,7 @@ def search_links_mymovies(item):
logger.debug() logger.debug()
trailer_url = match(item, patron=r'<source src="([^"]+)').match trailer_url = match(item, patron=r'<source src="([^"]+)').match
if trailer_url: if trailer_url:
it = del_id(item.clone(url=trailer_url, server='directo', action="play")) it = del_id(item.clone(url=trailer_url, server='directo', action="play", window=True))
return it return it
@@ -276,7 +276,8 @@ try:
def onInit(self): def onInit(self):
try: try:
self.control_list = self.getControl(6) self.control_list = self.getControl(6)
self.getControl(5).setNavigation(self.control_list, self.control_list, self.control_list, self.control_list) self.getControl(5).setNavigation(self.getControl(7), self.getControl(7), self.control_list, self.control_list)
self.getControl(7).setNavigation(self.getControl(5), self.getControl(5), self.control_list, self.control_list)
self.getControl(8).setEnabled(0) self.getControl(8).setEnabled(0)
self.getControl(8).setVisible(0) self.getControl(8).setVisible(0)
except: except:
@@ -337,10 +338,12 @@ try:
window.close() window.close()
retorna = platformtools.play_video(item, force_direct=True) retorna = platformtools.play_video(item, force_direct=True)
if not retorna: if not retorna:
while True: while not xbmc.Player().isPlaying():
xbmc.sleep(1000) xbmc.sleep(10)
if not xbmc.Player().isPlaying(): while xbmc.Player().isPlaying():
break xbmc.sleep(100)
# if not xbmc.Player().isPlaying():
# break
window_select[-1].doModal() window_select[-1].doModal()
else: else:
self.close() self.close()