Astounds
6a68f06645
Some checks failed
CI / test (push) Failing after 1m19s
Major Features: - HD video thumbnails (hq720.jpg) with automatic fallback to lower qualities - HD channel avatars (240x240 instead of 88x88) - YouTube 2024+ lockupViewModel support for channel playlists - youtubei/v1/browse API integration for channel playlist tabs - yt-dlp integration for multi-language audio and subtitles Bug Fixes: - Fixed undefined `abort` import in playlist.py - Fixed undefined functions in proto.py (encode_varint, bytes_to_hex, succinct_encode) - Fixed missing `traceback` import in proto_debug.py - Fixed blurry playlist thumbnails using default.jpg instead of HD versions - Fixed channel playlists page using deprecated pbj=1 format Improvements: - Automatic thumbnail fallback system (hq720 → sddefault → hqdefault → mqdefault → default) - JavaScript thumbnail_fallback() handler for 404 errors - Better thumbnail quality across all pages (watch, channel, playlist, subscriptions) - Consistent HD avatar display for all channel items - Settings system automatically adds new settings without breaking user config Files Modified: - youtube/watch.py - HD thumbnails for related videos and playlist items - youtube/channel.py - HD thumbnails for channel playlists, youtubei API integration - youtube/playlist.py - HD thumbnails, fixed abort import - youtube/util.py - HD thumbnail URLs, avatar HD upgrade, prefix_url improvements - youtube/comments.py - HD video thumbnail - youtube/subscriptions.py - HD thumbnails, fixed abort import - youtube/yt_data_extract/common.py - lockupViewModel support, extract_lockup_view_model_info() - youtube/yt_data_extract/everything_else.py - HD playlist thumbnails - youtube/proto.py - Fixed undefined function references - youtube/proto_debug.py - Added traceback import - youtube/static/js/common.js - thumbnail_fallback() handler - youtube/templates/*.html - Added onerror handlers for thumbnail fallback - youtube/version.py - Bump to v0.4.0 Technical Details: - All thumbnail URLs now use hq720.jpg (1280x720) when available - Fallback handled client-side via JavaScript onerror handler - Server-side avatar upgrade via regex in util.prefix_url() - lockupViewModel parser extracts contentType, metadata, and first_video_id - Channel playlist tabs now use youtubei/v1/browse instead of deprecated pbj=1 - Settings version system ensures backward compatibility
129 lines
4.0 KiB
Python
129 lines
4.0 KiB
Python
from youtube import util, yt_data_extract, proto, local_playlist
|
|
from youtube import yt_app
|
|
import settings
|
|
|
|
import base64
|
|
import urllib
|
|
import json
|
|
import string
|
|
import gevent
|
|
import math
|
|
from flask import request, abort
|
|
import flask
|
|
|
|
|
|
def playlist_ctoken(playlist_id, offset, include_shorts=True):
|
|
|
|
offset = proto.uint(1, offset)
|
|
offset = b'PT:' + proto.unpadded_b64encode(offset)
|
|
offset = proto.string(15, offset)
|
|
if not include_shorts:
|
|
offset += proto.string(104, proto.uint(2, 1))
|
|
|
|
continuation_info = proto.string(3, proto.percent_b64encode(offset))
|
|
|
|
playlist_id = proto.string(2, 'VL' + playlist_id)
|
|
pointless_nest = proto.string(80226972, playlist_id + continuation_info)
|
|
|
|
return base64.urlsafe_b64encode(pointless_nest).decode('ascii')
|
|
|
|
|
|
def playlist_first_page(playlist_id, report_text="Retrieved playlist",
|
|
use_mobile=False):
|
|
if use_mobile:
|
|
url = 'https://m.youtube.com/playlist?list=' + playlist_id + '&pbj=1'
|
|
content = util.fetch_url(
|
|
url, util.mobile_xhr_headers,
|
|
report_text=report_text, debug_name='playlist_first_page'
|
|
)
|
|
content = json.loads(content.decode('utf-8'))
|
|
else:
|
|
url = 'https://www.youtube.com/playlist?list=' + playlist_id + '&pbj=1'
|
|
content = util.fetch_url(
|
|
url, util.desktop_xhr_headers,
|
|
report_text=report_text, debug_name='playlist_first_page'
|
|
)
|
|
content = json.loads(content.decode('utf-8'))
|
|
|
|
return content
|
|
|
|
|
|
def get_videos(playlist_id, page, include_shorts=True, use_mobile=False,
|
|
report_text='Retrieved playlist'):
|
|
# mobile requests return 20 videos per page
|
|
if use_mobile:
|
|
page_size = 20
|
|
headers = util.mobile_xhr_headers
|
|
# desktop requests return 100 videos per page
|
|
else:
|
|
page_size = 100
|
|
headers = util.desktop_xhr_headers
|
|
|
|
url = "https://m.youtube.com/playlist?ctoken="
|
|
url += playlist_ctoken(playlist_id, (int(page)-1)*page_size,
|
|
include_shorts=include_shorts)
|
|
url += "&pbj=1"
|
|
content = util.fetch_url(
|
|
url, headers, report_text=report_text,
|
|
debug_name='playlist_videos'
|
|
)
|
|
|
|
info = json.loads(content.decode('utf-8'))
|
|
return info
|
|
|
|
|
|
@yt_app.route('/playlist')
|
|
def get_playlist_page():
|
|
if 'list' not in request.args:
|
|
abort(400)
|
|
|
|
playlist_id = request.args.get('list')
|
|
page = request.args.get('page', '1')
|
|
|
|
if page == '1':
|
|
first_page_json = playlist_first_page(playlist_id)
|
|
this_page_json = first_page_json
|
|
else:
|
|
tasks = (
|
|
gevent.spawn(
|
|
playlist_first_page, playlist_id,
|
|
report_text="Retrieved playlist info", use_mobile=True
|
|
),
|
|
gevent.spawn(get_videos, playlist_id, page)
|
|
)
|
|
gevent.joinall(tasks)
|
|
util.check_gevent_exceptions(*tasks)
|
|
first_page_json, this_page_json = tasks[0].value, tasks[1].value
|
|
|
|
info = yt_data_extract.extract_playlist_info(this_page_json)
|
|
if info['error']:
|
|
return flask.render_template('error.html', error_message=info['error'])
|
|
|
|
if page != '1':
|
|
info['metadata'] = yt_data_extract.extract_playlist_metadata(first_page_json)
|
|
|
|
util.prefix_urls(info['metadata'])
|
|
for item in info.get('items', ()):
|
|
util.prefix_urls(item)
|
|
util.add_extra_html_info(item)
|
|
if 'id' in item:
|
|
item['thumbnail'] = f"{settings.img_prefix}https://i.ytimg.com/vi/{item['id']}/hq720.jpg"
|
|
|
|
item['url'] += '&list=' + playlist_id
|
|
if item['index']:
|
|
item['url'] += '&index=' + str(item['index'])
|
|
|
|
video_count = yt_data_extract.deep_get(info, 'metadata', 'video_count')
|
|
if video_count is None:
|
|
video_count = 1000
|
|
|
|
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/100),
|
|
parameters_dictionary=request.args,
|
|
|
|
**info['metadata']
|
|
).encode('utf-8')
|