Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Retry with the next YouTube video until some of the ones from the search can be played without errors

Browse source
This commit is contained in:
Fabio Manganiello 2018-04-20 09:38:04 +02:00
parent 4db2f62c17
commit 7e119654f9
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
platypush/plugins/video/omxplayer.py
View file

@ -112,9 +112,20 @@ class VideoOmxplayerPlugin(Plugin):
def youtube_search_and_play(self, query): def youtube_search_and_play(self, query):
self.videos_queue = self.youtube_search(query) self.videos_queue = self.youtube_search(query)
url = self.videos_queue.pop(0) ret = None
logging.info('Playing {}'.format(url))
return self.play(url) while self.videos_queue:
url = self.videos_queue.pop(0)
logging.info('Playing {}'.format(url))
try:
ret = self.play(url)
break
except Exception as e:
logging.exception(e)
logging.info('YouTube playback error, trying next video')
return ret
def youtube_search(self, query): def youtube_search(self, query):
query = urllib.parse.quote(query) query = urllib.parse.quote(query)
@ -125,8 +136,9 @@ class VideoOmxplayerPlugin(Plugin):
results = [] results = []
for vid in soup.findAll(attrs={'class':'yt-uix-tile-link'}): for vid in soup.findAll(attrs={'class':'yt-uix-tile-link'}):
if vid['href'].startswith('/watch?v='): m = re.match('(/watch?v=.+?)(&.*)', vid['href'])
results.append('https://www.youtube.com' + vid['href']) if m:
results.append('https://www.youtube.com' + m.group(1))
logging.info('{} YouTube video results for the search query "{}"' logging.info('{} YouTube video results for the search query "{}"'
.format(len(results), query)) .format(len(results), query))