mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 12:24:38 +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,7 +6,7 @@ import (
|
||||
|
||||
"github.com/doug-martin/goqu/v9"
|
||||
"github.com/doug-martin/goqu/v9/exp"
|
||||
"github.com/stashapp/stash/pkg/file"
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
"gopkg.in/guregu/null.v4"
|
||||
)
|
||||
|
||||
@@ -23,8 +23,8 @@ func (r fingerprintQueryRow) valid() bool {
|
||||
return r.Type.Valid
|
||||
}
|
||||
|
||||
func (r *fingerprintQueryRow) resolve() file.Fingerprint {
|
||||
return file.Fingerprint{
|
||||
func (r *fingerprintQueryRow) resolve() models.Fingerprint {
|
||||
return models.Fingerprint{
|
||||
Type: r.Type.String,
|
||||
Fingerprint: r.Fingerprint,
|
||||
}
|
||||
@@ -45,7 +45,7 @@ var FingerprintReaderWriter = &fingerprintQueryBuilder{
|
||||
tableMgr: fingerprintTableMgr,
|
||||
}
|
||||
|
||||
func (qb *fingerprintQueryBuilder) insert(ctx context.Context, fileID file.ID, f file.Fingerprint) error {
|
||||
func (qb *fingerprintQueryBuilder) insert(ctx context.Context, fileID models.FileID, f models.Fingerprint) error {
|
||||
table := qb.table()
|
||||
q := dialect.Insert(table).Cols(fileIDColumn, "type", "fingerprint").Vals(
|
||||
goqu.Vals{fileID, f.Type, f.Fingerprint},
|
||||
@@ -58,7 +58,7 @@ func (qb *fingerprintQueryBuilder) insert(ctx context.Context, fileID file.ID, f
|
||||
return nil
|
||||
}
|
||||
|
||||
func (qb *fingerprintQueryBuilder) insertJoins(ctx context.Context, fileID file.ID, f []file.Fingerprint) error {
|
||||
func (qb *fingerprintQueryBuilder) insertJoins(ctx context.Context, fileID models.FileID, f []models.Fingerprint) error {
|
||||
for _, ff := range f {
|
||||
if err := qb.insert(ctx, fileID, ff); err != nil {
|
||||
return err
|
||||
@@ -68,7 +68,7 @@ func (qb *fingerprintQueryBuilder) insertJoins(ctx context.Context, fileID file.
|
||||
return nil
|
||||
}
|
||||
|
||||
func (qb *fingerprintQueryBuilder) replaceJoins(ctx context.Context, fileID file.ID, f []file.Fingerprint) error {
|
||||
func (qb *fingerprintQueryBuilder) replaceJoins(ctx context.Context, fileID models.FileID, f []models.Fingerprint) error {
|
||||
if err := qb.destroy(ctx, []int{int(fileID)}); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user