Mirrored_Repos/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2024-11-22 05:27:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Video: Add support for the music section

Browse Source
This commit is contained in:
techmetx11 2023-01-14 09:38:55 +01:00
parent 05258d56bd
commit 1b5fbfc13e
No known key found for this signature in database
GPG Key ID: 20E0C88A0E7E5AF2
4 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
locales/en-US.json
View File

@ -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 artist: ": "Music artist: ",
"Music album: ": "Music album: ",
"Music licenses: ": "Music licenses: ",
"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`",

3
src/invidious/videos.cr
View File

@ -314,6 +314,9 @@ struct Video
getset_string genre getset_string genre
getset_string genreUcid getset_string genreUcid
getset_string license getset_string license
getset_string music_artist
getset_string music_album
getset_string music_licenses
getset_string shortDescription getset_string shortDescription
getset_string subCountText getset_string subCountText
getset_string title getset_string title

22
src/invidious/videos/parser.cr
View File

@ -309,6 +309,24 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
end end
end end
# Music section
music_desc = player_response.dig?("engagementPanels", 1, "engagementPanelSectionListRenderer", "content", "structuredDescriptionContentRenderer", "items", 2, "videoDescriptionMusicSectionRenderer", "carouselLockups", 0, "carouselLockupRenderer", "infoRows").try &.as_a
artist = nil
album = nil
music_licenses = nil
music_desc.try &.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_licenses = extract_text(desc.dig?("infoRowRenderer", "expandedMetadata"))
end
end
# Author infos # Author infos
author = video_details["author"]?.try &.as_s author = video_details["author"]?.try &.as_s
@ -359,6 +377,10 @@ 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_artist" => JSON::Any.new(artist || ""),
"music_album" => JSON::Any.new(album || ""),
"music_licenses" => JSON::Any.new(music_licenses || ""),
# Author infos # Author infos
"author" => JSON::Any.new(author || ""), "author" => JSON::Any.new(author || ""),
"ucid" => JSON::Any.new(ucid || ""), "ucid" => JSON::Any.new(ucid || ""),

9
src/invidious/views/watch.ecr
View File

@ -196,6 +196,15 @@ we're going to need to do it here in order to allow for translations.
<% end %> <% end %>
</p> </p>
<% end %> <% end %>
<% if !video.music_artist.empty? %>
<p id="music_artist"><%= translate(locale, "Music artist: ") %><%= video.music_artist %></p>
<% end %>
<% if !video.music_album.empty? %>
<p id="music_album"><%= translate(locale, "Music album: ") %><%= video.music_album %></p>
<% end %>
<% if !video.music_licenses.empty? %>
<p id="music_licenses"><%= translate(locale, "Music licenses: ") %><%= video.music_licenses %></p>
<% end %>
</div> </div>
</div> </div>