refactor structure

d-fi · Sep 27, 2024 · c55025a · c55025a
1 parent f9a854d
commit c55025a
Show file tree

Hide file tree

Showing 38 changed files with 21 additions and 21 deletions.
diff --git a/pkg/api/.DS_Store → api/.DS_Store b/pkg/api/.DS_Store → api/.DS_Store
diff --git a/pkg/api/api.go → api/api.go b/pkg/api/api.go → api/api.go
@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/d-fi/GoFi/pkg/request"
-	"github.com/d-fi/GoFi/pkg/types"
+	"github.com/d-fi/GoFi/request"
+	"github.com/d-fi/GoFi/types"
 )
 
 func GetTrackInfoPublicApi(sngID string) (types.TrackTypePublicAPI, error) {

diff --git a/pkg/api/api_test.go → api/api_test.go b/pkg/api/api_test.go → api/api_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/d-fi/GoFi/pkg/request"
+	"github.com/d-fi/GoFi/request"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/decrypt/decrypt.go → decrypt/decrypt.go b/pkg/decrypt/decrypt.go → decrypt/decrypt.go
diff --git a/pkg/download/download.go → download/download.go b/pkg/download/download.go → download/download.go
@@ -6,11 +6,11 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/d-fi/GoFi/pkg/api"
-	"github.com/d-fi/GoFi/pkg/decrypt"
-	"github.com/d-fi/GoFi/pkg/metadata"
-	"github.com/d-fi/GoFi/pkg/request"
-	"github.com/d-fi/GoFi/pkg/utils"
+	"github.com/d-fi/GoFi/api"
+	"github.com/d-fi/GoFi/decrypt"
+	"github.com/d-fi/GoFi/metadata"
+	"github.com/d-fi/GoFi/request"
+	"github.com/d-fi/GoFi/utils"
 )
 
 // DownloadTrack downloads a track, adds metadata, and saves it to the specified directory.

diff --git a/pkg/download/types.go → download/types.go b/pkg/download/types.go → download/types.go
diff --git a/pkg/download/url.go → download/url.go b/pkg/download/url.go → download/url.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/d-fi/GoFi/pkg/decrypt"
-	"github.com/d-fi/GoFi/pkg/request"
-	"github.com/d-fi/GoFi/pkg/types"
-	"github.com/d-fi/GoFi/pkg/utils"
+	"github.com/d-fi/GoFi/decrypt"
+	"github.com/d-fi/GoFi/request"
+	"github.com/d-fi/GoFi/types"
+	"github.com/d-fi/GoFi/utils"
 )
 
 // WrongLicense error for when the user's license doesn't allow streaming certain formats.

diff --git a/pkg/download/url_test.go → download/url_test.go b/pkg/download/url_test.go → download/url_test.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/d-fi/GoFi/pkg/api"
-	"github.com/d-fi/GoFi/pkg/request"
+	"github.com/d-fi/GoFi/api"
+	"github.com/d-fi/GoFi/request"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/logger/zerolog.go → logger/zerolog.go b/pkg/logger/zerolog.go → logger/zerolog.go
diff --git a/pkg/metadata/album_cover.go → metadata/album_cover.go b/pkg/metadata/album_cover.go → metadata/album_cover.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/d-fi/GoFi/pkg/request"
+	"github.com/d-fi/GoFi/request"
 	"github.com/hashicorp/golang-lru/v2/expirable"
 )
 

