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

Merge pull request #24 from zrose584/optional_proxy_images

Browse Source 
settings.py: add 'proxy_images'
This commit is contained in:
James Taylor 2020-10-12 09:37:54 -07:00 committed by GitHub
commit 641af53e2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
settings.py
View File

@ -128,6 +128,13 @@ For security reasons, enabling this is not recommended.''',
'comment': '', 'comment': '',
}), }),
('proxy_images', {
'label': 'proxy images',
'type': bool,
'default': True,
'comment': '',
}),
('use_comments_js', { ('use_comments_js', {
'label': 'Enable comments.js', 'label': 'Enable comments.js',
'type': bool, 'type': bool,
@ -305,6 +312,11 @@ else:
globals().update(current_settings_dict) globals().update(current_settings_dict)
if proxy_images:
img_prefix = "/"
else:
img_prefix = ""
if route_tor: if route_tor:

4
youtube/comments.py
View File

@ -92,7 +92,7 @@ def post_process_comments_info(comments_info):
comment['author_url'] = concat_or_none( comment['author_url'] = concat_or_none(
util.URL_ORIGIN, comment['author_url']) util.URL_ORIGIN, comment['author_url'])
comment['author_avatar'] = concat_or_none( comment['author_avatar'] = concat_or_none(
'/', comment['author_avatar']) settings.img_prefix, comment['author_avatar'])
comment['permalink'] = concat_or_none(util.URL_ORIGIN, '/watch?v=', comment['permalink'] = concat_or_none(util.URL_ORIGIN, '/watch?v=',
comments_info['video_id'], '&lc=', comment['id']) comments_info['video_id'], '&lc=', comment['id'])
@ -139,7 +139,7 @@ def post_process_comments_info(comments_info):
comments_info['video_url'] = concat_or_none(util.URL_ORIGIN, comments_info['video_url'] = concat_or_none(util.URL_ORIGIN,
'/watch?v=', comments_info['video_id']) '/watch?v=', comments_info['video_id'])
comments_info['video_thumbnail'] = concat_or_none('/i.ytimg.com/vi/', comments_info['video_thumbnail'] = concat_or_none(settings.img_prefix, 'https://i.ytimg.com/vi/',
comments_info['video_id'], '/mqdefault.jpg') comments_info['video_id'], '/mqdefault.jpg')

2
youtube/local_playlist.py
View File

@ -52,7 +52,7 @@ def get_local_playlist_videos(name, offset=0, amount=50):
try: try:
info = json.loads(video_json) info = json.loads(video_json)
if info['id'] + ".jpg" in thumbnails: if info['id'] + ".jpg" in thumbnails:
info['thumbnail'] = "/youtube.com/data/playlist_thumbnails/" + name + "/" + info['id'] + ".jpg" info['thumbnail'] = "/https://youtube.com/data/playlist_thumbnails/" + name + "/" + info['id'] + ".jpg"
else: else:
info['thumbnail'] = util.get_thumbnail_url(info['id']) info['thumbnail'] = util.get_thumbnail_url(info['id'])
missing_thumbnails.append(info['id']) missing_thumbnails.append(info['id'])

3
youtube/playlist.py
View File

@ -1,5 +1,6 @@
from youtube import util, yt_data_extract, proto, local_playlist from youtube import util, yt_data_extract, proto, local_playlist
from youtube import yt_app from youtube import yt_app
import settings
import base64 import base64
import urllib import urllib
@ -103,7 +104,7 @@ def get_playlist_page():
util.prefix_urls(item) util.prefix_urls(item)
util.add_extra_html_info(item) util.add_extra_html_info(item)
if 'id' in item: if 'id' in item:
item['thumbnail'] = '/https://i.ytimg.com/vi/' + item['id'] + '/default.jpg' item['thumbnail'] = settings.img_prefix + 'https://i.ytimg.com/vi/' + item['id'] + '/default.jpg'
item['url'] += '&list=' + playlist_id item['url'] += '&list=' + playlist_id
if item['index']: if item['index']:

3
youtube/templates/base.html
View File

@ -3,7 +3,8 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{ page_title }}</title> <title>{{ page_title }}</title>
<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'; media-src 'self' https://*.googlevideo.com"> <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'; media-src 'self' https://*.googlevideo.com;
{{ "img-src https://*.googleusercontent.com https://*.ggpht.com https://*.ytimg.com;" if not settings.proxy_images else "" }}">
<link href="{{ theme_path }}" type="text/css" rel="stylesheet"> <link href="{{ theme_path }}" type="text/css" rel="stylesheet">
<link href="/youtube.com/static/shared.css" type="text/css" rel="stylesheet"> <link href="/youtube.com/static/shared.css" type="text/css" rel="stylesheet">
<link href="/youtube.com/static/comments.css" type="text/css" rel="stylesheet"> <link href="/youtube.com/static/comments.css" type="text/css" rel="stylesheet">

3
youtube/util.py
View File

@ -342,7 +342,7 @@ def video_id(url):
# default, sddefault, mqdefault, hqdefault, hq720 # default, sddefault, mqdefault, hqdefault, hq720
def get_thumbnail_url(video_id): def get_thumbnail_url(video_id):
return "/i.ytimg.com/vi/" + video_id + "/mqdefault.jpg" return settings.img_prefix + "https://i.ytimg.com/vi/" + video_id + "/mqdefault.jpg"
def seconds_to_timestamp(seconds): def seconds_to_timestamp(seconds):
seconds = int(seconds) seconds = int(seconds)
@ -394,6 +394,7 @@ def concat_or_none(*strings):
def prefix_urls(item): def prefix_urls(item):
if settings.proxy_images:
try: try:
item['thumbnail'] = prefix_url(item['thumbnail']) item['thumbnail'] = prefix_url(item['thumbnail'])
except KeyError: except KeyError: