mirror of
https://github.com/navidrome/navidrome.git
synced 2026-07-31 09:16:30 -04:00
3158451b8d
* refactor(req): drop redundant error return from Strings
The error from Strings carried no information beyond emptiness — it fired
exactly when the param was absent — and nearly every caller discarded it with
a blank identifier. Strings now just returns the values (empty when absent),
making the common optional-list reads one clean expression.
The few required-param callers (scrobble, createShare) check for emptiness and
return the same Subsonic error code 10 as before; their e2e tests now pin that
code. Ints and Times keep their contracts by synthesizing ErrMissingParam
themselves, so selectedMusicFolderIds is untouched. The jellyfin parseFields
helper is inlined away, since ParseFields(p.Strings("fields")...) now
compiles directly.
* docs(req): clarify Strings returns nil when param is absent
95 lines
2.3 KiB
Go
95 lines
2.3 KiB
Go
package nativeapi
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"maps"
|
|
"net/http"
|
|
|
|
"github.com/Masterminds/squirrel"
|
|
"github.com/deluan/rest"
|
|
"github.com/navidrome/navidrome/core"
|
|
"github.com/navidrome/navidrome/log"
|
|
"github.com/navidrome/navidrome/model"
|
|
"github.com/navidrome/navidrome/utils/req"
|
|
)
|
|
|
|
type missingRepository struct {
|
|
model.ResourceRepository
|
|
mfRepo model.MediaFileRepository
|
|
}
|
|
|
|
func newMissingRepository(ds model.DataStore) rest.RepositoryConstructor {
|
|
return func(ctx context.Context) rest.Repository {
|
|
return &missingRepository{mfRepo: ds.MediaFile(ctx), ResourceRepository: ds.Resource(ctx, model.MediaFile{})}
|
|
}
|
|
}
|
|
|
|
func (r *missingRepository) Count(options ...rest.QueryOptions) (int64, error) {
|
|
opt := r.parseOptions(options)
|
|
return r.ResourceRepository.Count(opt)
|
|
}
|
|
|
|
func (r *missingRepository) ReadAll(options ...rest.QueryOptions) (any, error) {
|
|
opt := r.parseOptions(options)
|
|
return r.ResourceRepository.ReadAll(opt)
|
|
}
|
|
|
|
func (r *missingRepository) parseOptions(options []rest.QueryOptions) rest.QueryOptions {
|
|
var opt rest.QueryOptions
|
|
if len(options) > 0 {
|
|
opt = options[0]
|
|
opt.Filters = maps.Clone(opt.Filters)
|
|
}
|
|
opt.Filters["missing"] = "true"
|
|
return opt
|
|
}
|
|
|
|
func (r *missingRepository) Read(id string) (any, error) {
|
|
all, err := r.mfRepo.GetAll(model.QueryOptions{Filters: squirrel.And{
|
|
squirrel.Eq{"id": id},
|
|
squirrel.Eq{"missing": true},
|
|
}})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(all) == 0 {
|
|
return nil, model.ErrNotFound
|
|
}
|
|
return all[0], nil
|
|
}
|
|
|
|
func (r *missingRepository) EntityName() string {
|
|
return "missing_files"
|
|
}
|
|
|
|
func deleteMissingFiles(maintenance core.Maintenance) http.HandlerFunc {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
ctx := r.Context()
|
|
|
|
p := req.Params(r)
|
|
ids := p.Strings("id")
|
|
|
|
var err error
|
|
if len(ids) == 0 {
|
|
err = maintenance.DeleteAllMissingFiles(ctx)
|
|
} else {
|
|
err = maintenance.DeleteMissingFiles(ctx, ids)
|
|
}
|
|
|
|
if len(ids) == 1 && errors.Is(err, model.ErrNotFound) {
|
|
log.Warn(ctx, "Missing file not found", "id", ids[0])
|
|
http.Error(w, "not found", http.StatusNotFound)
|
|
return
|
|
}
|
|
if err != nil {
|
|
http.Error(w, "failed to delete missing files", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
|
|
writeDeleteManyResponse(w, r, ids)
|
|
}
|
|
}
|
|
|
|
var _ model.ResourceRepository = &missingRepository{}
|