Skip to content

Commit

Permalink
Remove option to show related videos
Browse files Browse the repository at this point in the history
YouTube removed the search.list method's relatedToVideoId parameter support therefor related videos are no longer available via api.
https://developers.google.com/youtube/v3/revision_history
  • Loading branch information
Taapat committed Aug 21, 2023
1 parent f2a65d6 commit 65194e1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 21 deletions.
5 changes: 2 additions & 3 deletions src/YouTubeApi.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,16 +97,15 @@ def search_list_full(self, safe_search, order, part, q, s_type,

q = compat_quote(q)

url = 'search?{}safeSearch={}{}{}{}&order={}&part={}&q={}&type={}{}{}{}'.format(
url = 'search?{}safeSearch={}{}{}{}&order={}&part={}&q={}&type={}{}{}'.format(
kwargs.get('video_embeddable', '') and 'videoEmbeddable=%s&' % kwargs['video_embeddable'],
safe_search,
kwargs.get('event_type', '') and '&eventType=%s' % kwargs['event_type'],
kwargs.get('video_type', '') and '&videoType=%s' % kwargs['video_type'],
kwargs.get('video_definition', '') and '&videoDefinition=%s' % kwargs['video_definition'],
order, part.replace(',', '%2C'), q, s_type,
kwargs.get('relevance_language', '') and '&relevanceLanguage=%s' % kwargs['relevance_language'],
kwargs.get('region_code', '') and '&regionCode=%s' % kwargs['region_code'],
kwargs.get('related_to_video_id', '') and '&relatedToVideoId=%s' % kwargs['related_to_video_id'])
kwargs.get('region_code', '') and '&regionCode=%s' % kwargs['region_code'])
return self.get_response(url, max_results, page_token)

def search_list(self, order, part, channel_id, max_results, page_token):
Expand Down
21 changes: 3 additions & 18 deletions src/YouTubeUi.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,11 @@
config.plugins.YouTube.maxResolution = ConfigSelection(default='22', choices=[
('38', '4096x3072'), ('37', '1920x1080'), ('22', '1280x720'), ('35', '854x480'),
('18', '640x360'), ('5', '400x240'), ('17', '176x144')])
config.plugins.YouTube.onMovieEof = ConfigSelection(default='related', choices=[
('related', _('Show related videos')),
config.plugins.YouTube.onMovieEof = ConfigSelection(default='quit', choices=[
('quit', _('Return to list')), ('ask', _('Ask user')),
('playnext', _('Play next')), ('repeat', _('Repeat')),
('playprev', _('Play previous'))])
config.plugins.YouTube.onMovieStop = ConfigSelection(default='related', choices=[
('related', _('Show related videos')),
config.plugins.YouTube.onMovieStop = ConfigSelection(default='ask', choices=[
('ask', _('Ask user')), ('quit', _('Return to list'))])
config.plugins.YouTube.login = ConfigYesNo(default=False)
config.plugins.YouTube.downloadDir = ConfigDirectory(default=resolveFilename(SCOPE_HDD))
Expand Down Expand Up @@ -158,7 +156,6 @@ def leavePlayer(self):
if on_movie_stop == 'ask':
title = _('Stop playing this movie?')
clist = ((_('Yes, and return to list'), 'quit'),
(_('Yes, and show related videos'), 'related'),
(_('Yes, but play next video'), 'playnext'),
(_('Yes, but play previous video'), 'playprev'),
(_('No, but play video again'), 'repeat'),
Expand Down Expand Up @@ -673,11 +670,6 @@ def playCallback(self, action=None):
(_('Play video again'), 'repeat'))
self.session.openWithCallback(self.playCallback,
ChoiceBox, title=title, list=clist)
elif action == 'related':
self.yts.pop(0)
self.yts.insert(0, {})
self.yts[0]['related'] = str(self['list'].getCurrent()[0])
self.screenCallback('', 'search')
else:
if action == 'playnext':
self.selectNext()
Expand Down Expand Up @@ -916,10 +908,7 @@ def searchAndFeeds(self, current):
order = 'date'
search_type = 'video'
q = video_embeddable = video_definition = video_type = event_type = ''
related = self.yts[0].get('related', '')
if related:
self.yts[0]['title'] = _('Related videos')
elif self.yts[0]['list'] == 'search':
if self.yts[0]['list'] == 'search':
order = config.plugins.YouTube.searchOrder.value
if current[6:] == 'broadcasts':
event_type = 'live'
Expand Down Expand Up @@ -954,7 +943,6 @@ def searchAndFeeds(self, current):
relevance_language=config.plugins.YouTube.searchLanguage.value,
s_type=search_type,
region_code=config.plugins.YouTube.searchRegion.value,
related_to_video_id=related,
max_results=self.search_result,
page_token=self.yts[0].get('pageToken', '')
)
Expand Down Expand Up @@ -1307,13 +1295,10 @@ def setNextEntries(self):
self.usePageToken(page_token, page_index)

def usePageToken(self, page_token, page_index, last=False):
related = self.yts[0].get('related')
self.yts.pop(0)
self.yts.insert(0, {})
self.yts[0]['pageToken'] = page_token
self.yts[0]['page_index'] = page_index
if related:
self.yts[0]['related'] = related
if last:
self.yts[0]['index'] = int(self.search_result) - 1
self.screenCallback(self.title, self.yts[1]['list'])
Expand Down

0 comments on commit 65194e1

Please sign in to comment.