mirror of
https://gitea.invidious.io/iv-org/invidious-copy-2022-04-11.git
synced 2024-08-15 00:43:26 +00:00
Merge pull request #2205 from syeopite/fix-age-restricted-videos
Partial (and temporary) fix for age restricted videos
This commit is contained in:
commit
3e5c353298
6 changed files with 60 additions and 31 deletions
|
@ -1962,9 +1962,9 @@ get "/api/v1/captions/:id" do |env|
|
||||||
json.array do
|
json.array do
|
||||||
captions.each do |caption|
|
captions.each do |caption|
|
||||||
json.object do
|
json.object do
|
||||||
json.field "label", caption.name.simpleText
|
json.field "label", caption.name
|
||||||
json.field "languageCode", caption.languageCode
|
json.field "languageCode", caption.languageCode
|
||||||
json.field "url", "/api/v1/captions/#{id}?label=#{URI.encode_www_form(caption.name.simpleText)}"
|
json.field "url", "/api/v1/captions/#{id}?label=#{URI.encode_www_form(caption.name)}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1980,7 +1980,7 @@ get "/api/v1/captions/:id" do |env|
|
||||||
if lang
|
if lang
|
||||||
caption = captions.select { |caption| caption.languageCode == lang }
|
caption = captions.select { |caption| caption.languageCode == lang }
|
||||||
else
|
else
|
||||||
caption = captions.select { |caption| caption.name.simpleText == label }
|
caption = captions.select { |caption| caption.name == label }
|
||||||
end
|
end
|
||||||
|
|
||||||
if caption.empty?
|
if caption.empty?
|
||||||
|
@ -1994,7 +1994,7 @@ get "/api/v1/captions/:id" do |env|
|
||||||
|
|
||||||
# Auto-generated captions often have cues that aren't aligned properly with the video,
|
# Auto-generated captions often have cues that aren't aligned properly with the video,
|
||||||
# as well as some other markup that makes it cumbersome, so we try to fix that here
|
# as well as some other markup that makes it cumbersome, so we try to fix that here
|
||||||
if caption.name.simpleText.includes? "auto-generated"
|
if caption.name.includes? "auto-generated"
|
||||||
caption_xml = YT_POOL.client &.get(url).body
|
caption_xml = YT_POOL.client &.get(url).body
|
||||||
caption_xml = XML.parse(caption_xml)
|
caption_xml = XML.parse(caption_xml)
|
||||||
|
|
||||||
|
|
|
@ -165,11 +165,11 @@ class Invidious::Routes::Embed < Invidious::Routes::BaseRoute
|
||||||
captions = video.captions
|
captions = video.captions
|
||||||
|
|
||||||
preferred_captions = captions.select { |caption|
|
preferred_captions = captions.select { |caption|
|
||||||
params.preferred_captions.includes?(caption.name.simpleText) ||
|
params.preferred_captions.includes?(caption.name) ||
|
||||||
params.preferred_captions.includes?(caption.languageCode.split("-")[0])
|
params.preferred_captions.includes?(caption.languageCode.split("-")[0])
|
||||||
}
|
}
|
||||||
preferred_captions.sort_by! { |caption|
|
preferred_captions.sort_by! { |caption|
|
||||||
(params.preferred_captions.index(caption.name.simpleText) ||
|
(params.preferred_captions.index(caption.name) ||
|
||||||
params.preferred_captions.index(caption.languageCode.split("-")[0])).not_nil!
|
params.preferred_captions.index(caption.languageCode.split("-")[0])).not_nil!
|
||||||
}
|
}
|
||||||
captions = captions - preferred_captions
|
captions = captions - preferred_captions
|
||||||
|
|
|
@ -150,11 +150,11 @@ class Invidious::Routes::Watch < Invidious::Routes::BaseRoute
|
||||||
captions = video.captions
|
captions = video.captions
|
||||||
|
|
||||||
preferred_captions = captions.select { |caption|
|
preferred_captions = captions.select { |caption|
|
||||||
params.preferred_captions.includes?(caption.name.simpleText) ||
|
params.preferred_captions.includes?(caption.name) ||
|
||||||
params.preferred_captions.includes?(caption.languageCode.split("-")[0])
|
params.preferred_captions.includes?(caption.languageCode.split("-")[0])
|
||||||
}
|
}
|
||||||
preferred_captions.sort_by! { |caption|
|
preferred_captions.sort_by! { |caption|
|
||||||
(params.preferred_captions.index(caption.name.simpleText) ||
|
(params.preferred_captions.index(caption.name) ||
|
||||||
params.preferred_captions.index(caption.languageCode.split("-")[0])).not_nil!
|
params.preferred_captions.index(caption.languageCode.split("-")[0])).not_nil!
|
||||||
}
|
}
|
||||||
captions = captions - preferred_captions
|
captions = captions - preferred_captions
|
||||||
|
|
|
@ -425,9 +425,9 @@ struct Video
|
||||||
json.array do
|
json.array do
|
||||||
self.captions.each do |caption|
|
self.captions.each do |caption|
|
||||||
json.object do
|
json.object do
|
||||||
json.field "label", caption.name.simpleText
|
json.field "label", caption.name
|
||||||
json.field "languageCode", caption.languageCode
|
json.field "languageCode", caption.languageCode
|
||||||
json.field "url", "/api/v1/captions/#{id}?label=#{URI.encode_www_form(caption.name.simpleText)}"
|
json.field "url", "/api/v1/captions/#{id}?label=#{URI.encode_www_form(caption.name)}"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -706,8 +706,12 @@ struct Video
|
||||||
def captions : Array(Caption)
|
def captions : Array(Caption)
|
||||||
return @captions.as(Array(Caption)) if @captions
|
return @captions.as(Array(Caption)) if @captions
|
||||||
captions = info["captions"]?.try &.["playerCaptionsTracklistRenderer"]?.try &.["captionTracks"]?.try &.as_a.map do |caption|
|
captions = info["captions"]?.try &.["playerCaptionsTracklistRenderer"]?.try &.["captionTracks"]?.try &.as_a.map do |caption|
|
||||||
caption = Caption.from_json(caption.to_json)
|
name = caption["name"]["simpleText"]? || caption["name"]["runs"][0]["text"]
|
||||||
caption.name.simpleText = caption.name.simpleText.split(" - ")[0]
|
languageCode = caption["languageCode"].to_s
|
||||||
|
baseUrl = caption["baseUrl"].to_s
|
||||||
|
|
||||||
|
caption = Caption.new(name.to_s, languageCode, baseUrl)
|
||||||
|
caption.name = caption.name.split(" - ")[0]
|
||||||
caption
|
caption
|
||||||
end
|
end
|
||||||
captions ||= [] of Caption
|
captions ||= [] of Caption
|
||||||
|
@ -782,18 +786,19 @@ struct Video
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
struct CaptionName
|
|
||||||
include JSON::Serializable
|
|
||||||
|
|
||||||
property simpleText : String
|
|
||||||
end
|
|
||||||
|
|
||||||
struct Caption
|
struct Caption
|
||||||
include JSON::Serializable
|
property name
|
||||||
|
property languageCode
|
||||||
|
property baseUrl
|
||||||
|
|
||||||
property name : CaptionName
|
getter name : String
|
||||||
property baseUrl : String
|
getter languageCode : String
|
||||||
property languageCode : String
|
getter baseUrl : String
|
||||||
|
|
||||||
|
setter name
|
||||||
|
|
||||||
|
def initialize(@name, @languageCode, @baseUrl)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
class VideoRedirect < Exception
|
class VideoRedirect < Exception
|
||||||
|
@ -989,9 +994,33 @@ def fetch_video(id, region)
|
||||||
|
|
||||||
# Try to pull streams from embed URL
|
# Try to pull streams from embed URL
|
||||||
if info["reason"]?
|
if info["reason"]?
|
||||||
|
required_parameters = {
|
||||||
|
"video_id" => id,
|
||||||
|
"eurl" => "https://youtube.googleapis.com/v/#{id}",
|
||||||
|
"html5" => "1",
|
||||||
|
"gl" => "US",
|
||||||
|
"hl" => "en",
|
||||||
|
}
|
||||||
|
if info["reason"].as_s.includes?("inappropriate")
|
||||||
|
# The html5, c and cver parameters are required in order to extract age-restricted videos
|
||||||
|
# See https://github.com/yt-dlp/yt-dlp/commit/4e6767b5f2e2523ebd3dd1240584ead53e8c8905
|
||||||
|
required_parameters.merge!({
|
||||||
|
"c" => "TVHTML5",
|
||||||
|
"cver" => "6.20180913",
|
||||||
|
})
|
||||||
|
|
||||||
|
# In order to actually extract video info without error, the `x-youtube-client-version`
|
||||||
|
# has to be set to the same version as `cver` above.
|
||||||
|
additional_headers = HTTP::Headers{"x-youtube-client-version" => "6.20180913"}
|
||||||
|
else
|
||||||
embed_page = YT_POOL.client &.get("/embed/#{id}").body
|
embed_page = YT_POOL.client &.get("/embed/#{id}").body
|
||||||
sts = embed_page.match(/"sts"\s*:\s*(?<sts>\d+)/).try &.["sts"]? || ""
|
sts = embed_page.match(/"sts"\s*:\s*(?<sts>\d+)/).try &.["sts"]? || ""
|
||||||
embed_info = HTTP::Params.parse(YT_POOL.client &.get("/get_video_info?html5=1&video_id=#{id}&eurl=https://youtube.googleapis.com/v/#{id}&gl=US&hl=en&sts=#{sts}").body)
|
required_parameters["sts"] = sts
|
||||||
|
additional_headers = HTTP::Headers{} of String => String
|
||||||
|
end
|
||||||
|
|
||||||
|
embed_info = HTTP::Params.parse(YT_POOL.client &.get("/get_video_info?#{URI::Params.encode(required_parameters)}",
|
||||||
|
headers: additional_headers).body)
|
||||||
|
|
||||||
if embed_info["player_response"]?
|
if embed_info["player_response"]?
|
||||||
player_response = JSON.parse(embed_info["player_response"])
|
player_response = JSON.parse(embed_info["player_response"])
|
||||||
|
|
|
@ -25,13 +25,13 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% preferred_captions.each do |caption| %>
|
<% preferred_captions.each do |caption| %>
|
||||||
<track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
|
<track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
|
||||||
label="<%= caption.name.simpleText %>">
|
label="<%= caption.name %>">
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% captions.each do |caption| %>
|
<% captions.each do |caption| %>
|
||||||
<track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name.simpleText %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
|
<track kind="captions" src="/api/v1/captions/<%= video.id %>?label=<%= caption.name %>&hl=<%= env.get("preferences").as(Preferences).locale %>"
|
||||||
label="<%= caption.name.simpleText %>">
|
label="<%= caption.name %>">
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</video>
|
</video>
|
||||||
|
|
|
@ -178,8 +178,8 @@ we're going to need to do it here in order to allow for translations.
|
||||||
</option>
|
</option>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% captions.each do |caption| %>
|
<% captions.each do |caption| %>
|
||||||
<option value='{"id":"<%= video.id %>","label":"<%= caption.name.simpleText %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= caption.languageCode %>.vtt"}'>
|
<option value='{"id":"<%= video.id %>","label":"<%= caption.name %>","title":"<%= URI.encode_www_form(video.title) %>-<%= video.id %>.<%= caption.languageCode %>.vtt"}'>
|
||||||
<%= translate(locale, "Subtitles - `x` (.vtt)", caption.name.simpleText) %>
|
<%= translate(locale, "Subtitles - `x` (.vtt)", caption.name) %>
|
||||||
</option>
|
</option>
|
||||||
<% end %>
|
<% end %>
|
||||||
</select>
|
</select>
|
||||||
|
|
Loading…
Reference in a new issue