Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 04:14:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Model refactor (#3915)

Browse Source 
* Add mockery config file
* Move basic file/folder structs to models
* Fix hack due to import loop
* Move file interfaces to models
* Move folder interfaces to models
* Move scene interfaces to models
* Move scene marker interfaces to models
* Move image interfaces to models
* Move gallery interfaces to models
* Move gallery chapter interfaces to models
* Move studio interfaces to models
* Move movie interfaces to models
* Move performer interfaces to models
* Move tag interfaces to models
* Move autotag interfaces to models
* Regenerate mocks
This commit is contained in:
DingDongSoLong4
2023-09-01 02:39:29 +02:00
committed by GitHub
parent 20520a58b4
commit c364346a59
185 changed files with 3840 additions and 2559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/models/file.go
View File

@@ -4,8 +4,6 @@ import (
"context"
"path/filepath"
"strings"
"github.com/stashapp/stash/pkg/file"
)
type FileQueryOptions struct {
@@ -57,24 +55,24 @@ func PathsFileFilter(paths []string) *FileFilterType {
type FileQueryResult struct {
// can't use QueryResult because id type is wrong
IDs []file.ID
IDs []FileID
Count int
finder file.Finder
files []file.File
getter FileGetter
files []File
resolveErr error
}
func NewFileQueryResult(finder file.Finder) *FileQueryResult {
func NewFileQueryResult(fileGetter FileGetter) *FileQueryResult {
return &FileQueryResult{
finder: finder,
getter: fileGetter,
}
}
func (r *FileQueryResult) Resolve(ctx context.Context) ([]file.File, error) {
func (r *FileQueryResult) Resolve(ctx context.Context) ([]File, error) {
// cache results
if r.files == nil && r.resolveErr == nil {
r.files, r.resolveErr = r.finder.Find(ctx, r.IDs...)
r.files, r.resolveErr = r.getter.Find(ctx, r.IDs...)
}
return r.files, r.resolveErr
}