🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
Change MediaFolder.ID type to int32
Deluan1cfa7b227205
diff --git a/model/mediafolder.go b/model/mediafolder.goindex aebbd4ee5..cefa0267a 100644--- a/model/mediafolder.go+++ b/model/mediafolder.go@@ -9,6 +9,6 @@ type MediaFolder struct {type MediaFolders []MediaFoldertype MediaFolderRepository interface {- Get(id string) (*MediaFolder, error)+ Get(id int32) (*MediaFolder, error)GetAll() (MediaFolders, error)}diff --git a/persistence/mediafolders_repository.go b/persistence/mediafolders_repository.goindex 31a242703..552be65ec 100644--- a/persistence/mediafolders_repository.go+++ b/persistence/mediafolders_repository.go@@ -16,7 +16,7 @@ func NewMediaFolderRepository(ctx context.Context, o orm.Ormer) model.MediaFoldereturn &mediaFolderRepository{ctx}}-func (r *mediaFolderRepository) Get(id string) (*model.MediaFolder, error) {+func (r *mediaFolderRepository) Get(id int32) (*model.MediaFolder, error) {mediaFolder := hardCoded()return &mediaFolder, nil}diff --git a/scanner/scanner.go b/scanner/scanner.goindex ae5f689b5..6826152a0 100644--- a/scanner/scanner.go+++ b/scanner/scanner.go@@ -24,7 +24,7 @@ type StatusInfo struct {MediaFolder stringScanning boolLastScan time.Time- Count int+ Count int64}type FolderScanner interface {@@ -42,7 +42,7 @@ type scanner struct {type scanStatus struct {active bool- count int+ count int64lastUpdate time.Time}@@ -138,7 +138,7 @@ func (s *scanner) getStatus(folder string) *scanStatus {return nil}-func (s *scanner) setStatus(folder string, active bool, count int, lastUpdate time.Time) {+func (s *scanner) setStatus(folder string, active bool, count int64, lastUpdate time.Time) {s.lock.Lock()defer s.lock.Unlock()if status, ok := s.status[folder]; ok {diff --git a/server/subsonic/browsing.go b/server/subsonic/browsing.goindex dff0373a8..a5c736c59 100644--- a/server/subsonic/browsing.go+++ b/server/subsonic/browsing.go@@ -37,8 +37,8 @@ func (c *BrowsingController) GetMusicFolders(w http.ResponseWriter, r *http.Requreturn response, nil}-func (c *BrowsingController) getArtistIndex(ctx context.Context, mediaFolderId string, ifModifiedSince time.Time) (*responses.Indexes, error) {- folder, err := c.ds.MediaFolder(ctx).Get(mediaFolderId)+func (c *BrowsingController) getArtistIndex(ctx context.Context, mediaFolderId int, ifModifiedSince time.Time) (*responses.Indexes, error) {+ folder, err := c.ds.MediaFolder(ctx).Get(int32(mediaFolderId))if err != nil {log.Error(ctx, "Error retrieving MediaFolder", "id", mediaFolderId, err)return nil, newError(responses.ErrorGeneric, "Internal Error")@@ -80,7 +80,7 @@ func (c *BrowsingController) getArtistIndex(ctx context.Context, mediaFolderId s}func (c *BrowsingController) GetIndexes(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {- musicFolderId := utils.ParamString(r, "musicFolderId")+ musicFolderId := utils.ParamInt(r, "musicFolderId", 0)ifModifiedSince := utils.ParamTime(r, "ifModifiedSince", time.Time{})res, err := c.getArtistIndex(r.Context(), musicFolderId, ifModifiedSince)@@ -94,7 +94,7 @@ func (c *BrowsingController) GetIndexes(w http.ResponseWriter, r *http.Request)}func (c *BrowsingController) GetArtists(w http.ResponseWriter, r *http.Request) (*responses.Subsonic, error) {- musicFolderId := utils.ParamString(r, "musicFolderId")+ musicFolderId := utils.ParamInt(r, "musicFolderId", 0)res, err := c.getArtistIndex(r.Context(), musicFolderId, time.Time{})if err != nil {return nil, err