mirrors/navidrome
1
0
Fork 0
mirror of https://github.com/navidrome/navidrome.git synced 2025-04-04 21:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Optimize queries by path, should speed up the scanner a bit

Browse source
This commit is contained in:
Deluan 2021-10-29 13:07:20 -04:00
parent 7cdbc04c5e
commit a42aeff88d
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
model/mediafile.go
View file

@ -66,11 +66,13 @@ type MediaFileRepository interface {
Put(m *MediaFile) error Put(m *MediaFile) error
Get(id string) (*MediaFile, error) Get(id string) (*MediaFile, error)
GetAll(options ...QueryOptions) (MediaFiles, error) GetAll(options ...QueryOptions) (MediaFiles, error)
Search(q string, offset int, size int) (MediaFiles, error)
Delete(id string) error
// Queries by path to support the scanner, no Annotations or Bookmarks required in the response
FindAllByPath(path string) (MediaFiles, error) FindAllByPath(path string) (MediaFiles, error)
FindByPath(path string) (*MediaFile, error) FindByPath(path string) (*MediaFile, error)
FindPathsRecursively(basePath string) ([]string, error) FindPathsRecursively(basePath string) ([]string, error)
Search(q string, offset int, size int) (MediaFiles, error)
Delete(id string) error
DeleteByPath(path string) (int64, error) DeleteByPath(path string) (int64, error)
AnnotatedRepository AnnotatedRepository

4
persistence/mediafile_repository.go
View file

@ -100,7 +100,7 @@ func (r *mediaFileRepository) GetAll(options ...model.QueryOptions) (model.Media
} }
func (r *mediaFileRepository) FindByPath(path string) (*model.MediaFile, error) { func (r *mediaFileRepository) FindByPath(path string) (*model.MediaFile, error) {
sel := r.selectMediaFile().Where(Eq{"path": path}) sel := r.newSelect().Columns("*").Where(Eq{"path": path})
var res model.MediaFiles var res model.MediaFiles
if err := r.queryAll(sel, &res); err != nil { if err := r.queryAll(sel, &res); err != nil {
return nil, err return nil, err
@ -129,7 +129,7 @@ func (r *mediaFileRepository) FindAllByPath(path string) (model.MediaFiles, erro
// Query by path based on https://stackoverflow.com/a/13911906/653632 // Query by path based on https://stackoverflow.com/a/13911906/653632
path = cleanPath(path) path = cleanPath(path)
pathLen := utf8.RuneCountInString(path) pathLen := utf8.RuneCountInString(path)
sel0 := r.selectMediaFile().Columns(fmt.Sprintf("substr(path, %d) AS item", pathLen+2)). sel0 := r.newSelect().Columns("media_file.*", fmt.Sprintf("substr(path, %d) AS item", pathLen+2)).
Where(pathStartsWith(path)) Where(pathStartsWith(path))
sel := r.newSelect().Columns("*", "item NOT GLOB '*"+string(os.PathSeparator)+"*' AS isLast"). sel := r.newSelect().Columns("*", "item NOT GLOB '*"+string(os.PathSeparator)+"*' AS isLast").
Where(Eq{"isLast": 1}).FromSelect(sel0, "sel0") Where(Eq{"isLast": 1}).FromSelect(sel0, "sel0")