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

Reorganize comment system

Browse Source
This commit is contained in:
James Taylor 2018-09-01 21:53:40 -07:00
parent cdf8b8b0c8
commit ffeccc5ac3
6 changed files with 146 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
youtube/account_functions.py
View File

@ -29,8 +29,9 @@ def _post_comment(text, video_id, session_token, cookie):
req = urllib.request.Request("https://m.youtube.com/service_ajax?name=createCommentEndpoint", headers=headers, data=data)
response = urllib.request.urlopen(req, timeout = 5)
content = response.read()
'''with open('debug/post_comment_response', 'wb') as f:
f.write(response.read())'''
f.write(content)'''
def _post_comment_reply(text, video_id, parent_comment_id, session_token, cookie):
@ -59,8 +60,9 @@ def _post_comment_reply(text, video_id, parent_comment_id, session_token, cookie
req = urllib.request.Request("https://m.youtube.com/service_ajax?name=createCommentReplyEndpoint", headers=headers, data=data)
response = urllib.request.urlopen(req, timeout = 5)
content = response.read()
'''with open('debug/post_comment_response', 'wb') as f:
f.write(response.read())'''
f.write(content)'''
@ -98,7 +100,9 @@ def post_comment(query_string, fields):
def get_post_comment_page(query_string):
parameters = urllib.parse.parse_qs(query_string)
video_id = parameters['v'][0]
video_id = parameters['video_id'][0]
parent_id = common.default_multi_get(parameters, 'parent_id', 0, default='')
style = ''' main{
display: grid;
grid-template-columns: 3fr 2fr;
@ -108,22 +112,28 @@ def get_post_comment_page(query_string):
grid-template-columns: 1fr 640px;
}
textarea{
width: 462px;
width: 460px;
height: 85px;
}
.comment-form{
grid-column:2;
}'''
page = '''<div class="left">
<form action="''' + common.URL_ORIGIN + '/comments?ctoken=' + comments.make_comment_ctoken(video_id, sort=1).replace("=", "%3D") + '''" method="post" class="comment-form">
<textarea name="comment_text"></textarea>
<input type="hidden" name="video_id" value="''' + video_id + '''">
<button type="submit">Post comment</button>
</form>
</div>
'''
if parent_id: # comment reply
comment_box = comments.comment_box_template.substitute(
form_action = common.URL_ORIGIN + '/comments?parent_id=' + parent_id + "&video_id=" + video_id,
video_id_input = '',
post_text = "Post reply",
)
else:
comment_box = comments.comment_box_template.substitute(
form_action = common.URL_ORIGIN + '/comments?ctoken=' + comments.make_comment_ctoken(video_id, sort=1).replace("=", "%3D"),
video_id_input = '''<input type="hidden" name="video_id" value="''' + video_id + '''">''',
post_text = "Post comment",
)
page = '''<div class="left">\n''' + comment_box + '''</div>\n'''
return common.yt_basic_template.substitute(
page_title = "Post a comment",
page_title = "Post comment reply" if parent_id else "Post a comment",
style = style,
header = common.get_header(),
page = page,

29
youtube/comments.css
View File

@ -23,7 +23,34 @@
width: 100%;
}
.comments-area{
display:grid;
}
.comment-form{
display:contents;
}
.comments-area textarea{
resize: vertical;
margin-top:10px;
}
.post-comment-button{
margin-top:10px;
justify-self:end;
}
.comment-links{
display:grid;
grid-auto-flow: column;
grid-column-gap: 10px;
justify-content:start;
}
.comment-links a{
background-color: #d0d0d0;
padding: 2px;
justify-self:start;
}
.comments{
margin-top:10px;
grid-row-gap: 10px;
display: grid;
align-content:start;
@ -84,5 +111,5 @@
.more-comments{
justify-self:center;
margin-top:10px;
}

112
youtube/comments.py
View File

@ -8,6 +8,15 @@ import urllib
import html
import settings
import re
comment_area_template = Template('''
<section class="comment-area">
$video-metadata
$comment-links
$comment-box
$comments
$more-comments-button
</section>
''')
comment_template = Template('''
<div class="comment-container">
<div class="comment">
@ -80,11 +89,11 @@ def ctoken_metadata(ctoken):
result['offset'] = offset_information.get(5, 0)
result['is_replies'] = False
if (3 in offset_information) and (2 in offset_information[3]):
if (3 in offset_information) and (2 in proto.parse(offset_information[3])):
result['is_replies'] = True
else:
try:
result['sort'] = offset_information[4][6]
result['sort'] = proto.parse(offset_information[4])[6]
except KeyError:
result['sort'] = 0
return result
@ -119,8 +128,8 @@ def request_comments(ctoken, replies=False):
print("got <!DOCTYPE>, retrying")
continue
break
'''with open('debug/comments_debug', 'wb') as f:
f.write(content)'''
with open('debug/comments_debug', 'wb') as f:
f.write(content)
return content
def parse_comments_ajax(content, replies=False):
@ -163,11 +172,15 @@ def parse_comments_polymer(content, replies=False):
try:
video_title = ''
content = json.loads(uppercase_escape(content.decode('utf-8')))
url = content[1]['url']
ctoken = urllib.parse.parse_qs(url[url.find('?')+1:])['ctoken'][0]
video_id = ctoken_metadata(ctoken)['video_id']
#print(content)
try:
comments_raw = content[1]['response']['continuationContents']['commentSectionContinuation']['items']
except KeyError:
comments_raw = content[1]['response']['continuationContents']['commentRepliesContinuation']['contents']
replies = True
ctoken = default_multi_get(content, 1, 'response', 'continuationContents', 'commentSectionContinuation', 'continuations', 0, 'nextContinuationData', 'continuation', default='')
@ -192,6 +205,10 @@ def parse_comments_polymer(content, replies=False):
view_replies_text = '1 reply'
else:
view_replies_text = match.group(1) + " replies"
elif not replies:
view_replies_text = "Reply"
parent_id = comment_raw['comment']['commentRenderer']['commentId']
replies_url = URL_ORIGIN + '/post_comment?parent_id=' + parent_id + "&video_id=" + video_id
comment_raw = comment_raw['comment']
comment_raw = comment_raw['commentRenderer']
@ -216,9 +233,9 @@ def parse_comments_polymer(content, replies=False):
def get_comments_html(result):
def get_comments_html(comments):
html_result = ''
for comment in result['comments']:
for comment in comments:
replies = ''
if comment['replies_url']:
replies = reply_link_template.substitute(url=comment['replies_url'], view_replies_text=html.escape(comment['view_replies_text']))
@ -240,13 +257,38 @@ def get_comments_html(result):
replies=replies,
#replies='',
)
return html_result, result['ctoken']
return html_result
def video_comments(video_id, sort=0, offset=0, secret_key=''):
if settings.enable_comments:
result = parse_comments_polymer(request_comments(make_comment_ctoken(video_id, sort, offset, secret_key)))
return get_comments_html(result)
return '', ''
post_comment_url = common.URL_ORIGIN + "/post_comment?video_id=" + video_id
post_comment_link = '''<a class="post-comment-link" href="''' + post_comment_url + '''">Post comment</a>'''
other_sort_url = common.URL_ORIGIN + '/comments?ctoken=' + make_comment_ctoken(video_id, sort=1 - sort)
other_sort_name = 'newest' if sort == 0 else 'top'
other_sort_link = '''<a href="''' + other_sort_url + '''">Sort by ''' + other_sort_name + '''</a>'''
comment_links = '''<div class="comment-links">\n'''
comment_links += other_sort_link + '\n' + post_comment_link + '\n'
comment_links += '''</div>'''
comment_info = parse_comments_polymer(request_comments(make_comment_ctoken(video_id, sort, offset, secret_key)))
ctoken = comment_info['ctoken']
if ctoken == '':
more_comments_button = ''
else:
more_comments_button = more_comments_template.substitute(url = common.URL_ORIGIN + '/comments?ctoken=' + ctoken)
result = '''<section class="comments-area">\n'''
result += comment_links + '\n'
result += '<div class="comments">\n'
result += get_comments_html(comment_info['comments']) + '\n'
result += '</div>\n'
result += more_comments_button + '\n'
result += '''</section>'''
return result
return ''
more_comments_template = Template('''<a class="page-button more-comments" href="$url">More comments</a>''')
video_metadata_template = Template('''<section class="video-metadata">
@ -257,9 +299,14 @@ video_metadata_template = Template('''<section class="video-metadata">
<h2>Comments page $page_number</h2>
<span>Sorted by $sort</span>
<hr>
</section>
''')
comment_box_template = Template('''
<form action="$form_action" method="post" class="comment-form">
<textarea name="comment_text"></textarea>
$video_id_input
<button type="submit" class="post-comment-button">$post_text</button>
</form>''')
def get_comments_page(query_string):
parameters = urllib.parse.parse_qs(query_string)
ctoken = default_multi_get(parameters, 'ctoken', 0, default='')
@ -271,16 +318,14 @@ def get_comments_page(query_string):
ctoken = comment_replies_ctoken(video_id, parent_id)
replies = True
parsed_comments = parse_comments_polymer(request_comments(ctoken, replies), replies)
comment_info = parse_comments_polymer(request_comments(ctoken, replies), replies)
metadata = ctoken_metadata(ctoken)
if replies:
page_title = 'Replies'
video_metadata = ''
comment_box = '''<form action="" method="post" class="comment-form">
<textarea name="comment_text"></textarea>
<button type="submit" class="post-comment-button">Post reply</button>
</form>'''
comment_box = comment_box_template.substitute(form_action='', video_id_input='', post_text='Post reply')
comment_links = ''
else:
page_number = str(int(metadata['offset']/20) + 1)
page_title = 'Comments page ' + page_number
@ -288,25 +333,40 @@ def get_comments_page(query_string):
video_metadata = video_metadata_template.substitute(
page_number = page_number,
sort = 'top' if metadata['sort'] == 0 else 'newest',
title = html.escape(parsed_comments['video_title']),
title = html.escape(comment_info['video_title']),
url = common.URL_ORIGIN + '/watch?v=' + metadata['video_id'],
thumbnail = '/i.ytimg.com/vi/'+ metadata['video_id'] + '/mqdefault.jpg',
)
comment_box = ''
comment_box = comment_box_template.substitute(
form_action= common.URL_ORIGIN + '/comments?ctoken=' + make_comment_ctoken(metadata['video_id'], sort=1).replace("=", "%3D"),
video_id_input='''<input type="hidden" name="video_id" value="''' + metadata['video_id'] + '''">''',
post_text='Post comment'
)
other_sort_url = common.URL_ORIGIN + '/comments?ctoken=' + make_comment_ctoken(metadata['video_id'], sort=1 - metadata['sort'])
other_sort_name = 'newest' if metadata['sort'] == 0 else 'top'
other_sort_link = '''<a href="''' + other_sort_url + '''">Sort by ''' + other_sort_name + '''</a>'''
comments_html, ctoken = get_comments_html(parsed_comments)
comment_links = '''<div class="comment-links">\n'''
comment_links += other_sort_link + '\n'
comment_links += '''</div>'''
comments_html = get_comments_html(comment_info['comments'])
ctoken = comment_info['ctoken']
if ctoken == '':
more_comments_button = ''
else:
more_comments_button = more_comments_template.substitute(url = URL_ORIGIN + '/comments?ctoken=' + ctoken)
comments_area = '<section class="comments-area">\n'
comments_area += video_metadata + comment_box + comment_links + '\n'
comments_area += '<div class="comments">\n'
comments_area += comments_html + '\n'
comments_area += '</div>\n'
comments_area += more_comments_button + '\n'
comments_area += '</section>\n'
return yt_comments_template.substitute(
header = common.get_header(),
comment_box = comment_box,
video_metadata = video_metadata,
comments = comments_html,
comments_area = comments_area,
page_title = page_title,
more_comments_button=more_comments_button,
)
)

13
youtube/watch.py
View File

@ -230,13 +230,9 @@ def get_watch_page(query_string):
gevent.spawn(extract_info, downloader, "https://www.youtube.com/watch?v=" + id, download=False)
)
gevent.joinall(tasks)
comments_info, info = tasks[0].value, tasks[1].value
comments_html, ctoken = comments_info
comments_html, info = tasks[0].value, tasks[1].value
if ctoken == '':
more_comments_button = ''
else:
more_comments_button = more_comments_template.substitute(url = URL_ORIGIN + '/comments?ctoken=' + ctoken)
#comments_html = comments.comments_html(video_id(url))
#info = YoutubeDL().extract_info(url, download=False)
@ -340,10 +336,9 @@ def get_watch_page(query_string):
description = html.escape(info["description"]),
video_sources = formats_html(sorted_formats) + subtitles_html(info),
related = related_videos_html,
post_comment_link = post_comment_link,
comment_count = '',
comments = comments_html,
more_comments_button = more_comments_button,
music_list = music_list_html,
is_unlisted = '<span class="is-unlisted">Unlisted</span>' if info['unlisted'] else '',
)

