ProjectSegfault/invidious-experimenting
4
0
Fork 0
forked from midou/invidious
Code Pull Requests Activity

Minor refactor

Browse Source
This commit is contained in:
Omar Roth 2020-01-08 20:27:21 -05:00
parent 4aada65dae
commit 7b88d0efe3
No known key found for this signature in database
GPG Key ID: B8254FB7EC3D37F2
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/invidious.cr
View File

@ -3841,10 +3841,10 @@ get "/api/v1/captions/:id" do |env|
env.response.content_type = "text/vtt; charset=UTF-8" env.response.content_type = "text/vtt; charset=UTF-8"
caption = captions.select { |caption| caption.name.simpleText == label }
if lang if lang
caption = captions.select { |caption| caption.languageCode == lang } caption = captions.select { |caption| caption.languageCode == lang }
else
caption = captions.select { |caption| caption.name.simpleText == label }
end end
if caption.empty? if caption.empty?
@ -5155,7 +5155,7 @@ get "/api/manifest/dash/id/:id" do |env|
# Since some implementations create playlists based on resolution regardless of different codecs, # Since some implementations create playlists based on resolution regardless of different codecs,
# we can opt to only add a source to a representation if it has a unique height within that representation # we can opt to only add a source to a representation if it has a unique height within that representation
unique_res = env.params.query["unique_res"]? && (env.params.query["unique_res"] == "true" || env.params.query["unique_res"] == "1") unique_res = env.params.query["unique_res"]?.try { |q| (q == "true" || q == "1").to_unsafe }
begin begin
video = get_video(id, PG_DB, region: region) video = get_video(id, PG_DB, region: region)
@ -5167,7 +5167,7 @@ get "/api/manifest/dash/id/:id" do |env|
end end
if dashmpd = video.player_response["streamingData"]?.try &.["dashManifestUrl"]?.try &.as_s if dashmpd = video.player_response["streamingData"]?.try &.["dashManifestUrl"]?.try &.as_s
manifest = YT_POOL.client &.get(dashmpd).body manifest = YT_POOL.client &.get(URI.parse(dashmpd).full_path).body
manifest = manifest.gsub(/<BaseURL>[^<]+<\/BaseURL>/) do |baseurl| manifest = manifest.gsub(/<BaseURL>[^<]+<\/BaseURL>/) do |baseurl|
url = baseurl.lchop("<BaseURL>") url = baseurl.lchop("<BaseURL>")
@ -5192,7 +5192,7 @@ get "/api/manifest/dash/id/:id" do |env|
end end
audio_streams = video.audio_streams(adaptive_fmts) audio_streams = video.audio_streams(adaptive_fmts)
video_streams = video.video_streams(adaptive_fmts).sort_by { |stream| stream["fps"].to_i }.reverse video_streams = video.video_streams(adaptive_fmts).sort_by { |stream| {stream["size"].split("x")[0].to_i, stream["fps"].to_i} }.reverse
XML.build(indent: " ", encoding: "UTF-8") do |xml| XML.build(indent: " ", encoding: "UTF-8") do |xml|
xml.element("MPD", "xmlns": "urn:mpeg:dash:schema:mpd:2011", xml.element("MPD", "xmlns": "urn:mpeg:dash:schema:mpd:2011",
@ -5230,9 +5230,7 @@ get "/api/manifest/dash/id/:id" do |env|
{"video/mp4", "video/webm"}.each do |mime_type| {"video/mp4", "video/webm"}.each do |mime_type|
mime_streams = video_streams.select { |stream| stream["type"].starts_with? mime_type } mime_streams = video_streams.select { |stream| stream["type"].starts_with? mime_type }
if mime_streams.empty? next if mime_streams.empty?
next
end
heights = [] of Int32 heights = [] of Int32
xml.element("AdaptationSet", id: i, mimeType: mime_type, startWithSAP: 1, subsegmentAlignment: true, scanType: "progressive") do xml.element("AdaptationSet", id: i, mimeType: mime_type, startWithSAP: 1, subsegmentAlignment: true, scanType: "progressive") do

5
src/invidious/videos.cr
View File

@ -621,10 +621,7 @@ struct Video
if fmts = player_response["streamingData"]?.try &.["adaptiveFormats"]? if fmts = player_response["streamingData"]?.try &.["adaptiveFormats"]?
fmts.as_a.each do |adaptive_fmt| fmts.as_a.each do |adaptive_fmt|
if !adaptive_fmt.as_h? next if !adaptive_fmt.as_h?
next
end
fmt = {} of String => String fmt = {} of String => String
if init = adaptive_fmt["initRange"]? if init = adaptive_fmt["initRange"]?