Video: Add support for the music description section (#3559)
This commit is contained in:
commit
c7f34042a2
@ -490,8 +490,9 @@ hr {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Description Expansion Styling*/
|
/* Description Expansion Styling*/
|
||||||
#descexpansionbutton {
|
#descexpansionbutton,
|
||||||
display: none
|
#music-desc-expansion {
|
||||||
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#descexpansionbutton ~ div {
|
#descexpansionbutton ~ div {
|
||||||
@ -509,7 +510,8 @@ hr {
|
|||||||
margin-top: 20px;
|
margin-top: 20px;
|
||||||
}
|
}
|
||||||
|
|
||||||
label[for="descexpansionbutton"]:hover {
|
label[for="descexpansionbutton"]:hover,
|
||||||
|
label[for="music-desc-expansion"]:hover {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -521,7 +523,8 @@ h4,
|
|||||||
h5,
|
h5,
|
||||||
p,
|
p,
|
||||||
#descriptionWrapper,
|
#descriptionWrapper,
|
||||||
#description-box {
|
#description-box,
|
||||||
|
#music-description-box {
|
||||||
unicode-bidi: plaintext;
|
unicode-bidi: plaintext;
|
||||||
text-align: start;
|
text-align: start;
|
||||||
}
|
}
|
||||||
@ -531,6 +534,29 @@ p,
|
|||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#music-description-box {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#music-desc-expansion:checked ~ #music-description-box {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
#music-desc-expansion ~ label > h3 > .ion-ios-arrow-up,
|
||||||
|
#music-desc-expansion:checked ~ label > h3 > .ion-ios-arrow-down {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
#music-desc-expansion:checked ~ label > h3 > .ion-ios-arrow-up,
|
||||||
|
#music-desc-expansion ~ label > h3 > .ion-ios-arrow-down {
|
||||||
|
display: inline;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Select all the music items except the first one */
|
||||||
|
.music-item + .music-item {
|
||||||
|
border-top: 1px solid #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
/* Center the "invidious" logo on the search page */
|
/* Center the "invidious" logo on the search page */
|
||||||
#logo > h1 { text-align: center; }
|
#logo > h1 { text-align: center; }
|
||||||
|
|
||||||
|
@ -188,6 +188,9 @@
|
|||||||
"Engagement: ": "Engagement: ",
|
"Engagement: ": "Engagement: ",
|
||||||
"Whitelisted regions: ": "Whitelisted regions: ",
|
"Whitelisted regions: ": "Whitelisted regions: ",
|
||||||
"Blacklisted regions: ": "Blacklisted regions: ",
|
"Blacklisted regions: ": "Blacklisted regions: ",
|
||||||
|
"Music in this video": "Music in this video",
|
||||||
|
"Artist: ": "Artist: ",
|
||||||
|
"Album: ": "Album: ",
|
||||||
"Shared `x`": "Shared `x`",
|
"Shared `x`": "Shared `x`",
|
||||||
"Premieres in `x`": "Premieres in `x`",
|
"Premieres in `x`": "Premieres in `x`",
|
||||||
"Premieres `x`": "Premieres `x`",
|
"Premieres `x`": "Premieres `x`",
|
||||||
|
@ -247,6 +247,12 @@ struct Video
|
|||||||
info["reason"]?.try &.as_s
|
info["reason"]?.try &.as_s
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def music : Array(VideoMusic)
|
||||||
|
info["music"].as_a.map { |music_json|
|
||||||
|
VideoMusic.new(music_json["album"].as_s, music_json["artist"].as_s, music_json["license"].as_s)
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
# Macros defining getters/setters for various types of data
|
# Macros defining getters/setters for various types of data
|
||||||
|
|
||||||
private macro getset_string(name)
|
private macro getset_string(name)
|
||||||
|
12
src/invidious/videos/music.cr
Normal file
12
src/invidious/videos/music.cr
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
require "json"
|
||||||
|
|
||||||
|
struct VideoMusic
|
||||||
|
include JSON::Serializable
|
||||||
|
|
||||||
|
property album : String
|
||||||
|
property artist : String
|
||||||
|
property license : String
|
||||||
|
|
||||||
|
def initialize(@album : String, @artist : String, @license : String)
|
||||||
|
end
|
||||||
|
end
|
@ -311,6 +311,33 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Music section
|
||||||
|
|
||||||
|
music_list = [] of VideoMusic
|
||||||
|
music_desclist = player_response.dig?(
|
||||||
|
"engagementPanels", 1, "engagementPanelSectionListRenderer",
|
||||||
|
"content", "structuredDescriptionContentRenderer", "items", 2,
|
||||||
|
"videoDescriptionMusicSectionRenderer", "carouselLockups"
|
||||||
|
)
|
||||||
|
|
||||||
|
music_desclist.try &.as_a.each do |music_desc|
|
||||||
|
artist = nil
|
||||||
|
album = nil
|
||||||
|
music_license = nil
|
||||||
|
|
||||||
|
music_desc.dig?("carouselLockupRenderer", "infoRows").try &.as_a.each do |desc|
|
||||||
|
desc_title = extract_text(desc.dig?("infoRowRenderer", "title"))
|
||||||
|
if desc_title == "ARTIST"
|
||||||
|
artist = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
|
||||||
|
elsif desc_title == "ALBUM"
|
||||||
|
album = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
|
||||||
|
elsif desc_title == "LICENSES"
|
||||||
|
music_license = extract_text(desc.dig?("infoRowRenderer", "expandedMetadata"))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
music_list << VideoMusic.new(album.to_s, artist.to_s, music_license.to_s)
|
||||||
|
end
|
||||||
|
|
||||||
# Author infos
|
# Author infos
|
||||||
|
|
||||||
author = video_details["author"]?.try &.as_s
|
author = video_details["author"]?.try &.as_s
|
||||||
@ -361,6 +388,8 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
|
|||||||
"genre" => JSON::Any.new(genre.try &.as_s || ""),
|
"genre" => JSON::Any.new(genre.try &.as_s || ""),
|
||||||
"genreUcid" => JSON::Any.new(genre_ucid.try &.as_s || ""),
|
"genreUcid" => JSON::Any.new(genre_ucid.try &.as_s || ""),
|
||||||
"license" => JSON::Any.new(license.try &.as_s || ""),
|
"license" => JSON::Any.new(license.try &.as_s || ""),
|
||||||
|
# Music section
|
||||||
|
"music" => JSON.parse(music_list.to_json),
|
||||||
# Author infos
|
# Author infos
|
||||||
"author" => JSON::Any.new(author || ""),
|
"author" => JSON::Any.new(author || ""),
|
||||||
"ucid" => JSON::Any.new(ucid || ""),
|
"ucid" => JSON::Any.new(ucid || ""),
|
||||||
|
@ -235,6 +235,28 @@ we're going to need to do it here in order to allow for translations.
|
|||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
|
|
||||||
|
<% if !video.music.empty? %>
|
||||||
|
<input id="music-desc-expansion" type="checkbox"/>
|
||||||
|
<label for="music-desc-expansion">
|
||||||
|
<h3 id="music-description-title">
|
||||||
|
<%= translate(locale, "Music in this video") %>
|
||||||
|
<span class="icon ion-ios-arrow-up"></span>
|
||||||
|
<span class="icon ion-ios-arrow-down"></span>
|
||||||
|
</h3>
|
||||||
|
</label>
|
||||||
|
|
||||||
|
<div id="music-description-box">
|
||||||
|
<% video.music.each do |music| %>
|
||||||
|
<div class="music-item">
|
||||||
|
<p id="music-artist"><%= translate(locale, "Artist: ") %><%= music.artist %></p>
|
||||||
|
<p id="music-album"><%= translate(locale, "Album: ") %><%= music.album %></p>
|
||||||
|
<p id="music-license"><%= translate(locale, "License: ") %><%= music.license %></p>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
<hr>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
<div id="comments">
|
<div id="comments">
|
||||||
<% if nojs %>
|
<% if nojs %>
|
||||||
<%= comment_html %>
|
<%= comment_html %>
|
||||||
|
Loading…
Reference in New Issue
Block a user