27
yt_comments_template.html
View File

@ -21,42 +21,19 @@
grid-template-columns: 1fr 640px;
grid-template-rows: 0fr 0fr 0fr;
}
.video-metadata{
grid-column: 2;
}
.comment-form{
display:contents;
}
textarea{
grid-column:2;
resize: vertical;
}
.post-comment-button{
grid-column:2;
justify-self:end;
margin-top:10px;
}
.comments{
.comments-area{
grid-column:2;
}
.comment{
width:640px;
}
#left .page-button{
grid-column:2;
}
</style>
</head>
<body>
$header
<main>
<div id="left">
$video_metadata
$comment_box
<section class="comments">
$comments
</section>
$more_comments_button
$comments_area
</div>
</main>
</body>

27
yt_watch_template.html
View File

@ -86,31 +86,15 @@
grid-row:8;
grid-column: 1 / span 2;
}
.comment-count{
font-weight:bold;
grid-row:9;
.full-item .comments-area{
grid-column: 1 / span 2;
}
.post-comment-link{
grid-row:10;
grid-column: 1;
justify-self:start;
margin-top: 10px;
background-color: #d0d0d0;
padding: 2px;
}
.full-item .comments{
grid-column: 1 / span 2;
grid-row: 11;
grid-row: 9;
margin-top:10px;
}
.comment{
width:640px;
}
.full-item .more-comments{
grid-row: 12;
grid-column: 1 / span 2;
}
.music-list{
background-color: #d0d0d0;
@ -206,12 +190,7 @@ $download_options
<div class="music-list">
$music_list
</div>
<div class="comment-count">$comment_count</div>
$post_comment_link
<section class="comments">
$comments
</section>
$more_comments_button
</article>
</div>