summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>2023-03-07 11:38:09 -0500
committerChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>2023-03-07 11:38:09 -0500
commitd8e23d34b63b8f4f34da5c6b4bddf6eb46a3a828 (patch)
tree58f89680677ee29a9c81bbdcd6f663570a9109df
parent6b01629c5deeff2574f335fcc9fc718afe8f98a6 (diff)
downloadinvidious-d8e23d34b63b8f4f34da5c6b4bddf6eb46a3a828.tar.gz
invidious-d8e23d34b63b8f4f34da5c6b4bddf6eb46a3a828.tar.bz2
invidious-d8e23d34b63b8f4f34da5c6b4bddf6eb46a3a828.zip
add song title for music tracks
-rw-r--r--locales/en-US.json1
-rw-r--r--src/invidious/jsonify/api_v1/video_json.cr15
-rw-r--r--src/invidious/videos.cr2
-rw-r--r--src/invidious/videos/music.cr3
-rw-r--r--src/invidious/videos/parser.cr5
-rw-r--r--src/invidious/views/watch.ecr7
6 files changed, 27 insertions, 6 deletions
diff --git a/locales/en-US.json b/locales/en-US.json
index 86b83a23..65a81ab7 100644
--- a/locales/en-US.json
+++ b/locales/en-US.json
@@ -190,6 +190,7 @@
"Blacklisted regions: ": "Blacklisted regions: ",
"Music in this video": "Music in this video",
"Artist: ": "Artist: ",
+ "Song: ": "Song: ",
"Album: ": "Album: ",
"Shared `x`": "Shared `x`",
"Premieres in `x`": "Premieres in `x`",
diff --git a/src/invidious/jsonify/api_v1/video_json.cr b/src/invidious/jsonify/api_v1/video_json.cr
index a2b1a35c..fe4b5223 100644
--- a/src/invidious/jsonify/api_v1/video_json.cr
+++ b/src/invidious/jsonify/api_v1/video_json.cr
@@ -197,6 +197,21 @@ module Invidious::JSONify::APIv1
end
end
+ if !video.music.empty?
+ json.field "musicTracks" do
+ json.array do
+ video.music.each do |music|
+ json.object do
+ json.field "song", music.song
+ json.field "artist", music.artist
+ json.field "album", music.album
+ json.field "license", music.license
+ end
+ end
+ end
+ end
+ end
+
json.field "recommendedVideos" do
json.array do
video.related_videos.each do |rv|
diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index 436ac82d..86f5ada4 100644
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -249,7 +249,7 @@ struct Video
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)
+ VideoMusic.new(music_json["song"].as_s, music_json["album"].as_s, music_json["artist"].as_s, music_json["license"].as_s)
}
end
diff --git a/src/invidious/videos/music.cr b/src/invidious/videos/music.cr
index 402ae46f..08d88a3e 100644
--- a/src/invidious/videos/music.cr
+++ b/src/invidious/videos/music.cr
@@ -3,10 +3,11 @@ require "json"
struct VideoMusic
include JSON::Serializable
+ property song : String
property album : String
property artist : String
property license : String
- def initialize(@album : String, @artist : String, @license : String)
+ def initialize(@song : String, @album : String, @artist : String, @license : String)
end
end
diff --git a/src/invidious/videos/parser.cr b/src/invidious/videos/parser.cr
index cf43f1be..1a8c25e4 100644
--- a/src/invidious/videos/parser.cr
+++ b/src/invidious/videos/parser.cr
@@ -322,6 +322,7 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
music_desclist.try &.as_a.each do |music_desc|
artist = nil
+ song = nil
album = nil
music_license = nil
@@ -329,13 +330,15 @@ def parse_video_info(video_id : String, player_response : Hash(String, JSON::Any
desc_title = extract_text(desc.dig?("infoRowRenderer", "title"))
if desc_title == "ARTIST"
artist = extract_text(desc.dig?("infoRowRenderer", "defaultMetadata"))
+ elsif desc_title == "SONG"
+ song = 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)
+ music_list << VideoMusic.new(song.to_s, album.to_s, artist.to_s, music_license.to_s)
end
# Author infos
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 666eb3b0..01b30f7a 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -248,9 +248,10 @@ we're going to need to do it here in order to allow for translations.
<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>
+ <p class="music-song"><%= translate(locale, "Song: ") %><%= music.song %></p>
+ <p class="music-artist"><%= translate(locale, "Artist: ") %><%= music.artist %></p>
+ <p class="music-album"><%= translate(locale, "Album: ") %><%= music.album %></p>
+ <p class="music-license"><%= translate(locale, "License: ") %><%= music.license %></p>
</div>
<% end %>
</div>