heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Layout: Add option to use 720p resolution

Browse Source
This commit is contained in:
James Taylor 2019-08-24 13:35:11 -07:00
parent fa2fa7fe16
commit d9fbf82bb2
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings.py
View File

@ -72,6 +72,12 @@ For security reasons, enabling this is not recommended.''',
'comment': '', 'comment': '',
}), }),
('default_resolution', {
'type': int,
'default': 720,
'comment': '',
}),
('gather_googlevideo_domains', { ('gather_googlevideo_domains', {
'type': bool, 'type': bool,
'default': False, 'default': False,

2
youtube/templates/watch.html
View File

@ -7,7 +7,7 @@
video{ video{
grid-column: 1 / span 5; grid-column: 1 / span 5;
width: 100%; width: 100%;
max-height: 360px; max-height: {{ video_height }}px;
} }
#related{ #related{
margin-top: 10px; margin-top: 10px;

14
youtube/watch.py
View File

@ -52,12 +52,17 @@ def watch_page_related_playlist_info(item):
def get_video_sources(info): def get_video_sources(info):
video_sources = [] video_sources = []
for format in info['formats']: for format in info['formats']:
if format['acodec'] != 'none' and format['vcodec'] != 'none': if format['acodec'] != 'none' and format['vcodec'] != 'none' and format['height'] <= settings.default_resolution:
video_sources.append({ video_sources.append({
'src': format['url'], 'src': format['url'],
'type': 'video/' + format['ext'], 'type': 'video/' + format['ext'],
'height': format['height'],
}) })
#### order the videos sources so the preferred resolution is first ###
video_sources.sort(key=lambda source: source['height'], reverse=True)
return video_sources return video_sources
def get_subtitle_sources(info): def get_subtitle_sources(info):
@ -191,6 +196,10 @@ def get_watch_page():
'note': yt_dl_downloader._format_note(format), 'note': yt_dl_downloader._format_note(format),
}) })
video_sources = get_video_sources(info)
video_height = video_sources[0]['height']
return flask.render_template('watch.html', return flask.render_template('watch.html',
header_playlist_names = local_playlist.get_playlist_names(), header_playlist_names = local_playlist.get_playlist_names(),
uploader_channel_url = '/' + info['uploader_url'], uploader_channel_url = '/' + info['uploader_url'],
@ -200,7 +209,7 @@ def get_watch_page():
dislikes = (lambda x: '{:,}'.format(x) if x is not None else "")(info.get("dislike_count", None)), dislikes = (lambda x: '{:,}'.format(x) if x is not None else "")(info.get("dislike_count", None)),
download_formats = download_formats, download_formats = download_formats,
video_info = json.dumps(video_info), video_info = json.dumps(video_info),
video_sources = get_video_sources(info), video_sources = video_sources,
subtitle_sources = get_subtitle_sources(info), subtitle_sources = get_subtitle_sources(info),
related = related_videos, related = related_videos,
music_list = info['music_list'], music_list = info['music_list'],
@ -208,6 +217,7 @@ def get_watch_page():
comments_info = comments_info, comments_info = comments_info,
theater_mode = settings.theater_mode, theater_mode = settings.theater_mode,
video_height = video_height,
title = info['title'], title = info['title'],
uploader = info['uploader'], uploader = info['uploader'],