heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(subsonic): add support for multi-valued album artist tags

Browse Source 
closes #103

a

a

a

r

a

a

a

a

a

a

a

a

a

a
This commit is contained in:
sentriz
2023-07-31 23:07:41 +01:00
parent 908c7cf088
commit 3ac77823c3
27 changed files with 641 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
server/ctrlsubsonic/testdata/test_get_album_list_random vendored
View File

@@ -6,32 +6,6 @@
"serverVersion": "",
"albumList": {
"album": [
{
"id": "al-13",
"coverArt": "al-13",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"album": "",
"parent": "al-10",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-12",
"coverArt": "al-12",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-10",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-7",
"coverArt": "al-7",
@@ -45,6 +19,58 @@
"songCount": 3,
"duration": 300
},
{
"id": "al-4",
"coverArt": "al-4",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-3",
"coverArt": "al-3",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-11",
"coverArt": "al-11",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-10",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-13",
"coverArt": "al-13",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"album": "",
"parent": "al-10",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-5",
"coverArt": "al-5",
@@ -71,32 +97,6 @@
"songCount": 3,
"duration": 300
},
{
"id": "al-11",
"coverArt": "al-11",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-10",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-3",
"coverArt": "al-3",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-8",
"coverArt": "al-8",
@@ -111,13 +111,13 @@
"duration": 300
},
{
"id": "al-4",
"coverArt": "al-4",
"artist": "artist-0",
"id": "al-12",
"coverArt": "al-12",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-2",
"parent": "al-10",
"isDir": true,
"name": "",
"songCount": 3,

18
server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist vendored
View File

@@ -11,6 +11,8 @@
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -24,6 +26,8 @@
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -37,6 +41,8 @@
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -50,6 +56,8 @@
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -63,6 +71,8 @@
"coverArt": "al-8",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -76,6 +86,8 @@
"coverArt": "al-9",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -89,6 +101,8 @@
"coverArt": "al-11",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -102,6 +116,8 @@
"coverArt": "al-12",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -115,6 +131,8 @@
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",

18
server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name vendored
View File

@@ -11,6 +11,8 @@
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -24,6 +26,8 @@
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -37,6 +41,8 @@
"coverArt": "al-11",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -50,6 +56,8 @@
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -63,6 +71,8 @@
"coverArt": "al-8",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -76,6 +86,8 @@
"coverArt": "al-12",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -89,6 +101,8 @@
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -102,6 +116,8 @@
"coverArt": "al-9",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -115,6 +131,8 @@
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",

18
server/ctrlsubsonic/testdata/test_get_album_list_two_newest vendored
View File

@@ -11,6 +11,8 @@
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -24,6 +26,8 @@
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -37,6 +41,8 @@
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -50,6 +56,8 @@
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -63,6 +71,8 @@
"coverArt": "al-8",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -76,6 +86,8 @@
"coverArt": "al-9",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -89,6 +101,8 @@
"coverArt": "al-11",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -102,6 +116,8 @@
"coverArt": "al-12",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -115,6 +131,8 @@
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",

126
server/ctrlsubsonic/testdata/test_get_album_list_two_random vendored
View File

@@ -6,24 +6,13 @@
"serverVersion": "",
"albumList2": {
"album": [
{
"id": "al-13",
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-2",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-4",
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -33,49 +22,12 @@
"year": 2021
},
{
"id": "al-11",
"coverArt": "al-11",
"id": "al-13",
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-3",
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-7",
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-5",
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -84,11 +36,43 @@
"duration": 300,
"year": 2021
},
{
"id": "al-3",
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-11",
"coverArt": "al-11",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-9",
"coverArt": "al-9",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -102,6 +86,8 @@
"coverArt": "al-8",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -115,6 +101,8 @@
"coverArt": "al-12",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -122,6 +110,36 @@
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-5",
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-2",
"songCount": 3,
"duration": 300,
"year": 2021
},
{
"id": "al-7",
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
"name": "album-0",
"songCount": 3,
"duration": 300,
"year": 2021
}
]
}

2
server/ctrlsubsonic/testdata/test_get_album_with_cover vendored
View File

@@ -9,6 +9,8 @@
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",

6
server/ctrlsubsonic/testdata/test_get_artist_id_one vendored
View File

@@ -14,6 +14,8 @@
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -27,6 +29,8 @@
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -40,6 +44,8 @@
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",

6
server/ctrlsubsonic/testdata/test_get_artist_id_three vendored
View File

@@ -14,6 +14,8 @@
"coverArt": "al-11",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -27,6 +29,8 @@
"coverArt": "al-12",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -40,6 +44,8 @@
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",

6
server/ctrlsubsonic/testdata/test_get_artist_id_two vendored
View File

@@ -14,6 +14,8 @@
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -27,6 +29,8 @@
"coverArt": "al-8",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -40,6 +44,8 @@
"coverArt": "al-9",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",

18
server/ctrlsubsonic/testdata/test_search_three_q_alb vendored
View File

@@ -11,6 +11,8 @@
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -25,6 +27,8 @@
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -39,6 +43,8 @@
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"artistIds": ["ar-1"],
"artists": ["artist-0"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -53,6 +59,8 @@
"coverArt": "al-7",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -67,6 +75,8 @@
"coverArt": "al-8",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -81,6 +91,8 @@
"coverArt": "al-9",
"artistId": "ar-2",
"artist": "artist-1",
"artistIds": ["ar-2"],
"artists": ["artist-1"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -95,6 +107,8 @@
"coverArt": "al-11",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -109,6 +123,8 @@
"coverArt": "al-12",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",
@@ -123,6 +139,8 @@
"coverArt": "al-13",
"artistId": "ar-3",
"artist": "artist-2",
"artistIds": ["ar-3"],
"artists": ["artist-2"],
"created": "2019-11-30T00:00:00Z",
"title": "",
"album": "",