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

Merge branch 'master' into optional_proxy_images

Browse Source
This commit is contained in:
James Taylor 2020-10-12 09:37:13 -07:00 committed by GitHub
commit fd253d9e07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 102 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
settings.py
View File

@ -135,6 +135,13 @@ For security reasons, enabling this is not recommended.''',
'comment': '',
}),
('use_comments_js', {
'label': 'Enable comments.js',
'type': bool,
'default': True,
'comment': '',
}),
('theme', {
'type': int,
'default': 0,

2
youtube/__init__.py
View File

@ -5,6 +5,7 @@ import traceback
import re
from sys import exc_info
yt_app = flask.Flask(__name__)
yt_app.config['TEMPLATES_AUTO_RELOAD'] = True
yt_app.url_map.strict_slashes = False
@ -25,6 +26,7 @@ theme_names = {
def inject_theme_preference():
return {
'theme_path': '/youtube.com/static/' + theme_names[settings.theme] + '.css',
'settings': settings,
}
@yt_app.template_filter('commatize')

3
youtube/channel.py
View File

@ -150,7 +150,8 @@ def get_number_of_videos_channel(channel_id):
response = response.decode('utf-8')
match = re.search(r'"numVideosText":\s*{\s*"runs":\s*\[{"text":\s*"([\d,]*) videos"', response)
# match = re.search(r'"numVideosText":\s*{\s*"runs":\s*\[{"text":\s*"([\d,]*) videos"', response)
match = re.search(r'"numVideosText".*?([,\d]+)', response)
if match:
return int(match.group(1).replace(',',''))
else:

2
youtube/comments.py
View File

@ -187,8 +187,10 @@ def get_comments_page():
'replying': replies,
}
return flask.render_template('comments_page.html',
comments_info = comments_info,
comment_posting_box_info = comment_posting_box_info,
slim = request.args.get('slim', False)
)

3
youtube/playlist.py
View File

@ -1,4 +1,4 @@
from youtube import util, yt_data_extract, proto
from youtube import util, yt_data_extract, proto, local_playlist
from youtube import yt_app
import settings
@ -115,6 +115,7 @@ def get_playlist_page():
video_count = 40
return flask.render_template('playlist.html',
header_playlist_names = local_playlist.get_playlist_names(),
video_list = info.get('items', []),
num_pages = math.ceil(video_count/20),
parameters_dictionary = request.args,

20
youtube/static/js/comments.js Normal file
View File

@ -0,0 +1,20 @@
function onClickReplies(e) {
var details = e.target.parentElement;
// e.preventDefault();
console.log("loading replies ..");
doXhr(details.getAttribute("src") + "&slim=1", (html) => {
var div = details.querySelector(".comment_page");
div.innerHTML = html;
});
details.removeEventListener('click', onClickReplies);
}
window.addEventListener('DOMContentLoaded', function() {
QA("details.replies").forEach(details => {
details.addEventListener('click', onClickReplies);
details.addEventListener('auxclick', (e) => {
if (e.target.parentElement !== details) return;
if (e.button == 1) window.open(details.getAttribute("src"));
});
});
});

14
youtube/static/js/common.js
View File

@ -1,4 +1,5 @@
Q = document.querySelector.bind(document);
QA = document.querySelectorAll.bind(document);
function text(msg) { return document.createTextNode(msg); }
function clearNode(node) { while (node.firstChild) node.removeChild(node.firstChild); }
function toTimestamp(seconds) {
@ -36,6 +37,19 @@ function getDefaultTranscriptTrackIdx() {
return textTracks.length - 1;
}
function doXhr(url, callback=null) {
var xhr = new XMLHttpRequest();
xhr.open("GET", url);
xhr.onload = (e) => {
let ok = xhr.status >= 200 && xhr.status < 300;
if (ok) callback(e.currentTarget.response);
else alert(`${xhr.responseURL} status code: ${xhr.status}`);
}
xhr.send();
return xhr;
}
window.addEventListener('DOMContentLoaded', function() {
cur_track_idx = getDefaultTranscriptTrackIdx();
});

3
youtube/templates/base.html
View File

@ -20,7 +20,8 @@
<header>
<a href="/youtube.com" id="home-link">Home</a>
<form id="site-search" action="/youtube.com/search">
<input type="search" name="query" class="search-box" value="{{ search_box_value }}">
<input type="search" name="query" class="search-box" value="{{ search_box_value }}"
{{ "autofocus" if request.path == "/" else "" }}>
<button type="submit" value="Search" class="search-button">Search</button>
<div class="dropdown">
<button class="dropdown-label">Options</button>

9
youtube/templates/comments.html
View File

@ -22,7 +22,14 @@
<span class="likes">{{ comment['likes_text'] if comment['like_count'] else ''}}</span>
<div class="bottom-row">
<a href="{{ comment['replies_url'] }}" class="replies">{{ comment['view_replies_text'] }}</a>
{% if settings.use_comments_js and comment['reply_count'] %}
<details class="replies" src="{{ comment['replies_url'] }}">
<summary>{{ comment['view_replies_text'] }}</summary>
<div class="comment_page">loading..</div>
</details>
{% else %}
<a href="{{ comment['replies_url'] }}" class="replies">{{ comment['view_replies_text'] }}</a>
{% endif %}
{% if 'delete_url' is in comment %}
<a href="{{ comment['delete_url'] }}" target="_blank">Delete</a>
{% endif %}

30
youtube/templates/comments_page.html
View File

@ -1,13 +1,16 @@
{% set page_title = ('Replies' if comments_info['is_replies'] else 'Comments page ' + comments_info['page_number']) %}
{% extends "base.html" %}
{% import "comments.html" as comments %}
{% import "comments.html" as comments with context %}
{% block style %}
.comments-area{
margin: auto;
width:640px;
}
{% endblock style %}
{% if not slim %}
{% extends "base.html" %}
{% block style %}
.comments-area{
margin: auto;
width:640px;
}
{% endblock style %}
{% endif %}
{% block main %}
@ -24,7 +27,9 @@
</section>
{% endif %}
{{ comments.comment_posting_box(comment_posting_box_info) }}
{% if not slim %}
{{ comments.comment_posting_box(comment_posting_box_info) }}
{% endif %}
{% if not comments_info['is_replies'] %}
<div class="comment-links">
@ -36,13 +41,18 @@
<div class="comments">
{% for comment in comments_info['comments'] %}
{{ comments.render_comment(comment, comments_info['include_avatars']) }}
{{ comments.render_comment(comment, comments_info['include_avatars'], slim) }}
{% endfor %}
</div>
{% if 'more_comments_url' is in comments_info %}
<a class="page-button more-comments" href="{{ comments_info['more_comments_url'] }}">More comments</a>
{% endif %}
</section>
{% if settings.use_comments_js %}
<script src="/youtube.com/static/js/common.js"></script>
<script src="/youtube.com/static/js/comments.js"></script>
{% endif %}
{% endblock main %}

19
youtube/templates/watch.html
View File

@ -1,7 +1,7 @@
{% set page_title = title %}
{% extends "base.html" %}
{% import "common_elements.html" as common_elements %}
{% import "comments.html" as comments %}
{% import "comments.html" as comments with context %}
{% block style %}
details > summary{
background-color: var(--interface-color);
@ -14,6 +14,18 @@
text-decoration: underline;
}
details.replies > summary{
background-color: var(--interface-color);
border-style: outset;
border-width: 1px;
font-weight: bold;
padding-bottom: 0px;
}
details.replies .comment{
width: 600px;
}
.playability-error{
height: 360px;
width: 640px;
@ -678,8 +690,11 @@ Reload without invidious (for usage of new identity button).</a>
{% endif %}
<script src="/youtube.com/static/js/common.js"></script>
<script src="/youtube.com/static/js/transcript-table.js"></script>
{% if settings.use_video_hotkeys %}
<script src="/youtube.com/static/js/hotkeys.js"></script>
{% endif %}
<script src="/youtube.com/static/js/transcript-table.js"></script>
{% if settings.use_comments_js %}
<script src="/youtube.com/static/js/comments.js"></script>
{% endif %}
{% endblock main %}

2
youtube/watch.py
View File

@ -470,8 +470,6 @@ def get_watch_page(video_id=None):
comment_count = info['comment_count'],
comments_disabled = info['comments_disabled'],
settings = settings,
video_height = video_height,
video_width = video_width,
theater_video_target_width = theater_video_target_width,