From 53a4247dfd18d0783316d6a38126eca3f9df8af9 Mon Sep 17 00:00:00 2001
From: sentriz <senan@senan.xyz>
Date: Wed, 18 May 2022 22:01:47 +0100
Subject: [PATCH] feat(subsonic): add year and genre fields to track-by-folder
 response

fixes #223
---
 .../ctrlsubsonic/spec/construct_by_folder.go  |  3 +
 .../test_get_music_directory_with_tracks      |  9 ++-
 .../testdata/test_search_two_q_tra            | 60 ++++++++++++-------
 3 files changed, 49 insertions(+), 23 deletions(-)

diff --git a/server/ctrlsubsonic/spec/construct_by_folder.go b/server/ctrlsubsonic/spec/construct_by_folder.go
index 42743021..fb585516 100644
--- a/server/ctrlsubsonic/spec/construct_by_folder.go
+++ b/server/ctrlsubsonic/spec/construct_by_folder.go
@@ -2,6 +2,7 @@ package spec
 
 import (
 	"path"
+	"strings"
 
 	"go.senan.xyz/gonic/db"
 )
@@ -54,6 +55,8 @@ func NewTCTrackByFolder(t *db.Track, parent *db.Album) *TrackChild {
 		),
 		ParentID:  parent.SID(),
 		Duration:  t.Length,
+		Genre:     strings.Join(t.GenreStrings(), ", "),
+		Year:      parent.TagYear,
 		Bitrate:   t.Bitrate,
 		IsDir:     false,
 		Type:      "music",
diff --git a/server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks b/server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks
index 1f0a0168..e1052cbb 100644
--- a/server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks
+++ b/server/ctrlsubsonic/testdata/test_get_music_directory_with_tracks
@@ -25,7 +25,8 @@
           "title": "title-0",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-2",
@@ -44,7 +45,8 @@
           "title": "title-1",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-3",
@@ -63,7 +65,8 @@
           "title": "title-2",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         }
       ]
     }
diff --git a/server/ctrlsubsonic/testdata/test_search_two_q_tra b/server/ctrlsubsonic/testdata/test_search_two_q_tra
index e8bbce35..1b1ab6f8 100644
--- a/server/ctrlsubsonic/testdata/test_search_two_q_tra
+++ b/server/ctrlsubsonic/testdata/test_search_two_q_tra
@@ -22,7 +22,8 @@
           "title": "title-0",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-2",
@@ -41,7 +42,8 @@
           "title": "title-1",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-3",
@@ -60,7 +62,8 @@
           "title": "title-2",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-4",
@@ -79,7 +82,8 @@
           "title": "title-0",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-5",
@@ -98,7 +102,8 @@
           "title": "title-1",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-6",
@@ -117,7 +122,8 @@
           "title": "title-2",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-7",
@@ -136,7 +142,8 @@
           "title": "title-0",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-8",
@@ -155,7 +162,8 @@
           "title": "title-1",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-9",
@@ -174,7 +182,8 @@
           "title": "title-2",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-10",
@@ -193,7 +202,8 @@
           "title": "title-0",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-11",
@@ -212,7 +222,8 @@
           "title": "title-1",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-12",
@@ -231,7 +242,8 @@
           "title": "title-2",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-13",
@@ -250,7 +262,8 @@
           "title": "title-0",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-14",
@@ -269,7 +282,8 @@
           "title": "title-1",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-15",
@@ -288,7 +302,8 @@
           "title": "title-2",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-16",
@@ -307,7 +322,8 @@
           "title": "title-0",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-17",
@@ -326,7 +342,8 @@
           "title": "title-1",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-18",
@@ -345,7 +362,8 @@
           "title": "title-2",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-19",
@@ -364,7 +382,8 @@
           "title": "title-0",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         },
         {
           "id": "tr-20",
@@ -383,7 +402,8 @@
           "title": "title-1",
           "track": 1,
           "discNumber": 1,
-          "type": "music"
+          "type": "music",
+          "year": 2021
         }
       ]
     }