Data layer restructuring (#997)

* Move query builders to sqlite package * Add transaction system * Wrap model resolvers in transaction * Add error return value for StringSliceToIntSlice * Update/refactor mutation resolvers * Convert query builders * Remove unused join types * Add stash id unit tests * Use WAL journal mode
2025-12-17 20:34:37 +03:00 · 2021-01-18 12:23:20 +11:00
parent 7bae990c67
commit 1e04deb3d4
168 changed files with 12683 additions and 10863 deletions
--- a/pkg/api/resolver_query_find_scene.go
+++ b/pkg/api/resolver_query_find_scene.go
@@ -9,70 +9,114 @@ import (
 )

 func (r *queryResolver) FindScene(ctx context.Context, id *string, checksum *string) (*models.Scene, error) {
-	qb := models.NewSceneQueryBuilder()
 	var scene *models.Scene
-	var err error
-	if id != nil {
-		idInt, _ := strconv.Atoi(*id)
-		scene, err = qb.Find(idInt)
-	} else if checksum != nil {
-		scene, err = qb.FindByChecksum(*checksum)
-	}
-	return scene, err
-}
-
-func (r *queryResolver) FindSceneByHash(ctx context.Context, input models.SceneHashInput) (*models.Scene, error) {
-	qb := models.NewSceneQueryBuilder()
-	var scene *models.Scene
-	var err error
-
-	if input.Checksum != nil {
-		scene, err = qb.FindByChecksum(*input.Checksum)
-		if err != nil {
-			return nil, err
+	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+		qb := repo.Scene()
+		var err error
+		if id != nil {
+			idInt, err := strconv.Atoi(*id)
+			if err != nil {
+				return err
+			}
+			scene, err = qb.Find(idInt)
+		} else if checksum != nil {
+			scene, err = qb.FindByChecksum(*checksum)
 		}
-	}

-	if scene == nil && input.Oshash != nil {
-		scene, err = qb.FindByOSHash(*input.Oshash)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return scene, err
-}
-
-func (r *queryResolver) FindScenes(ctx context.Context, sceneFilter *models.SceneFilterType, sceneIds []int, filter *models.FindFilterType) (*models.FindScenesResultType, error) {
-	qb := models.NewSceneQueryBuilder()
-	scenes, total := qb.Query(sceneFilter, filter)
-	return &models.FindScenesResultType{
-		Count:  total,
-		Scenes: scenes,
-	}, nil
-}
-
-func (r *queryResolver) FindScenesByPathRegex(ctx context.Context, filter *models.FindFilterType) (*models.FindScenesResultType, error) {
-	qb := models.NewSceneQueryBuilder()
-
-	scenes, total := qb.QueryByPathRegex(filter)
-	return &models.FindScenesResultType{
-		Count:  total,
-		Scenes: scenes,
-	}, nil
-}
-
-func (r *queryResolver) ParseSceneFilenames(ctx context.Context, filter *models.FindFilterType, config models.SceneParserInput) (*models.SceneParserResultType, error) {
-	parser := manager.NewSceneFilenameParser(filter, config)
-
-	result, count, err := parser.Parse()
-
-	if err != nil {
+		return err
+	}); err != nil {
 		return nil, err
 	}

-	return &models.SceneParserResultType{
-		Count:   count,
-		Results: result,
-	}, nil
+	return scene, nil
+}
+
+func (r *queryResolver) FindSceneByHash(ctx context.Context, input models.SceneHashInput) (*models.Scene, error) {
+	var scene *models.Scene
+
+	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+		qb := repo.Scene()
+		var err error
+		if input.Checksum != nil {
+			scene, err = qb.FindByChecksum(*input.Checksum)
+			if err != nil {
+				return err
+			}
+		}
+
+		if scene == nil && input.Oshash != nil {
+			scene, err = qb.FindByOSHash(*input.Oshash)
+			if err != nil {
+				return err
+			}
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return scene, nil
+}
+
+func (r *queryResolver) FindScenes(ctx context.Context, sceneFilter *models.SceneFilterType, sceneIds []int, filter *models.FindFilterType) (ret *models.FindScenesResultType, err error) {
+	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+		scenes, total, err := repo.Scene().Query(sceneFilter, filter)
+		if err != nil {
+			return err
+		}
+		ret = &models.FindScenesResultType{
+			Count:  total,
+			Scenes: scenes,
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}
+
+func (r *queryResolver) FindScenesByPathRegex(ctx context.Context, filter *models.FindFilterType) (ret *models.FindScenesResultType, err error) {
+	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+		scenes, total, err := repo.Scene().QueryByPathRegex(filter)
+		if err != nil {
+			return err
+		}
+
+		ret = &models.FindScenesResultType{
+			Count:  total,
+			Scenes: scenes,
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
+}
+
+func (r *queryResolver) ParseSceneFilenames(ctx context.Context, filter *models.FindFilterType, config models.SceneParserInput) (ret *models.SceneParserResultType, err error) {
+	parser := manager.NewSceneFilenameParser(filter, config)
+
+	if err := r.withReadTxn(ctx, func(repo models.ReaderRepository) error {
+		result, count, err := parser.Parse(repo)
+
+		if err != nil {
+			return err
+		}
+
+		ret = &models.SceneParserResultType{
+			Count:   count,
+			Results: result,
+		}
+
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+
+	return ret, nil
 }