Skip to content

Commit

Permalink
refactor: remove godirwalk dep
Browse files Browse the repository at this point in the history
  • Loading branch information
@sentriz
sentriz committed Nov 20, 2021
1 parent fc50f01 commit e10c8ba
Show file tree
Hide file tree
Showing 26 changed files with 275 additions and 385 deletions.
1 change: 0 additions & 1 deletion go.mod
View file
Expand Up @@ -22,7 +22,6 @@ require (
github.com/jinzhu/gorm v1.9.16
github.com/josephburnett/jd v0.0.0-20191228205456-aa1a7c66b42f
github.com/json-iterator/go v1.1.12 // indirect
github.com/karrick/godirwalk v1.16.1
github.com/matryer/is v1.4.0
github.com/mewkiz/pkg v0.0.0-20211102230744-16a6ce8f1b77 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Expand Up @@ -213,8 +213,6 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
github.com/jszwec/csvutil v1.5.1/go.mod h1:Rpu7Uu9giO9subDyMCIQfHVDuLrcaC36UA4YcJjGBkg=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw=
github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
Expand Down
18 changes: 9 additions & 9 deletions server/ctrlsubsonic/testdata/test_get_album_list_alpha_artist
View file
Expand Up @@ -6,39 +6,39 @@
"albumList": {
"album": [
{
"id": "al-2",
"coverArt": "al-2",
"id": "al-3",
"coverArt": "al-3",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-3",
"coverArt": "al-3",
"id": "al-4",
"coverArt": "al-4",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-4",
"coverArt": "al-4",
"id": "al-5",
"coverArt": "al-5",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
Expand Down
18 changes: 9 additions & 9 deletions server/ctrlsubsonic/testdata/test_get_album_list_alpha_name
View file
Expand Up @@ -6,13 +6,13 @@
"albumList": {
"album": [
{
"id": "al-2",
"coverArt": "al-2",
"id": "al-3",
"coverArt": "al-3",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
Expand Down Expand Up @@ -45,13 +45,13 @@
"duration": 300
},
{
"id": "al-3",
"coverArt": "al-3",
"id": "al-4",
"coverArt": "al-4",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
Expand Down Expand Up @@ -84,13 +84,13 @@
"duration": 300
},
{
"id": "al-4",
"coverArt": "al-4",
"id": "al-5",
"coverArt": "al-5",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
Expand Down
18 changes: 9 additions & 9 deletions server/ctrlsubsonic/testdata/test_get_album_list_newest
View file
Expand Up @@ -6,39 +6,39 @@
"albumList": {
"album": [
{
"id": "al-2",
"coverArt": "al-2",
"id": "al-3",
"coverArt": "al-3",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-3",
"coverArt": "al-3",
"id": "al-4",
"coverArt": "al-4",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-4",
"coverArt": "al-4",
"id": "al-5",
"coverArt": "al-5",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
Expand Down
72 changes: 36 additions & 36 deletions server/ctrlsubsonic/testdata/test_get_album_list_random
View file
Expand Up @@ -6,11 +6,11 @@
"albumList": {
"album": [
{
"id": "al-13",
"coverArt": "al-13",
"id": "al-12",
"coverArt": "al-12",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"title": "album-1",
"album": "",
"parent": "al-10",
"isDir": true,
Expand All @@ -19,50 +19,37 @@
"duration": 300
},
{
"id": "al-8",
"coverArt": "al-8",
"id": "al-7",
"coverArt": "al-7",
"artist": "artist-1",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-6",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-2",
"coverArt": "al-2",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-1",
"parent": "al-6",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-3",
"coverArt": "al-3",
"id": "al-4",
"coverArt": "al-4",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-11",
"coverArt": "al-11",
"id": "al-13",
"coverArt": "al-13",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"title": "album-2",
"album": "",
"parent": "al-10",
"isDir": true,
Expand All @@ -84,39 +71,52 @@
"duration": 300
},
{
"id": "al-7",
"coverArt": "al-7",
"artist": "artist-1",
"id": "al-11",
"coverArt": "al-11",
"artist": "artist-2",
"created": "2019-11-30T00:00:00Z",
"title": "album-0",
"album": "",
"parent": "al-6",
"parent": "al-10",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-12",
"coverArt": "al-12",
"artist": "artist-2",
"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",
"artist": "artist-1",
"created": "2019-11-30T00:00:00Z",
"title": "album-1",
"album": "",
"parent": "al-10",
"parent": "al-6",
"isDir": true,
"name": "",
"songCount": 3,
"duration": 300
},
{
"id": "al-4",
"coverArt": "al-4",
"id": "al-5",
"coverArt": "al-5",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
"title": "album-2",
"album": "",
"parent": "al-1",
"parent": "al-2",
"isDir": true,
"name": "",
"songCount": 3,
Expand Down
12 changes: 6 additions & 6 deletions server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_artist
View file
Expand Up @@ -6,8 +6,8 @@
"albumList2": {
"album": [
{
"id": "al-2",
"coverArt": "al-2",
"id": "al-3",
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
Expand All @@ -19,8 +19,8 @@
"year": 2021
},
{
"id": "al-3",
"coverArt": "al-3",
"id": "al-4",
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
Expand All @@ -32,8 +32,8 @@
"year": 2021
},
{
"id": "al-4",
"coverArt": "al-4",
"id": "al-5",
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
Expand Down
12 changes: 6 additions & 6 deletions server/ctrlsubsonic/testdata/test_get_album_list_two_alpha_name
View file
Expand Up @@ -6,8 +6,8 @@
"albumList2": {
"album": [
{
"id": "al-2",
"coverArt": "al-2",
"id": "al-3",
"coverArt": "al-3",
"artistId": "ar-1",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
Expand Down Expand Up @@ -45,8 +45,8 @@
"year": 2021
},
{
"id": "al-3",
"coverArt": "al-3",
"id": "al-4",
"coverArt": "al-4",
"artistId": "ar-1",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
Expand Down Expand Up @@ -84,8 +84,8 @@
"year": 2021
},
{
"id": "al-4",
"coverArt": "al-4",
"id": "al-5",
"coverArt": "al-5",
"artistId": "ar-1",
"artist": "artist-0",
"created": "2019-11-30T00:00:00Z",
Expand Down

0 comments on commit e10c8ba

Please sign in to comment.