fix: rebuild formats from yt-dlp data
makes yattee and freetube work
This commit is contained in:
104
ythdd_inv_tl.py
104
ythdd_inv_tl.py
@@ -227,6 +227,94 @@ def rebuildFormats(data):
|
||||
|
||||
return result, formatStreams
|
||||
|
||||
def rebuildFormatsFromYtdlpApi(ydata: dict):
|
||||
# Rebuild invidious-compatible formats from yt-dlp's output (ydata)
|
||||
|
||||
adaptive_formats = []
|
||||
format_streams = []
|
||||
|
||||
for stream in safeTraverse(ydata, ["formats"], default=[]):
|
||||
|
||||
if safeTraverse(stream, ["protocol"], default="storyboard") not in ("http_dash_segments"):
|
||||
continue
|
||||
|
||||
newRow = {}
|
||||
# Add from ...'s ... to ... as ...
|
||||
newRow["bitrate"] = str(int(safeTraverse(stream, ["tbr"], default=0) * 1000))
|
||||
newRow["url"] = safeTraverse(stream, ["url"])
|
||||
newRow["itag"] = safeTraverse(stream, ["format_id"])
|
||||
params = ythdd_extractor.paramsFromUrl(newRow["url"])
|
||||
|
||||
vcodec = safeTraverse(stream, ["vcodec"], default="none")
|
||||
acodec = safeTraverse(stream, ["acodec"], default="none")
|
||||
if vcodec == "none" and acodec == "none":
|
||||
continue
|
||||
|
||||
if safeTraverse(stream, ["acodec"]) != "none":
|
||||
# audio-only track
|
||||
type = safeTraverse(stream, ["audio_ext"], default=None)
|
||||
if type is None:
|
||||
type = "mp4"
|
||||
newRow[ "type"] = "audio/" + type
|
||||
newRow[ "audioQuality"] = str(safeTraverse(stream, ["abr"], default=128))
|
||||
newRow["audioSampleRate"] = str(safeTraverse(stream, ["asr"], default=44100))
|
||||
newRow[ "audioChannels"] = safeTraverse(stream, ["audio_channels"])
|
||||
newRow[ "qualityLabel"] = newRow["audioQuality"] + "kbps"
|
||||
if safeTraverse(stream, ["vcodec"]) != "none":
|
||||
# either video-only or video+audio
|
||||
type = safeTraverse(stream, ["video_ext"], default=None)
|
||||
if type is None:
|
||||
type = "mp4"
|
||||
height = str(safeTraverse(stream, ["height"], default=0))
|
||||
width = str(safeTraverse(stream, [ "width"], default=0))
|
||||
newRow[ "type"] = "video/" + type
|
||||
newRow[ "resolution"] = height + "p"
|
||||
newRow[ "fps"] = safeTraverse(stream, ["fps"], default=30)
|
||||
newRow[ "qualityLabel"] = height + "p" + str(int(newRow['fps'])) * (newRow["fps"] > 30) # also a placeholder
|
||||
newRow[ "size"] = width + "x" + height
|
||||
|
||||
newRow["clen"] = safeTraverse(params, ["clen"], default=safeTraverse(stream, ["filesize"], default="0"))
|
||||
newRow["lmt"] = safeTraverse(params, ["lmt"], default="0")
|
||||
|
||||
if vcodec != "none" and acodec != "none":
|
||||
# 360p stream
|
||||
format_streams.append(newRow.copy())
|
||||
if vcodec != "none" or acodec != "none":
|
||||
adaptive_formats.append(newRow.copy())
|
||||
|
||||
|
||||
# {
|
||||
# "url": data[best_bitrate_video]['url'],
|
||||
# "itag": str(data[best_bitrate_video]['itag']),
|
||||
# "type": data[best_bitrate_video]['mimeType'],
|
||||
# "quality": data[best_bitrate_video]['quality'],
|
||||
# "bitrate": str(data[best_bitrate_video]['averageBitrate']),
|
||||
# "fps": data[best_bitrate_video]['fps'],
|
||||
# "size": "", # workaround for clipious, which requires ANYTHING to be passed, or else it will throw and error and won't load the video
|
||||
# "resolution": str(invidious_formats.FORMATS[data[best_bitrate_video]['itag']]['height']) + "p",
|
||||
# "qualityLabel": str(invidious_formats.FORMATS[data[best_bitrate_video]['itag']]['height']) + "p",
|
||||
# "container": invidious_formats.FORMATS[data[best_bitrate_video]['itag']]['ext'],
|
||||
# "encoding": invidious_formats.FORMATS[data[best_bitrate_video]['itag']]['vcodec']
|
||||
# }
|
||||
|
||||
# {
|
||||
# "audioChannels": data[best_bitrate_audio]['audioChannels'],
|
||||
# "init": result[best_bitrate_audio]['init'],
|
||||
# "index": result[best_bitrate_audio]['index'],
|
||||
# "bitrate": str(data[best_bitrate_audio]['averageBitrate']),
|
||||
# "url": data[best_bitrate_audio]['url'],
|
||||
# "itag": str(data[best_bitrate_audio]['itag']),
|
||||
# "type": data[best_bitrate_audio]['mimeType'],
|
||||
# "clen": result[best_bitrate_audio]['clen'],
|
||||
# "lmt": result[best_bitrate_audio]['lmt'],
|
||||
# "projectionType": result[best_bitrate_audio]['projectionType'],
|
||||
# "audioQuality": result[best_bitrate_audio]['audioQuality'],
|
||||
# "audioSampleRate": result[best_bitrate_audio]['audioSampleRate'],
|
||||
# "qualityLabel": "audio"
|
||||
# }
|
||||
|
||||
return adaptive_formats, format_streams
|
||||
|
||||
def videos(data):
|
||||
# an attempt on a faithful rewrite of
|
||||
# https://github.com/iv-org/invidious/blob/master/src/invidious/videos/parser.cr
|
||||
@@ -247,7 +335,7 @@ def videos(data):
|
||||
|
||||
time_start = time()
|
||||
|
||||
ydata = ythdd_extractor.extract(data[3])
|
||||
ydata = ythdd_extractor.extract(data[3], manifest_fix=True)
|
||||
wdata = ythdd_extractor.WEBextractSinglePage(data[3])
|
||||
|
||||
#return send(200, {'ydata': ydata, 'wdata': wdata})
|
||||
@@ -309,7 +397,9 @@ def videos(data):
|
||||
related_video['viewCountText'] = safeTraverse(y, ['shortViewCountText', 'simpleText'], default="0").split(" ")[0]
|
||||
related_views = 0
|
||||
if related_views_text:
|
||||
related_views = int("".join([z for z in related_views_text if 48 <= ord(z) and ord(z) <= 57]))
|
||||
if related_views_text.lower() == "no":
|
||||
related_views_text = "0"
|
||||
related_views = int("0" + "".join([z for z in related_views_text if 48 <= ord(z) and ord(z) <= 57]))
|
||||
related_views_text = related_views_text.split(" ")[0]
|
||||
related_video['viewCount'] = related_views
|
||||
related.append(related_video)
|
||||
@@ -346,7 +436,9 @@ def videos(data):
|
||||
# subs *= magnitude[x]
|
||||
subs = ydata['channel_follower_count']
|
||||
channel_about_info = ythdd_extractor.browseAbout(ucid)
|
||||
author_thumbnail = ythdd_extractor.getChannelAvatar(channel_about_info)
|
||||
author_thumbnail = [ # must be a list
|
||||
ythdd_extractor.getChannelAvatar(channel_about_info)
|
||||
] * 3 # yes really
|
||||
# for x in author_thumbnail:
|
||||
# # rewrite to use views.py
|
||||
# x['url'] = ythdd_globals.translateLinks(x['url'])
|
||||
@@ -357,6 +449,7 @@ def videos(data):
|
||||
|
||||
format_streams = []
|
||||
# adaptive_formats, format_streams = rebuildFormats(adaptive_formats)
|
||||
adaptive_formats, format_streams = rebuildFormatsFromYtdlpApi(ydata)
|
||||
|
||||
if live_now:
|
||||
video_type = "livestream"
|
||||
@@ -417,7 +510,7 @@ def videos(data):
|
||||
"premiereTimestamp": premiere_timestamp,
|
||||
|
||||
#"hlsUrl": hls_url, # broken after a change in iOS player
|
||||
#"adaptiveFormats": adaptive_formats, # same as hlsUrl
|
||||
"adaptiveFormats": adaptive_formats, # same as hlsUrl
|
||||
"formatStreams": format_streams, # very bare bones, empty actually xD
|
||||
"captions": [], # not implemented
|
||||
# "captions": [
|
||||
@@ -440,6 +533,9 @@ def videos(data):
|
||||
}
|
||||
#'''
|
||||
|
||||
if ythdd_globals.config['general']['debug']:
|
||||
response["ydata"] = ydata
|
||||
|
||||
# for debugging:
|
||||
#return send(200, ythdd_extractor.WEBextractSinglePage(data[3]))
|
||||
#return send(200, ythdd_extractor.IOSextract(data[3]))
|
||||
|
||||
Reference in New Issue
Block a user