Skip to content

Commit

Permalink
Update video extractor
Browse files Browse the repository at this point in the history
  • Loading branch information
omarroth committed Jul 30, 2019
1 parent 4ee3ec0 commit ff5d79e
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 15 deletions.
4 changes: 2 additions & 2 deletions src/invidious.cr
Original file line number Diff line number Diff line change
Expand Up @@ -3649,7 +3649,7 @@ get "/api/v1/top" do |env|
generate_thumbnails(json, video.id, config, Kemal.config)
end

json.field "lengthSeconds", video.info["length_seconds"].to_i
json.field "lengthSeconds", video.length_seconds
json.field "viewCount", video.views

json.field "author", video.author
Expand Down Expand Up @@ -4494,7 +4494,7 @@ get "/api/manifest/dash/id/:id" do |env|
XML.build(indent: " ", encoding: "UTF-8") do |xml|
xml.element("MPD", "xmlns": "urn:mpeg:dash:schema:mpd:2011",
"profiles": "urn:mpeg:dash:profile:full:2011", minBufferTime: "PT1.5S", type: "static",
mediaPresentationDuration: "PT#{video.info["length_seconds"]}S") do
mediaPresentationDuration: "PT#{video.length_seconds}S") do
xml.element("Period") do
i = 0

Expand Down
37 changes: 26 additions & 11 deletions src/invidious/videos.cr
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ struct Video

json.field "subCountText", self.sub_count_text

json.field "lengthSeconds", self.info["length_seconds"].to_i
json.field "lengthSeconds", self.length_seconds
json.field "allowRatings", self.allow_ratings
json.field "rating", self.info["avg_rating"].to_f32
json.field "isListed", self.is_listed
Expand Down Expand Up @@ -563,7 +563,14 @@ struct Video
fmt["clen"] = fmt_stream["contentLength"]?.try &.as_s || "0"
fmt["bitrate"] = fmt_stream["bitrate"]?.try &.as_i.to_s || "0"
fmt["itag"] = fmt_stream["itag"].as_i.to_s
fmt["url"] = fmt_stream["url"].as_s
if fmt_stream["url"]?
fmt["url"] = fmt_stream["url"].as_s
end
if fmt_stream["cipher"]?
HTTP::Params.parse(fmt_stream["cipher"].as_s).each do |key, value|
fmt[key] = value
end
end
fmt["quality"] = fmt_stream["quality"].as_s

if fmt_stream["width"]?
Expand Down Expand Up @@ -635,8 +642,14 @@ struct Video
fmt["clen"] = adaptive_fmt["contentLength"]?.try &.as_s || "0"
fmt["bitrate"] = adaptive_fmt["bitrate"]?.try &.as_i.to_s || "0"
fmt["itag"] = adaptive_fmt["itag"].as_i.to_s
fmt["url"] = adaptive_fmt["url"].as_s

if adaptive_fmt["url"]?
fmt["url"] = adaptive_fmt["url"].as_s
end
if adaptive_fmt["cipher"]?
HTTP::Params.parse(adaptive_fmt["cipher"].as_s).each do |key, value|
fmt[key] = value
end
end
if index = adaptive_fmt["indexRange"]?
fmt["index"] = "#{index["start"]}-#{index["end"]}"
end
Expand Down Expand Up @@ -827,7 +840,7 @@ struct Video
end

def length_seconds
return self.info["length_seconds"].to_i
self.player_response["videoDetails"]["lengthSeconds"].as_s.to_i
end

db_mapping({
Expand Down Expand Up @@ -1162,17 +1175,19 @@ def fetch_video(id, region)
end
end

if info["errorcode"]?.try &.== "2"
if info["errorcode"]?.try &.== "2" || !info["player_response"]
raise "Video unavailable."
end

if !info["title"]? || info["title"].empty?
raise "Video unavailable."
if info["reason"]?
raise info["reason"]
end

title = info["title"]
author = info["author"]? || ""
ucid = info["ucid"]? || ""
player_json = JSON.parse(info["player_response"])

title = player_json["videoDetails"]["title"].as_s
author = player_json["videoDetails"]["author"]?.try &.as_s || ""
ucid = player_json["videoDetails"]["ucid"]?.try &.as_s || ""

views = html.xpath_node(%q(//meta[@itemprop="interactionCount"]))
.try &.["content"].to_i64? || 0_i64
Expand Down
2 changes: 1 addition & 1 deletion src/invidious/views/embed.ecr
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
var video_data = {
id: '<%= video.id %>',
plid: '<%= plid %>',
length_seconds: '<%= video.info["length_seconds"].to_f %>',
length_seconds: '<%= video.length_seconds.to_f %>',
video_series: <%= video_series.to_json %>,
params: <%= params.to_json %>,
preferences: <%= preferences.to_json %>,
Expand Down
2 changes: 1 addition & 1 deletion src/invidious/views/watch.ecr
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
var video_data = {
id: '<%= video.id %>',
plid: '<%= plid %>',
length_seconds: <%= video.info["length_seconds"].to_f %>,
length_seconds: <%= video.length_seconds.to_f %>,
play_next: <%= !rvs.empty? && !plid && params.continue %>,
next_video: '<%= rvs.select { |rv| rv["id"]? }[0]?.try &.["id"] %>',
youtube_comments_text: '<%= HTML.escape(translate(locale, "View YouTube comments")) %>',
Expand Down

0 comments on commit ff5d79e

Please sign in to comment.