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, part 3 (#4152)

Browse Source 
* Remove manager.Repository
* Refactor other repositories
* Fix tests and add database mock
* Add AssertExpectations method
* Refactor routes
* Move default movie image to internal/static and add convenience methods
* Refactor default performer image boxes
This commit is contained in:
DingDongSoLong4
2023-10-16 05:26:34 +02:00
committed by GitHub
parent 40bcb4baa5
commit 33f2ebf2a3
87 changed files with 1843 additions and 1651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/manager/task_generate_markers.go
View File

@@ -12,7 +12,7 @@ import (
)
type GenerateMarkersTask struct {
TxnManager Repository
repository models.Repository
Scene *models.Scene
Marker *models.SceneMarker
Overwrite bool
@@ -41,9 +41,10 @@ func (t *GenerateMarkersTask) Start(ctx context.Context) {
if t.Marker != nil {
var scene *models.Scene
if err := t.TxnManager.WithReadTxn(ctx, func(ctx context.Context) error {
r := t.repository
if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
var err error
scene, err = t.TxnManager.Scene.Find(ctx, t.Marker.SceneID)
scene, err = r.Scene.Find(ctx, t.Marker.SceneID)
if err != nil {
return err
}
@@ -51,7 +52,7 @@ func (t *GenerateMarkersTask) Start(ctx context.Context) {
return fmt.Errorf("scene with id %d not found", t.Marker.SceneID)
}
return scene.LoadPrimaryFile(ctx, t.TxnManager.File)
return scene.LoadPrimaryFile(ctx, r.File)
}); err != nil {
logger.Errorf("error finding scene for marker generation: %v", err)
return
@@ -70,9 +71,10 @@ func (t *GenerateMarkersTask) Start(ctx context.Context) {
func (t *GenerateMarkersTask) generateSceneMarkers(ctx context.Context) {
var sceneMarkers []*models.SceneMarker
if err := t.TxnManager.WithReadTxn(ctx, func(ctx context.Context) error {
r := t.repository
if err := r.WithReadTxn(ctx, func(ctx context.Context) error {
var err error
sceneMarkers, err = t.TxnManager.SceneMarker.FindBySceneID(ctx, t.Scene.ID)
sceneMarkers, err = r.SceneMarker.FindBySceneID(ctx, t.Scene.ID)
return err
}); err != nil {
logger.Errorf("error getting scene markers: %s", err.Error())
@@ -129,7 +131,7 @@ func (t *GenerateMarkersTask) generateMarker(videoFile *models.VideoFile, scene
func (t *GenerateMarkersTask) markersNeeded(ctx context.Context) int {
markers := 0
sceneMarkers, err := t.TxnManager.SceneMarker.FindBySceneID(ctx, t.Scene.ID)
sceneMarkers, err := t.repository.SceneMarker.FindBySceneID(ctx, t.Scene.ID)
if err != nil {
logger.Errorf("error finding scene markers: %s", err.Error())
return 0