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

Pull thumbnails into seperate function

Browse Source
This commit is contained in:
Omar Roth 2018-08-10 08:50:25 -05:00
parent 9a78b55c53
commit 2f8716d97f
2 changed files with 24 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
src/invidious.cr
View File

@ -1844,20 +1844,7 @@ get "/api/v1/videos/:id" do |env|
json.field "title", video.title json.field "title", video.title
json.field "videoId", video.id json.field "videoId", video.id
json.field "videoThumbnails" do json.field "videoThumbnails" do
qualities = [{name: "default", url: "default", width: 120, height: 90}, generate_thumbnails(json, video.id)
{name: "high", url: "hqdefault", width: 480, height: 360},
{name: "medium", url: "mqdefault", width: 320, height: 180},
]
json.array do
qualities.each do |quality|
json.object do
json.field "quality", quality[:name]
json.field "url", "https://i.ytimg.com/vi/#{id}/#{quality["url"]}.jpg"
json.field "width", quality[:width]
json.field "height", quality[:height]
end
end
end
end end
description = html_to_description(video.description) description = html_to_description(video.description)
@ -1992,20 +1979,7 @@ get "/api/v1/videos/:id" do |env|
json.field "videoId", rv["id"] json.field "videoId", rv["id"]
json.field "title", rv["title"] json.field "title", rv["title"]
json.field "videoThumbnails" do json.field "videoThumbnails" do
qualities = [{name: "default", url: "default", width: 120, height: 90}, generate_thumbnails(json, rv["id"])
{name: "high", url: "hqdefault", width: 480, height: 360},
{name: "medium", url: "mqdefault", width: 320, height: 180},
]
json.array do
qualities.each do |quality|
json.object do
json.field "quality", quality[:name]
json.field "url", "https://i.ytimg.com/vi/#{rv["id"]}/#{quality["url"]}.jpg"
json.field "width", quality[:width]
json.field "height", quality[:height]
end
end
end
end end
json.field "author", rv["author"] json.field "author", rv["author"]
json.field "lengthSeconds", rv["length_seconds"].to_i json.field "lengthSeconds", rv["length_seconds"].to_i
@ -2064,20 +2038,7 @@ get "/api/v1/trending" do |env|
json.field "title", title json.field "title", title
json.field "videoId", id json.field "videoId", id
json.field "videoThumbnails" do json.field "videoThumbnails" do
qualities = [{name: "default", url: "default", width: 120, height: 90}, generate_thumbnails(json, id)
{name: "high", url: "hqdefault", width: 480, height: 360},
{name: "medium", url: "mqdefault", width: 320, height: 180},
]
json.array do
qualities.each do |quality|
json.object do
json.field "quality", quality[:name]
json.field "url", "https://i.ytimg.com/vi/#{id}/#{quality["url"]}.jpg"
json.field "width", quality[:width]
json.field "height", quality[:height]
end
end
end
end end
json.field "lengthSeconds", length_seconds json.field "lengthSeconds", length_seconds
@ -2106,20 +2067,7 @@ get "/api/v1/top" do |env|
json.field "title", video.title json.field "title", video.title
json.field "videoId", video.id json.field "videoId", video.id
json.field "videoThumbnails" do json.field "videoThumbnails" do
qualities = [{name: "default", url: "default", width: 120, height: 90}, generate_thumbnails(json, video.id)
{name: "high", url: "hqdefault", width: 480, height: 360},
{name: "medium", url: "mqdefault", width: 320, height: 180},
]
json.array do
qualities.each do |quality|
json.object do
json.field "quality", quality[:name]
json.field "url", "https://i.ytimg.com/vi/#{video.id}/#{quality["url"]}.jpg"
json.field "width", quality[:width]
json.field "height", quality[:height]
end
end
end
end end
json.field "lengthSeconds", video.info["length_seconds"].to_i json.field "lengthSeconds", video.info["length_seconds"].to_i
@ -2244,20 +2192,7 @@ get "/api/v1/channels/:ucid" do |env|
json.field "published", video.published.epoch json.field "published", video.published.epoch
json.field "videoThumbnails" do json.field "videoThumbnails" do
qualities = [{name: "default", url: "default", width: 120, height: 90}, generate_thumbnails(json, video.id)
{name: "high", url: "hqdefault", width: 480, height: 360},
{name: "medium", url: "mqdefault", width: 320, height: 180},
]
json.array do
qualities.each do |quality|
json.object do
json.field "quality", quality[:name]
json.field "url", "https://i.ytimg.com/vi/#{video.id}/#{quality["url"]}.jpg"
json.field "width", quality[:width]
json.field "height", quality[:height]
end
end
end
end end
end end
end end
@ -2339,20 +2274,7 @@ get "/api/v1/channels/:ucid/videos" do |env|
json.field "videoId", video_id json.field "videoId", video_id
json.field "videoThumbnails" do json.field "videoThumbnails" do
qualities = [{name: "default", url: "default", width: 120, height: 90}, generate_thumbnails(json, video_id)
{name: "high", url: "hqdefault", width: 480, height: 360},
{name: "medium", url: "mqdefault", width: 320, height: 180},
]
json.array do
qualities.each do |quality|
json.object do
json.field "quality", quality[:name]
json.field "url", "https://i.ytimg.com/vi/#{video_id}/#{quality["url"]}.jpg"
json.field "width", quality[:width]
json.field "height", quality[:height]
end
end
end
end end
json.field "description", description json.field "description", description
@ -2416,20 +2338,7 @@ get "/api/v1/search" do |env|
json.field "authorUrl", "/channel/#{video.ucid}" json.field "authorUrl", "/channel/#{video.ucid}"
json.field "videoThumbnails" do json.field "videoThumbnails" do
qualities = [{name: "default", url: "default", width: 120, height: 90}, generate_thumbnails(json, video.id)
{name: "high", url: "hqdefault", width: 480, height: 360},
{name: "medium", url: "mqdefault", width: 320, height: 180},
]
json.array do
qualities.each do |quality|
json.object do
json.field "quality", quality[:name]
json.field "url", "https://i.ytimg.com/vi/#{video.id}/#{quality["url"]}.jpg"
json.field "width", quality[:width]
json.field "height", quality[:height]
end
end
end
end end
json.field "description", video.description json.field "description", video.description

17
src/invidious/videos.cr
View File

@ -477,3 +477,20 @@ def process_video_params(query, preferences)
return autoplay, video_loop, video_start, video_end, listen, raw, quality, autoplay, controls return autoplay, video_loop, video_start, video_end, listen, raw, quality, autoplay, controls
end end
def generate_thumbnails(json, id)
qualities = [{name: "default", url: "default", width: 120, height: 90},
{name: "high", url: "hqdefault", width: 480, height: 360},
{name: "medium", url: "mqdefault", width: 320, height: 180},
]
json.array do
qualities.each do |quality|
json.object do
json.field "quality", quality[:name]
json.field "url", "https://i.ytimg.com/vi/#{id}/#{quality["url"]}.jpg"
json.field "width", quality[:width]
json.field "height", quality[:height]
end
end
end
end