mirror of https://github.com/iv-org/invidious.git
trying to only use next endpoint for the major data
This commit is contained in:
Emilien Devos
parent
70e4eb7f5d
commit
2a40f3b9c5
|
|
@ -497,5 +497,8 @@
|
|||
"toggle_theme": "Toggle Theme",
|
||||
"carousel_slide": "Slide {{current}} of {{total}}",
|
||||
"carousel_skip": "Skip the Carousel",
|
||||
"carousel_go_to": "Go to slide `x`"
|
||||
"carousel_go_to": "Go to slide `x`",
|
||||
"error_from_youtube_unplayable": "Video unplayable due to an error from YouTube:",
|
||||
"error_processing_data_youtube": "Error while processing the data sent by YouTube",
|
||||
"refresh_page": "Refresh the page"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,10 +73,6 @@ def error_template_helper(env : HTTP::Server::Context, status_code : Int32, exce
|
|||
</div>
|
||||
END_HTML
|
||||
|
||||
# Don't show the usual "next steps" widget. The same options are
|
||||
# proposed above the error message, just worded differently.
|
||||
next_steps = ""
|
||||
|
||||
return templated "error"
|
||||
end
|
||||
|
||||
|
|
@ -86,8 +82,13 @@ def error_template_helper(env : HTTP::Server::Context, status_code : Int32, mess
|
|||
|
||||
locale = env.get("preferences").as(Preferences).locale
|
||||
|
||||
error_message = translate(locale, message)
|
||||
next_steps = error_redirect_helper(env)
|
||||
error_message = <<-END_HTML
|
||||
<div class="error_message">
|
||||
<h2>#{translate(locale, "error_processing_data_youtube")}</h2>
|
||||
<p>#{translate(locale, message)}</p>
|
||||
#{error_redirect_helper(env)}
|
||||
</div>
|
||||
END_HTML
|
||||
|
||||
return templated "error"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -117,79 +117,83 @@ module Invidious::Routes::Watch
|
|||
comment_html ||= ""
|
||||
end
|
||||
|
||||
fmt_stream = video.fmt_stream
|
||||
adaptive_fmts = video.adaptive_fmts
|
||||
if video.reason.nil?
|
||||
fmt_stream = video.fmt_stream
|
||||
adaptive_fmts = video.adaptive_fmts
|
||||
|
||||
if params.local
|
||||
fmt_stream.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).request_target) }
|
||||
adaptive_fmts.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).request_target) }
|
||||
end
|
||||
|
||||
video_streams = video.video_streams
|
||||
audio_streams = video.audio_streams
|
||||
|
||||
# Older videos may not have audio sources available.
|
||||
# We redirect here so they're not unplayable
|
||||
if audio_streams.empty? && !video.live_now
|
||||
if params.quality == "dash"
|
||||
env.params.query.delete_all("quality")
|
||||
env.params.query["quality"] = "medium"
|
||||
return env.redirect "/watch?#{env.params.query}"
|
||||
elsif params.listen
|
||||
env.params.query.delete_all("listen")
|
||||
env.params.query["listen"] = "0"
|
||||
return env.redirect "/watch?#{env.params.query}"
|
||||
if params.local
|
||||
fmt_stream.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).request_target) }
|
||||
adaptive_fmts.each { |fmt| fmt["url"] = JSON::Any.new(URI.parse(fmt["url"].as_s).request_target) }
|
||||
end
|
||||
end
|
||||
|
||||
captions = video.captions
|
||||
video_streams = video.video_streams
|
||||
audio_streams = video.audio_streams
|
||||
|
||||
preferred_captions = captions.select { |caption|
|
||||
params.preferred_captions.includes?(caption.name) ||
|
||||
params.preferred_captions.includes?(caption.language_code.split("-")[0])
|
||||
}
|
||||
preferred_captions.sort_by! { |caption|
|
||||
(params.preferred_captions.index(caption.name) ||
|
||||
params.preferred_captions.index(caption.language_code.split("-")[0])).not_nil!
|
||||
}
|
||||
captions = captions - preferred_captions
|
||||
# Older videos may not have audio sources available.
|
||||
# We redirect here so they're not unplayable
|
||||
if audio_streams.empty? && !video.live_now
|
||||
if params.quality == "dash"
|
||||
env.params.query.delete_all("quality")
|
||||
env.params.query["quality"] = "medium"
|
||||
return env.redirect "/watch?#{env.params.query}"
|
||||
elsif params.listen
|
||||
env.params.query.delete_all("listen")
|
||||
env.params.query["listen"] = "0"
|
||||
return env.redirect "/watch?#{env.params.query}"
|
||||
end
|
||||
end
|
||||
|
||||
aspect_ratio = "16:9"
|
||||
captions = video.captions
|
||||
|
||||
thumbnail = "/vi/#{video.id}/maxres.jpg"
|
||||
preferred_captions = captions.select { |caption|
|
||||
params.preferred_captions.includes?(caption.name) ||
|
||||
params.preferred_captions.includes?(caption.language_code.split("-")[0])
|
||||
}
|
||||
preferred_captions.sort_by! { |caption|
|
||||
(params.preferred_captions.index(caption.name) ||
|
||||
params.preferred_captions.index(caption.language_code.split("-")[0])).not_nil!
|
||||
}
|
||||
captions = captions - preferred_captions
|
||||
|
||||
if params.raw
|
||||
if params.listen
|
||||
url = audio_streams[0]["url"].as_s
|
||||
aspect_ratio = "16:9"
|
||||
|
||||
if params.quality.ends_with? "k"
|
||||
audio_streams.each do |fmt|
|
||||
if fmt["bitrate"].as_i == params.quality.rchop("k").to_i
|
||||
thumbnail = "/vi/#{video.id}/maxres.jpg"
|
||||
|
||||
if params.raw
|
||||
if params.listen
|
||||
url = audio_streams[0]["url"].as_s
|
||||
|
||||
if params.quality.ends_with? "k"
|
||||
audio_streams.each do |fmt|
|
||||
if fmt["bitrate"].as_i == params.quality.rchop("k").to_i
|
||||
url = fmt["url"].as_s
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
url = fmt_stream[0]["url"].as_s
|
||||
|
||||
fmt_stream.each do |fmt|
|
||||
if fmt["quality"].as_s == params.quality
|
||||
url = fmt["url"].as_s
|
||||
end
|
||||
end
|
||||
end
|
||||
else
|
||||
url = fmt_stream[0]["url"].as_s
|
||||
|
||||
fmt_stream.each do |fmt|
|
||||
if fmt["quality"].as_s == params.quality
|
||||
url = fmt["url"].as_s
|
||||
end
|
||||
end
|
||||
return env.redirect url
|
||||
end
|
||||
|
||||
return env.redirect url
|
||||
# Structure used for the download widget
|
||||
video_assets = Invidious::Frontend::WatchPage::VideoAssets.new(
|
||||
full_videos: fmt_stream,
|
||||
video_streams: video_streams,
|
||||
audio_streams: audio_streams,
|
||||
captions: video.captions
|
||||
)
|
||||
else
|
||||
env.response.status_code = 500
|
||||
end
|
||||
|
||||
# Structure used for the download widget
|
||||
video_assets = Invidious::Frontend::WatchPage::VideoAssets.new(
|
||||
full_videos: fmt_stream,
|
||||
video_streams: video_streams,
|
||||
audio_streams: audio_streams,
|
||||
captions: video.captions
|
||||
)
|
||||
|
||||
templated "watch"
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -313,7 +313,7 @@ def get_video(id, refresh = true, region = nil, force_refresh = false)
|
|||
end
|
||||
else
|
||||
video = fetch_video(id, region)
|
||||
Invidious::Database::Videos.insert(video) if !region
|
||||
Invidious::Database::Videos.insert(video) if !region && !video.info.dig?("reason")
|
||||
end
|
||||
|
||||
return video
|
||||
|
|
@ -326,13 +326,17 @@ end
|
|||
def fetch_video(id, region)
|
||||
info = extract_video_info(video_id: id)
|
||||
|
||||
if reason = info["reason"]?
|
||||
if info["reason"]?
|
||||
reason = info["reason"].as_s
|
||||
if info.dig?("subreason")
|
||||
subreason = info["subreason"].as_s
|
||||
else
|
||||
subreason = "No additional reason"
|
||||
end
|
||||
if reason == "Video unavailable"
|
||||
raise NotFoundException.new(reason.as_s || "")
|
||||
elsif !reason.as_s.starts_with? "Premieres"
|
||||
# dont error when it's a premiere.
|
||||
# we already parsed most of the data and display the premiere date
|
||||
raise InfoException.new(reason.as_s || "")
|
||||
raise NotFoundException.new(reason + ": " + subreason || "")
|
||||
elsif {"Private video"}.any?(reason)
|
||||
raise InfoException.new(reason + ": " + subreason || "")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -64,18 +64,19 @@ def extract_video_info(video_id : String)
|
|||
playability_status = player_response.dig?("playabilityStatus", "status").try &.as_s
|
||||
|
||||
if playability_status != "OK"
|
||||
subreason = player_response.dig?("playabilityStatus", "errorScreen", "playerErrorMessageRenderer", "subreason")
|
||||
reason = subreason.try &.[]?("simpleText").try &.as_s
|
||||
reason ||= subreason.try &.[]("runs").as_a.map(&.[]("text")).join("")
|
||||
reason ||= player_response.dig("playabilityStatus", "reason").as_s
|
||||
reason = player_response.dig?("playabilityStatus", "reason").try &.as_s
|
||||
reason ||= player_response.dig("playabilityStatus", "errorScreen", "playerErrorMessageRenderer", "reason", "simpleText").as_s
|
||||
subreason_main = player_response.dig?("playabilityStatus", "errorScreen", "playerErrorMessageRenderer", "subreason")
|
||||
subreason = subreason_main.try &.[]?("simpleText").try &.as_s
|
||||
subreason ||= subreason_main.try &.[]("runs").as_a.map(&.[]("text")).join("")
|
||||
|
||||
# Stop here if video is not a scheduled livestream or
|
||||
# for LOGIN_REQUIRED when videoDetails element is not found because retrying won't help
|
||||
if !{"LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status) ||
|
||||
playability_status == "LOGIN_REQUIRED" && !player_response.dig?("videoDetails")
|
||||
if {"Private video", "Video unavailable"}.any?(reason)
|
||||
return {
|
||||
"version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
|
||||
"reason" => JSON::Any.new(reason),
|
||||
"version" => JSON::Any.new(Video::SCHEMA_VERSION.to_i64),
|
||||
"reason" => JSON::Any.new(reason),
|
||||
"subreason" => JSON::Any.new(subreason),
|
||||
}
|
||||
end
|
||||
elsif video_id != player_response.dig("videoDetails", "videoId")
|
||||
|
|
@ -95,11 +96,8 @@ def extract_video_info(video_id : String)
|
|||
reason = nil
|
||||
end
|
||||
|
||||
# Don't fetch the next endpoint if the video is unavailable.
|
||||
if {"OK", "LIVE_STREAM_OFFLINE", "LOGIN_REQUIRED"}.any?(playability_status)
|
||||
next_response = YoutubeAPI.next({"videoId": video_id, "params": ""})
|
||||
player_response = player_response.merge(next_response)
|
||||
end
|
||||
next_response = YoutubeAPI.next({"videoId": video_id, "params": ""})
|
||||
player_response = player_response.merge(next_response)
|
||||
|
||||
params = parse_video_info(video_id, player_response)
|
||||
params["reason"] = JSON::Any.new(reason) if reason
|
||||
|
|
@ -205,17 +203,22 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
|
|||
raise BrokenTubeException.new("videoSecondaryInfoRenderer") if !video_secondary_renderer
|
||||
end
|
||||
|
||||
video_details = player_response.dig?("videoDetails")
|
||||
if !(video_details = player_response.dig?("videoDetails"))
|
||||
video_details = {} of String => JSON::Any
|
||||
end
|
||||
if !(microformat = player_response.dig?("microformat", "playerMicroformatRenderer"))
|
||||
microformat = {} of String => JSON::Any
|
||||
end
|
||||
|
||||
raise BrokenTubeException.new("videoDetails") if !video_details
|
||||
|
||||
# Basic video infos
|
||||
|
||||
title = video_details["title"]?.try &.as_s
|
||||
|
||||
title ||= extract_text(
|
||||
video_primary_renderer
|
||||
.try &.dig?("title")
|
||||
)
|
||||
|
||||
# We have to try to extract viewCount from videoPrimaryInfoRenderer first,
|
||||
# then from videoDetails, as the latter is "0" for livestreams (we want
|
||||
# to get the amount of viewers watching).
|
||||
|
|
@ -226,17 +229,27 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
|
|||
views_txt ||= video_details["viewCount"]?.try &.as_s || ""
|
||||
views = views_txt.gsub(/\D/, "").to_i64?
|
||||
|
||||
length_txt = (microformat["lengthSeconds"]? || video_details["lengthSeconds"])
|
||||
length_txt = (microformat["lengthSeconds"]? || video_details["lengthSeconds"]?)
|
||||
.try &.as_s.to_i64
|
||||
|
||||
published = microformat["publishDate"]?
|
||||
.try { |t| Time.parse(t.as_s, "%Y-%m-%d", Time::Location::UTC) } || Time.utc
|
||||
published_txt = video_primary_renderer
|
||||
.try &.dig?("dateText", "simpleText")
|
||||
|
||||
if published_txt.try &.as_s.includes?("ago") && !published_txt.nil?
|
||||
published = decode_date(published_txt.as_s.lchop("Started streaming "))
|
||||
elsif published_txt && published_txt.try &.as_s.matches?(/(\w{3} \d{1,2}, \d{4})$/)
|
||||
published = Time.parse(published_txt.as_s.match!(/(\w{3} \d{1,2}, \d{4})$/)[0], "%b %-d, %Y", Time::Location::UTC)
|
||||
else
|
||||
published = Time.utc
|
||||
end
|
||||
|
||||
premiere_timestamp = microformat.dig?("liveBroadcastDetails", "startTimestamp")
|
||||
.try { |t| Time.parse_rfc3339(t.as_s) }
|
||||
|
||||
live_now = microformat.dig?("liveBroadcastDetails", "isLiveNow")
|
||||
.try &.as_bool || false
|
||||
.try &.as_bool
|
||||
live_now ||= video_primary_renderer
|
||||
.try &.dig?("viewCount", "videoViewCountRenderer", "isLive").try &.as_bool || false
|
||||
|
||||
post_live_dvr = video_details.dig?("isPostLiveDvr")
|
||||
.try &.as_bool || false
|
||||
|
|
@ -404,9 +417,6 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
|
|||
|
||||
# Author infos
|
||||
|
||||
author = video_details["author"]?.try &.as_s
|
||||
ucid = video_details["channelId"]?.try &.as_s
|
||||
|
||||
if author_info = video_secondary_renderer.try &.dig?("owner", "videoOwnerRenderer")
|
||||
author_thumbnail = author_info.dig?("thumbnail", "thumbnails", 0, "url")
|
||||
author_verified = has_verified_badge?(author_info["badges"]?)
|
||||
|
|
@ -414,6 +424,9 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
|
|||
subs_text = author_info["subscriberCountText"]?
|
||||
.try { |t| t["simpleText"]? || t.dig?("runs", 0, "text") }
|
||||
.try &.as_s.split(" ", 2)[0]
|
||||
|
||||
author = author_info.dig?("title", "runs", 0, "text").try &.as_s
|
||||
ucid = author_info.dig?("title", "runs", 0, "navigationEndpoint", "browseEndpoint", "browseId").try &.as_s
|
||||
end
|
||||
|
||||
# Return data
|
||||
|
|
@ -438,7 +451,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
|
|||
# Extra video infos
|
||||
"allowedRegions" => JSON::Any.new(allowed_regions.map { |v| JSON::Any.new(v) }),
|
||||
"allowRatings" => JSON::Any.new(allow_ratings || false),
|
||||
"isFamilyFriendly" => JSON::Any.new(family_friendly || false),
|
||||
"isFamilyFriendly" => JSON::Any.new(family_friendly || true),
|
||||
"isListed" => JSON::Any.new(is_listed || false),
|
||||
"isUpcoming" => JSON::Any.new(is_upcoming || false),
|
||||
"keywords" => JSON::Any.new(keywords.map { |v| JSON::Any.new(v) }),
|
||||
|
|
@ -448,7 +461,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
|
|||
# Description
|
||||
"description" => JSON::Any.new(description || ""),
|
||||
"descriptionHtml" => JSON::Any.new(description_html || "<p></p>"),
|
||||
"shortDescription" => JSON::Any.new(short_description.try &.as_s || nil),
|
||||
"shortDescription" => JSON::Any.new(short_description.try &.as_s || ""),
|
||||
# Video metadata
|
||||
"genre" => JSON::Any.new(genre.try &.as_s || ""),
|
||||
"genreUcid" => JSON::Any.new(genre_ucid.try &.as_s?),
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
<% if audio_streams && fmt_stream && preferred_captions && captions %>
|
||||
<video style="outline:none;width:100%;background-color:#000" playsinline poster="<%= thumbnail %>"
|
||||
id="player" class="on-video_player video-js player-style-<%= params.player_style %>"
|
||||
preload="<% if params.preload %>auto<% else %>none<% end %>"
|
||||
|
|
@ -79,3 +80,4 @@
|
|||
%>
|
||||
</script>
|
||||
<script src="/js/player.js?v=<%= ASSET_COMMIT %>"></script>
|
||||
<% end %>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,15 @@
|
|||
%>
|
||||
</script>
|
||||
|
||||
<%= rendered "components/player" %>
|
||||
<% if video.reason.nil? %>
|
||||
<h3>
|
||||
<%= video.reason %>
|
||||
</h3>
|
||||
<% else %>
|
||||
<div id="player-container" class="h-box">
|
||||
<%= rendered "components/player" %>
|
||||
</div>
|
||||
<% end %>
|
||||
<script src="/js/embed.js?v=<%= ASSET_COMMIT %>"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -4,5 +4,4 @@
|
|||
|
||||
<div class="h-box">
|
||||
<%= error_message %>
|
||||
<%= next_steps %>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -70,9 +70,11 @@ we're going to need to do it here in order to allow for translations.
|
|||
%>
|
||||
</script>
|
||||
|
||||
<% if video.reason.nil? %>
|
||||
<div id="player-container" class="h-box">
|
||||
<%= rendered "components/player" %>
|
||||
</div>
|
||||
<% end %>
|
||||
|
||||
<div class="h-box">
|
||||
<h1>
|
||||
|
|
@ -96,7 +98,10 @@ we're going to need to do it here in order to allow for translations.
|
|||
|
||||
<% if video.reason %>
|
||||
<h3>
|
||||
<%= video.reason %>
|
||||
<%= translate(locale, "error_from_youtube_unplayable") %> <%= video.reason %>
|
||||
</h3>
|
||||
<h3>
|
||||
<%= translate(locale, "next_steps_error_message") %>
|
||||
</h3>
|
||||
<% elsif video.premiere_timestamp.try &.> Time.utc %>
|
||||
<h3>
|
||||
|
|
@ -112,7 +117,11 @@ we're going to need to do it here in order to allow for translations.
|
|||
<div class="pure-g">
|
||||
<div class="pure-u-1 pure-u-lg-1-5">
|
||||
<div class="h-box">
|
||||
<span id="watch-on-youtube">
|
||||
<span id="refresh-page">
|
||||
<a href="<% env.request.resource %>"><%= translate(locale, "refresh_page") %></a>
|
||||
</span>
|
||||
|
||||
<p id="watch-on-youtube">
|
||||
<%-
|
||||
link_yt_watch = URI.new(scheme: "https", host: "www.youtube.com", path: "/watch", query: "v=#{video.id}")
|
||||
link_yt_embed = URI.new(scheme: "https", host: "www.youtube.com", path: "/embed/#{video.id}")
|
||||
|
|
@ -125,7 +134,7 @@ we're going to need to do it here in order to allow for translations.
|
|||
-%>
|
||||
<a id="link-yt-watch" rel="noreferrer noopener" data-base-url="<%= link_yt_watch %>" href="<%= link_yt_watch %>"><%= translate(locale, "videoinfo_watch_on_youTube") %></a>
|
||||
(<a id="link-yt-embed" rel="noreferrer noopener" data-base-url="<%= link_yt_embed %>" href="<%= link_yt_embed %>"><%= translate(locale, "videoinfo_youTube_embed_link") %></a>)
|
||||
</span>
|
||||
</p>
|
||||
|
||||
<p id="watch-on-another-invidious-instance">
|
||||
<%- link_iv_other = IV::Frontend::Misc.redirect_url(env) -%>
|
||||
|
|
@ -186,11 +195,14 @@ we're going to need to do it here in order to allow for translations.
|
|||
<% end %>
|
||||
<% end %>
|
||||
|
||||
<% if video_assets %>
|
||||
<%= Invidious::Frontend::WatchPage.download_widget(locale, video, video_assets) %>
|
||||
<% end %>
|
||||
|
||||
<p id="views"><i class="icon ion-ios-eye"></i> <%= number_with_separator(video.views) %></p>
|
||||
<p id="likes"><i class="icon ion-ios-thumbs-up"></i> <%= number_with_separator(video.likes) %></p>
|
||||
<p id="dislikes" style="display: none; visibility: hidden;"></p>
|
||||
<% if video.genre %>
|
||||
<p id="genre"><%= translate(locale, "Genre: ") %>
|
||||
<% if !video.genre_url %>
|
||||
<%= video.genre %>
|
||||
|
|
@ -198,6 +210,7 @@ we're going to need to do it here in order to allow for translations.
|
|||
<a href="<%= video.genre_url %>"><%= video.genre %></a>
|
||||
<% end %>
|
||||
</p>
|
||||
<% end %>
|
||||
<% if video.license %>
|
||||
<% if video.license.empty? %>
|
||||
<p id="license"><%= translate(locale, "License: ") %><%= translate(locale, "Standard YouTube license") %></p>
|
||||
|
|
|
|||
Loading…
Reference in New Issue