mirror of
https://github.com/iv-org/invidious.git
synced 2024-12-27 00:09:31 -05:00
Add 'license'
This commit is contained in:
parent
ffab3ee79f
commit
5b2c228bb6
@ -21,6 +21,7 @@ CREATE TABLE public.videos
|
|||||||
is_family_friendly boolean,
|
is_family_friendly boolean,
|
||||||
genre text COLLATE pg_catalog."default",
|
genre text COLLATE pg_catalog."default",
|
||||||
genre_url text COLLATE pg_catalog."default",
|
genre_url text COLLATE pg_catalog."default",
|
||||||
|
license text COLLATE pg_catalog."default",
|
||||||
CONSTRAINT videos_pkey PRIMARY KEY (id)
|
CONSTRAINT videos_pkey PRIMARY KEY (id)
|
||||||
)
|
)
|
||||||
WITH (
|
WITH (
|
||||||
|
@ -346,6 +346,10 @@ class Video
|
|||||||
is_family_friendly: Bool,
|
is_family_friendly: Bool,
|
||||||
genre: String,
|
genre: String,
|
||||||
genre_url: String,
|
genre_url: String,
|
||||||
|
license: {
|
||||||
|
type: String,
|
||||||
|
default: "",
|
||||||
|
},
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -373,6 +377,9 @@ def get_video(id, db, refresh = true)
|
|||||||
video = fetch_video(id)
|
video = fetch_video(id)
|
||||||
video_array = video.to_a
|
video_array = video.to_a
|
||||||
|
|
||||||
|
# MIGRATION POINT
|
||||||
|
video_array = video_array[0..-2]
|
||||||
|
|
||||||
args = arg_array(video_array[1..-1], 2)
|
args = arg_array(video_array[1..-1], 2)
|
||||||
|
|
||||||
db.exec("UPDATE videos SET (info,updated,title,views,likes,dislikes,wilson_score,\
|
db.exec("UPDATE videos SET (info,updated,title,views,likes,dislikes,wilson_score,\
|
||||||
@ -388,6 +395,9 @@ def get_video(id, db, refresh = true)
|
|||||||
video = fetch_video(id)
|
video = fetch_video(id)
|
||||||
video_array = video.to_a
|
video_array = video.to_a
|
||||||
|
|
||||||
|
# MIGRATION POINT
|
||||||
|
video_array = video_array[0..-2]
|
||||||
|
|
||||||
args = arg_array(video_array)
|
args = arg_array(video_array)
|
||||||
|
|
||||||
db.exec("INSERT INTO videos VALUES (#{args}) ON CONFLICT (id) DO NOTHING", video_array)
|
db.exec("INSERT INTO videos VALUES (#{args}) ON CONFLICT (id) DO NOTHING", video_array)
|
||||||
@ -498,8 +508,15 @@ def fetch_video(id)
|
|||||||
genre = html.xpath_node(%q(//meta[@itemprop="genre"])).not_nil!["content"]
|
genre = html.xpath_node(%q(//meta[@itemprop="genre"])).not_nil!["content"]
|
||||||
genre_url = html.xpath_node(%(//a[text()="#{genre}"])).not_nil!["href"]
|
genre_url = html.xpath_node(%(//a[text()="#{genre}"])).not_nil!["href"]
|
||||||
|
|
||||||
|
license = html.xpath_node(%q(//h4[contains(text(),"License")]/parent::*/ul/li))
|
||||||
|
if license
|
||||||
|
license = license.content
|
||||||
|
else
|
||||||
|
license ||= ""
|
||||||
|
end
|
||||||
|
|
||||||
video = Video.new(id, info, Time.now, title, views, likes, dislikes, wilson_score, published, description,
|
video = Video.new(id, info, Time.now, title, views, likes, dislikes, wilson_score, published, description,
|
||||||
nil, author, ucid, allowed_regions, is_family_friendly, genre, genre_url)
|
nil, author, ucid, allowed_regions, is_family_friendly, genre, genre_url, license)
|
||||||
|
|
||||||
return video
|
return video
|
||||||
end
|
end
|
||||||
|
@ -56,6 +56,9 @@
|
|||||||
<p><i class="icon ion-ios-thumbs-up"></i> <%= number_with_separator(video.likes) %></p>
|
<p><i class="icon ion-ios-thumbs-up"></i> <%= number_with_separator(video.likes) %></p>
|
||||||
<p><i class="icon ion-ios-thumbs-down"></i> <%= number_with_separator(video.dislikes) %></p>
|
<p><i class="icon ion-ios-thumbs-down"></i> <%= number_with_separator(video.dislikes) %></p>
|
||||||
<p id="Genre">Genre: <a href="<%= video.genre_url %>"><%= video.genre %></a></p>
|
<p id="Genre">Genre: <a href="<%= video.genre_url %>"><%= video.genre %></a></p>
|
||||||
|
<% if !video.license.empty? %>
|
||||||
|
<p id="License">License: <%= video.license %></p>
|
||||||
|
<% end %>
|
||||||
<p id="FamilyFriendly">Family Friendly? <%= video.is_family_friendly %></p>
|
<p id="FamilyFriendly">Family Friendly? <%= video.is_family_friendly %></p>
|
||||||
<p id="Wilson">Wilson Score: <%= video.wilson_score.round(4) %></p>
|
<p id="Wilson">Wilson Score: <%= video.wilson_score.round(4) %></p>
|
||||||
<p id="Rating">Rating: <%= rating.round(4) %> / 5</p>
|
<p id="Rating">Rating: <%= rating.round(4) %> / 5</p>
|
||||||
|
Loading…
Reference in New Issue
Block a user