", "\n") - description = description.gsub("
", "\n") - description = XML.parse_html(description).content.strip("\n ") - end - - length_seconds = decode_length_seconds(node.xpath_node(%q(.//span[@class="video-time"])).not_nil!.content) - + search_results = search(query, page, search_params) + search_results.each do |video| json.object do - json.field "title", title - json.field "videoId", video_id + json.field "title", video.title + json.field "videoId", video.id - json.field "author", author - json.field "authorUrl", author_url + json.field "author", video.author + json.field "authorUrl", "/channel/#{video.ucid}" json.field "videoThumbnails" do json.object do @@ -2673,7 +2381,7 @@ get "/api/v1/search" do |env| qualities.each do |quality| json.field quality[:name] do json.object do - json.field "url", "https://i.ytimg.com/vi/#{video_id}/#{quality["url"]}.jpg" + json.field "url", "https://i.ytimg.com/vi/#{video.id}/#{quality["url"]}.jpg" json.field "width", quality[:width] json.field "height", quality[:height] end @@ -2682,19 +2390,18 @@ get "/api/v1/search" do |env| end end - json.field "description", description - json.field "descriptionHtml", descriptionHtml + json.field "description", video.description + json.field "descriptionHtml", video.description_html - json.field "viewCount", view_count - json.field "published", published - json.field "lengthSeconds", length_seconds + json.field "viewCount", video.view_count + json.field "published", video.published.epoch + json.field "lengthSeconds", video.length_seconds end end end end - env.response.content_type = "application/json" - results + response end get "/api/manifest/dash/id/:id" do |env| @@ -2733,40 +2440,34 @@ get "/api/manifest/dash/id/:id" do |env| next manifest end - adaptive_fmts = [] of HTTP::Params - if video.info.has_key?("adaptive_fmts") - video.info["adaptive_fmts"].split(",") do |string| - adaptive_fmts << HTTP::Params.parse(string) - end - else - halt env, status_code: 403 - end + adaptive_fmts = video.adaptive_fmts(decrypt_function) if local adaptive_fmts.each do |fmt| if Kemal.config.ssl || CONFIG.https_only scheme = "https://" + else + scheme = "http://" end - scheme ||= "http://" fmt["url"] = scheme + env.request.headers["Host"] + URI.parse(fmt["url"]).full_path end end - if adaptive_fmts[0]? && adaptive_fmts[0]["s"]? - adaptive_fmts.each do |fmt| - fmt["url"] += "&signature=" + decrypt_signature(fmt["s"], decrypt_function) - end - end - video_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("video/mp4") ? s : nil } - audio_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("audio/mp4") ? s : nil } + audio_streams.sort_by! { |s| s["bitrate"].to_i }.reverse! audio_streams.each do |fmt| fmt["bitrate"] = (fmt["bitrate"].to_f64/1000).to_i.to_s end + (audio_streams + video_streams).each do |fmt| + fmt["url"] = fmt["url"].gsub('?', '/') + fmt["url"] = fmt["url"].gsub('&', '/') + fmt["url"] = fmt["url"].gsub('=', '/') + end + manifest = XML.build(indent: " ", encoding: "UTF-8") do |xml| xml.element("MPD", "xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "xmlns": "urn:mpeg:DASH:schema:MPD:2011", "xmlns:yt": "http://youtube.com/yt/2012/10/10", "xsi:schemaLocation": "urn:mpeg:DASH:schema:MPD:2011 DASH-MPD.xsd", @@ -2782,9 +2483,6 @@ get "/api/manifest/dash/id/:id" do |env| bandwidth = fmt["bitrate"] itag = fmt["itag"] url = fmt["url"] - url = url.gsub("?", "/") - url = url.gsub("&", "/") - url = url.gsub("=", "/") xml.element("Representation", id: fmt["itag"], codecs: codecs, bandwidth: bandwidth) do xml.element("AudioChannelConfiguration", schemeIdUri: "urn:mpeg:dash:23003:3:audio_channel_configuration:2011", @@ -2805,9 +2503,6 @@ get "/api/manifest/dash/id/:id" do |env| bandwidth = fmt["bitrate"] itag = fmt["itag"] url = fmt["url"] - url = url.gsub("?", "/") - url = url.gsub("&", "/") - url = url.gsub("=", "/") height, width = fmt["size"].split("x") xml.element("Representation", id: itag, codecs: codecs, width: width, startWithSAP: "1", maxPlayoutRate: "1", @@ -2833,23 +2528,15 @@ get "/api/manifest/hls_variant/*" do |env| manifest = client.get(env.request.path) if manifest.status_code != 200 - halt env, status_code: 403 + halt env, status_code: manifest.status_code end - manifest = manifest.body - - if Kemal.config.ssl || CONFIG.https_only - scheme = "https://" - else - scheme = "http://" - end - host = env.request.headers["Host"] - - url = "#{scheme}#{host}" - env.response.content_type = "application/x-mpegURL" env.response.headers.add("Access-Control-Allow-Origin", "*") - manifest.gsub("https://www.youtube.com", url) + + host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]) + manifest = manifest.body + manifest.gsub("https://www.youtube.com", host_url) end get "/api/manifest/hls_playlist/*" do |env| @@ -2857,20 +2544,13 @@ get "/api/manifest/hls_playlist/*" do |env| manifest = client.get(env.request.path) if manifest.status_code != 200 - halt env, status_code: 403 + halt env, status_code: manifest.status_code end - if Kemal.config.ssl || CONFIG.https_only - scheme = "https://" - else - scheme = "http://" - end - host = env.request.headers["Host"] + host_url = make_host_url(Kemal.config.ssl || CONFIG.https_only, env.request.headers["Host"]) - url = "#{scheme}#{host}" - - manifest = manifest.body.gsub("https://www.youtube.com", url) - manifest = manifest.gsub(/https:\/\/r\d---.{11}\.c\.youtube\.com/, url) + manifest = manifest.body.gsub("https://www.youtube.com", host_url) + manifest = manifest.gsub(/https:\/\/r\d---.{11}\.c\.youtube\.com/, host_url) fvip = manifest.match(/hls_chunk_host\/r(?
", "\n") + description = description.gsub("
", "\n") + description = XML.parse_html(description).content.strip("\n ") + end + + length_seconds = node.xpath_node(%q(.//span[@class="video-time"])) + if length_seconds + length_seconds = decode_length_seconds(length_seconds.content) + else + length_seconds = -1 + end + + video = SearchVideo.new( + title, + id, + author, + ucid, + published, + view_count, + description, + description_html, + length_seconds, + ) - video = ChannelVideo.new(id, title, published, Time.now, ucid, author) videos << video end diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr index 5430bc63..d93a7b20 100644 --- a/src/invidious/videos.cr +++ b/src/invidious/videos.cr @@ -5,6 +5,75 @@ class Video end end + def fmt_stream(decrypt_function) + streams = [] of HTTP::Params + self.info["url_encoded_fmt_stream_map"].split(",") do |string| + if !string.empty? + streams << HTTP::Params.parse(string) + end + end + + streams.each { |s| s.add("label", "#{s["quality"]} - #{s["type"].split(";")[0].split("/")[1]}") } + streams = streams.uniq { |s| s["label"] } + + if streams[0]? && streams[0]["s"]? + streams.each do |fmt| + fmt["url"] += "&signature=" + decrypt_signature(fmt["s"], decrypt_function) + end + end + + return streams + end + + def adaptive_fmts(decrypt_function) + adaptive_fmts = [] of HTTP::Params + if self.info.has_key?("adaptive_fmts") + self.info["adaptive_fmts"].split(",") do |string| + adaptive_fmts << HTTP::Params.parse(string) + end + end + + if adaptive_fmts[0]? && adaptive_fmts[0]["s"]? + adaptive_fmts.each do |fmt| + fmt["url"] += "&signature=" + decrypt_signature(fmt["s"], decrypt_function) + end + end + + return adaptive_fmts + end + + def audio_streams(adaptive_fmts) + audio_streams = adaptive_fmts.compact_map { |s| s["type"].starts_with?("audio") ? s : nil } + audio_streams.sort_by! { |s| s["bitrate"].to_i }.reverse! + audio_streams.each do |stream| + stream["bitrate"] = (stream["bitrate"].to_f64/1000).to_i.to_s + end + + return audio_streams + end + + def captions + player_response = JSON.parse(self.info["player_response"]) + + if player_response["captions"]? + captions = player_response["captions"]["playerCaptionsTracklistRenderer"]["captionTracks"]?.try &.as_a + end + captions ||= [] of JSON::Any + + return captions + end + + def short_description + description = self.description.gsub("
", " ") + description = description.gsub("
", " ") + description = XML.parse_html(description).content[0..200].gsub('"', """).gsub("\n", " ").strip(" ") + if description.empty? + description = " " + end + + return description + end + add_mapping({ id: String, info: { @@ -221,3 +290,53 @@ def itag_to_metadata(itag : String) return formats[itag] end + +def process_video_params(query, preferences) + autoplay = query["autoplay"]?.try &.to_i? + video_loop = query["loop"]?.try &.to_i? + + if preferences + autoplay ||= preferences.autoplay.to_unsafe + video_loop ||= preferences.video_loop.to_unsafe + end + autoplay ||= 0 + autoplay = autoplay == 1 + + video_loop ||= 0 + video_loop = video_loop == 1 + + if query["start"]? + video_start = decode_time(query["start"]) + end + if query["t"]? + video_start = decode_time(query["t"]) + end + video_start ||= 0 + + if query["end"]? + video_end = decode_time(query["end"]) + end + video_end ||= -1 + + if query["listen"]? && (query["listen"] == "true" || query["listen"] == "1") + listen = true + end + listen ||= false + + raw = query["raw"]?.try &.to_i? + raw ||= 0 + raw = raw == 1 + + quality = query["quality"]? + quality ||= "hd720" + + autoplay = query["autoplay"]?.try &.to_i? + autoplay ||= 0 + autoplay = autoplay == 1 + + controls = query["controls"]?.try &.to_i? + controls ||= 1 + controls = controls == 1 + + return autoplay, video_loop, video_start, video_end, listen, raw, quality, autoplay, controls +end diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr index 1d138293..c47342ad 100644 --- a/src/invidious/views/channel.ecr +++ b/src/invidious/views/channel.ecr @@ -39,7 +39,7 @@ <% end %> -
+
\ No newline at end of file
diff --git a/src/invidious/views/layout.ecr b/src/invidious/views/layout.ecr
index e436419d..b8b7629d 100644
--- a/src/invidious/views/layout.ecr
+++ b/src/invidious/views/layout.ecr
@@ -20,7 +20,7 @@
<% if page > 2 %>
Previous page
diff --git a/src/invidious/views/components/subscription_video.ecr b/src/invidious/views/components/subscription_video.ecr
deleted file mode 100644
index f1ad4bb3..00000000
--- a/src/invidious/views/components/subscription_video.ecr
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
\ No newline at end of file
diff --git a/src/invidious/views/components/video.ecr b/src/invidious/views/components/video.ecr
index 68d1f236..e92e4eb8 100644
--- a/src/invidious/views/components/video.ecr
+++ b/src/invidious/views/components/video.ecr
@@ -10,8 +10,9 @@
-
-
- <% if env.get?("user") && env.get("user").as(User).preferences.thin_mode %>
- <% else %>
- 
- <% end %>
-
-
- <% end %>
- <%= video.title %>
- - --
Shared <%= video.published.to_s("%B %-d, %Y at %r UTC") %>
- --
Shared <%= recode_date(video.published) %> ago
- + + <% if Time.now - video.published > 1.minute %> +Shared <%= recode_date(video.published) %> ago
+ <% end %>
-