diff --git a/domain/album.go b/domain/album.go index fae052ec6..2a6f873c1 100644 --- a/domain/album.go +++ b/domain/album.go @@ -34,5 +34,5 @@ type AlbumRepository interface { GetAll(...QueryOptions) (Albums, error) PurgeInactive(active Albums) ([]string, error) GetAllIds() ([]string, error) - GetStarred(QueryOptions) (Albums, error) + GetStarred(...QueryOptions) (Albums, error) } diff --git a/persistence/db_ledis/album_repository.go b/persistence/db_ledis/album_repository.go index 5ceabaa88..9c39cecd4 100644 --- a/persistence/db_ledis/album_repository.go +++ b/persistence/db_ledis/album_repository.go @@ -64,10 +64,10 @@ func (r *albumRepository) PurgeInactive(active domain.Albums) ([]string, error) }) } -func (r *albumRepository) GetStarred(options domain.QueryOptions) (domain.Albums, error) { +func (r *albumRepository) GetStarred(options ...domain.QueryOptions) (domain.Albums, error) { var as = make(domain.Albums, 0) start := time.Time{}.Add(1 * time.Hour) - err := r.loadRange("Starred", start, time.Now(), &as, options) + err := r.loadRange("Starred", start, time.Now(), &as, options...) return as, err } diff --git a/persistence/db_storm/album_repository.go b/persistence/db_storm/album_repository.go index 3d2e93790..e06086287 100644 --- a/persistence/db_storm/album_repository.go +++ b/persistence/db_storm/album_repository.go @@ -97,9 +97,9 @@ func (r *albumRepository) PurgeInactive(activeList domain.Albums) ([]string, err return r.purgeInactive(activeList) } -func (r *albumRepository) GetStarred(options domain.QueryOptions) (domain.Albums, error) { +func (r *albumRepository) GetStarred(options ...domain.QueryOptions) (domain.Albums, error) { var starred []_Album - err := r.execute(q.Eq("Starred", true), &starred, &options) + err := r.execute(q.Eq("Starred", true), &starred, options...) if err != nil { return nil, err } diff --git a/persistence/db_storm/mediafile_repository.go b/persistence/db_storm/mediafile_repository.go index 69acab2b9..503576166 100644 --- a/persistence/db_storm/mediafile_repository.go +++ b/persistence/db_storm/mediafile_repository.go @@ -79,7 +79,7 @@ func (r *mediaFileRepository) FindByAlbum(albumId string) (domain.MediaFiles, er func (r *mediaFileRepository) GetStarred(options domain.QueryOptions) (domain.MediaFiles, error) { var starred []_MediaFile - err := r.execute(q.Eq("Starred", true), &starred, &options) + err := r.execute(q.Eq("Starred", true), &starred, options) if err != nil { return nil, err } diff --git a/persistence/db_storm/storm_repository.go b/persistence/db_storm/storm_repository.go index bf86652d6..0d91fa183 100644 --- a/persistence/db_storm/storm_repository.go +++ b/persistence/db_storm/storm_repository.go @@ -79,7 +79,7 @@ func (r *stormRepository) purgeInactive(activeList interface{}) (deleted []strin return deleted, nil } -func (r *stormRepository) execute(matcher q.Matcher, result interface{}, options ...*domain.QueryOptions) error { +func (r *stormRepository) execute(matcher q.Matcher, result interface{}, options ...domain.QueryOptions) error { query := Db().Select(matcher) if len(options) > 0 { query = addQueryOptions(query, options[0]) @@ -118,7 +118,7 @@ func stormOptions(options ...domain.QueryOptions) func(*index.Options) { } } -func addQueryOptions(q storm.Query, o *domain.QueryOptions) storm.Query { +func addQueryOptions(q storm.Query, o domain.QueryOptions) storm.Query { if o.SortBy != "" { q = q.OrderBy(o.SortBy) }