mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 20:34:37 +03:00
Model refactor (#3915)
* 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:
@@ -6,6 +6,7 @@ import (
|
||||
"os"
|
||||
|
||||
"github.com/stashapp/stash/pkg/fsutil"
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
)
|
||||
|
||||
// Opener provides an interface to open a file.
|
||||
@@ -14,7 +15,7 @@ type Opener interface {
|
||||
}
|
||||
|
||||
type fsOpener struct {
|
||||
fs FS
|
||||
fs models.FS
|
||||
name string
|
||||
}
|
||||
|
||||
@@ -22,15 +23,6 @@ func (o *fsOpener) Open() (io.ReadCloser, error) {
|
||||
return o.fs.Open(o.name)
|
||||
}
|
||||
|
||||
// FS represents a file system.
|
||||
type FS interface {
|
||||
Stat(name string) (fs.FileInfo, error)
|
||||
Lstat(name string) (fs.FileInfo, error)
|
||||
Open(name string) (fs.ReadDirFile, error)
|
||||
OpenZip(name string) (*ZipFS, error)
|
||||
IsPathCaseSensitive(path string) (bool, error)
|
||||
}
|
||||
|
||||
// OsFS is a file system backed by the OS.
|
||||
type OsFS struct{}
|
||||
|
||||
@@ -66,7 +58,7 @@ func (f *OsFS) Open(name string) (fs.ReadDirFile, error) {
|
||||
return os.Open(name)
|
||||
}
|
||||
|
||||
func (f *OsFS) OpenZip(name string) (*ZipFS, error) {
|
||||
func (f *OsFS) OpenZip(name string) (models.ZipFS, error) {
|
||||
info, err := f.Lstat(name)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
Reference in New Issue
Block a user