diff --git a/pkg/metadata/album_cover_test.go → metadata/album_cover_test.go b/pkg/metadata/album_cover_test.go → metadata/album_cover_test.go
diff --git a/pkg/metadata/flac_meta.go → metadata/flac_meta.go b/pkg/metadata/flac_meta.go → metadata/flac_meta.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/d-fi/GoFi/pkg/metaflac"
-	"github.com/d-fi/GoFi/pkg/types"
+	"github.com/d-fi/GoFi/metaflac"
+	"github.com/d-fi/GoFi/types"
 )
 
 func WriteMetadataFlac(buffer []byte, track types.TrackType, album *types.AlbumTypePublicApi, dimension int, cover []byte) ([]byte, error) {

diff --git a/pkg/metadata/id3_tag.go → metadata/id3_tag.go b/pkg/metadata/id3_tag.go → metadata/id3_tag.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/bogem/id3v2/v2"
-	"github.com/d-fi/GoFi/pkg/types"
+	"github.com/d-fi/GoFi/types"
 )
 
 func WriteMetadataMp3(buffer []byte, track types.TrackType, album *types.AlbumTypePublicApi, cover []byte) ([]byte, error) {

diff --git a/pkg/metadata/metadata.go → metadata/metadata.go b/pkg/metadata/metadata.go → metadata/metadata.go
@@ -7,8 +7,8 @@ import (
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 
-	"github.com/d-fi/GoFi/pkg/api"
-	"github.com/d-fi/GoFi/pkg/types"
+	"github.com/d-fi/GoFi/api"
+	"github.com/d-fi/GoFi/types"
 )
 
 // AddTrackTags adds metadata to the track buffer (MP3 or FLAC) based on track and album information.

diff --git a/pkg/metaflac/helpers.go → metaflac/helpers.go b/pkg/metaflac/helpers.go → metaflac/helpers.go
diff --git a/pkg/metaflac/writer.go → metaflac/writer.go b/pkg/metaflac/writer.go → metaflac/writer.go
diff --git a/pkg/metaflac/writer_test.go → metaflac/writer_test.go b/pkg/metaflac/writer_test.go → metaflac/writer_test.go
diff --git a/pkg/request/client.go → request/client.go b/pkg/request/client.go → request/client.go
diff --git a/pkg/request/client_test.go → request/client_test.go b/pkg/request/client_test.go → request/client_test.go
diff --git a/pkg/request/request.go → request/request.go b/pkg/request/request.go → request/request.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/d-fi/GoFi/pkg/utils"
+	"github.com/d-fi/GoFi/utils"
 	"github.com/hashicorp/golang-lru/v2/expirable"
 )
 

diff --git a/pkg/request/types.go → request/types.go b/pkg/request/types.go → request/types.go
diff --git a/pkg/types/album.go → types/album.go b/pkg/types/album.go → types/album.go
diff --git a/pkg/types/artist.go → types/artist.go b/pkg/types/artist.go → types/artist.go
diff --git a/pkg/types/channel.go → types/channel.go b/pkg/types/channel.go → types/channel.go
diff --git a/pkg/types/helpers.go → types/helpers.go b/pkg/types/helpers.go → types/helpers.go
diff --git a/pkg/types/locales.go → types/locales.go b/pkg/types/locales.go → types/locales.go
diff --git a/pkg/types/playlist-channel.go → types/playlist-channel.go b/pkg/types/playlist-channel.go → types/playlist-channel.go
diff --git a/pkg/types/playlist.go → types/playlist.go b/pkg/types/playlist.go → types/playlist.go
diff --git a/pkg/types/profile.go → types/profile.go b/pkg/types/profile.go → types/profile.go
diff --git a/pkg/types/radio.go → types/radio.go b/pkg/types/radio.go → types/radio.go
diff --git a/pkg/types/search.go → types/search.go b/pkg/types/search.go → types/search.go
diff --git a/pkg/types/show.go → types/show.go b/pkg/types/show.go → types/show.go
diff --git a/pkg/types/tracks.go → types/tracks.go b/pkg/types/tracks.go → types/tracks.go
diff --git a/pkg/types/user.go → types/user.go b/pkg/types/user.go → types/user.go
diff --git a/pkg/utils/dirs.go → utils/dirs.go b/pkg/utils/dirs.go → utils/dirs.go
diff --git a/pkg/utils/filename.go → utils/filename.go b/pkg/utils/filename.go → utils/filename.go
diff --git a/pkg/utils/query.go → utils/query.go b/pkg/utils/query.go → utils/query.go
diff --git a/pkg/utils/url.go → utils/url.go b/pkg/utils/url.go → utils/url.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/d-fi/GoFi/pkg/request"
+    	"github.com/d-fi/GoFi/request"
     	"github.com/hashicorp/golang-lru/v2/expirable"
     )
@@ Expand Down @@