Add genre URLs

This commit is contained in:
Omar Roth 2018-09-04 09:50:19 -05:00
parent 2ac89d5e00
commit 53732cdcab
3 changed files with 17 additions and 2 deletions

View file

@ -2014,6 +2014,7 @@ get "/api/v1/videos/:id" do |env|
json.field "isFamilyFriendly", video.is_family_friendly json.field "isFamilyFriendly", video.is_family_friendly
json.field "allowedRegions", video.allowed_regions json.field "allowedRegions", video.allowed_regions
json.field "genre", video.genre json.field "genre", video.genre
json.field "genreUrl", video.genre_url
json.field "author", video.author json.field "author", video.author
json.field "authorId", video.ucid json.field "authorId", video.ucid

View file

@ -345,6 +345,10 @@ class Video
allowed_regions: Array(String), allowed_regions: Array(String),
is_family_friendly: Bool, is_family_friendly: Bool,
genre: String, genre: String,
genre_url: {
type: String,
default: "/",
},
}) })
end end
@ -371,6 +375,10 @@ def get_video(id, db, refresh = true)
begin begin
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,\
@ -384,6 +392,10 @@ def get_video(id, db, refresh = true)
else else
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)
@ -490,10 +502,12 @@ def fetch_video(id)
allowed_regions = html.xpath_node(%q(//meta[@itemprop="regionsAllowed"])).not_nil!["content"].split(",") allowed_regions = html.xpath_node(%q(//meta[@itemprop="regionsAllowed"])).not_nil!["content"].split(",")
is_family_friendly = html.xpath_node(%q(//meta[@itemprop="isFamilyFriendly"])).not_nil!["content"] == "True" is_family_friendly = html.xpath_node(%q(//meta[@itemprop="isFamilyFriendly"])).not_nil!["content"] == "True"
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"]
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) nil, author, ucid, allowed_regions, is_family_friendly, genre, genre_url)
return video return video
end end

View file

@ -55,7 +55,7 @@
<p><i class="icon ion-ios-eye"></i> <%= number_with_separator(video.views) %></p> <p><i class="icon ion-ios-eye"></i> <%= number_with_separator(video.views) %></p>
<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: <%= video.genre %></p> <p id="Genre">Genre: <a href="<%= video.genre_url %>"><%= video.genre %></a></p>
<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>