Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 20:34:37 +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

13
internal/manager/task_export.go
View File

@@ -13,7 +13,6 @@ import (
"time"
"github.com/stashapp/stash/internal/manager/config"
"github.com/stashapp/stash/pkg/file"
"github.com/stashapp/stash/pkg/fsutil"
"github.com/stashapp/stash/pkg/gallery"
"github.com/stashapp/stash/pkg/image"
@@ -386,7 +385,7 @@ func (t *ExportTask) ExportScenes(ctx context.Context, workers int, repo Reposit
logger.Infof("[scenes] export complete in %s. %d workers used.", time.Since(startTime), workers)
}
func exportFile(f file.File, t *ExportTask) {
func exportFile(f models.File, t *ExportTask) {
newFileJSON := fileToJSON(f)
fn := newFileJSON.Filename()
@@ -396,7 +395,7 @@ func exportFile(f file.File, t *ExportTask) {
}
}
func fileToJSON(f file.File) jsonschema.DirEntry {
func fileToJSON(f models.File) jsonschema.DirEntry {
bf := f.Base()
base := jsonschema.BaseFile{
@@ -422,7 +421,7 @@ func fileToJSON(f file.File) jsonschema.DirEntry {
}
switch ff := f.(type) {
case *file.VideoFile:
case *models.VideoFile:
base.Type = jsonschema.DirEntryTypeVideo
return jsonschema.VideoFile{
BaseFile: &base,
@@ -437,7 +436,7 @@ func fileToJSON(f file.File) jsonschema.DirEntry {
Interactive: ff.Interactive,
InteractiveSpeed: ff.InteractiveSpeed,
}
case *file.ImageFile:
case *models.ImageFile:
base.Type = jsonschema.DirEntryTypeImage
return jsonschema.ImageFile{
BaseFile: &base,
@@ -450,7 +449,7 @@ func fileToJSON(f file.File) jsonschema.DirEntry {
return &base
}
func exportFolder(f file.Folder, t *ExportTask) {
func exportFolder(f models.Folder, t *ExportTask) {
newFileJSON := folderToJSON(f)
fn := newFileJSON.Filename()
@@ -460,7 +459,7 @@ func exportFolder(f file.Folder, t *ExportTask) {
}
}
func folderToJSON(f file.Folder) jsonschema.DirEntry {
func folderToJSON(f models.Folder) jsonschema.DirEntry {
base := jsonschema.BaseDirEntry{
Type: jsonschema.DirEntryTypeFolder,
ModTime: json.JSONTime{Time: f.ModTime},