mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 20:34:37 +03:00
File storage rewrite (#2676)
* Restructure data layer part 2 (#2599) * Refactor and separate image model * Refactor image query builder * Handle relationships in image query builder * Remove relationship management methods * Refactor gallery model/query builder * Add scenes to gallery model * Convert scene model * Refactor scene models * Remove unused methods * Add unit tests for gallery * Add image tests * Add scene tests * Convert unnecessary scene value pointers to values * Convert unnecessary pointer values to values * Refactor scene partial * Add scene partial tests * Refactor ImagePartial * Add image partial tests * Refactor gallery partial update * Add partial gallery update tests * Use zero/null package for null values * Add files and scan system * Add sqlite implementation for files/folders * Add unit tests for files/folders * Image refactors * Update image data layer * Refactor gallery model and creation * Refactor scene model * Refactor scenes * Don't set title from filename * Allow galleries to freely add/remove images * Add multiple scene file support to graphql and UI * Add multiple file support for images in graphql/UI * Add multiple file for galleries in graphql/UI * Remove use of some deprecated fields * Remove scene path usage * Remove gallery path usage * Remove path from image * Move funscript to video file * Refactor caption detection * Migrate existing data * Add post commit/rollback hook system * Lint. Comment out import/export tests * Add WithDatabase read only wrapper * Prepend tasks to list * Add 32 pre-migration * Add warnings in release and migration notes
This commit is contained in:
@@ -3,8 +3,10 @@ package sqlite
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"runtime/debug"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/stashapp/stash/pkg/logger"
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
)
|
||||
|
||||
@@ -12,10 +14,24 @@ type key int
|
||||
|
||||
const (
|
||||
txnKey key = iota + 1
|
||||
dbKey
|
||||
hookManagerKey
|
||||
)
|
||||
|
||||
func (db *Database) WithDatabase(ctx context.Context) (context.Context, error) {
|
||||
// if we are already in a transaction or have a database already, just use it
|
||||
if tx, _ := getDBReader(ctx); tx != nil {
|
||||
return ctx, nil
|
||||
}
|
||||
|
||||
return context.WithValue(ctx, dbKey, db.db), nil
|
||||
}
|
||||
|
||||
func (db *Database) Begin(ctx context.Context) (context.Context, error) {
|
||||
if tx, _ := getTx(ctx); tx != nil {
|
||||
// log the stack trace so we can see
|
||||
logger.Error(string(debug.Stack()))
|
||||
|
||||
return nil, fmt.Errorf("already in transaction")
|
||||
}
|
||||
|
||||
@@ -24,6 +40,9 @@ func (db *Database) Begin(ctx context.Context) (context.Context, error) {
|
||||
return nil, fmt.Errorf("beginning transaction: %w", err)
|
||||
}
|
||||
|
||||
hookMgr := &hookManager{}
|
||||
ctx = hookMgr.register(ctx)
|
||||
|
||||
return context.WithValue(ctx, txnKey, tx), nil
|
||||
}
|
||||
|
||||
@@ -32,7 +51,15 @@ func (db *Database) Commit(ctx context.Context) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Commit()
|
||||
|
||||
if err := tx.Commit(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// execute post-commit hooks
|
||||
db.executePostCommitHooks(ctx)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (db *Database) Rollback(ctx context.Context) error {
|
||||
@@ -40,7 +67,15 @@ func (db *Database) Rollback(ctx context.Context) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return tx.Rollback()
|
||||
|
||||
if err := tx.Rollback(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// execute post-rollback hooks
|
||||
db.executePostRollbackHooks(ctx)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func getTx(ctx context.Context) (*sqlx.Tx, error) {
|
||||
@@ -51,14 +86,30 @@ func getTx(ctx context.Context) (*sqlx.Tx, error) {
|
||||
return tx, nil
|
||||
}
|
||||
|
||||
func getDBReader(ctx context.Context) (dbReader, error) {
|
||||
// get transaction first if present
|
||||
tx, ok := ctx.Value(txnKey).(*sqlx.Tx)
|
||||
if !ok || tx == nil {
|
||||
// try to get database if present
|
||||
db, ok := ctx.Value(dbKey).(*sqlx.DB)
|
||||
if !ok || db == nil {
|
||||
return nil, fmt.Errorf("not in transaction")
|
||||
}
|
||||
return db, nil
|
||||
}
|
||||
return tx, nil
|
||||
}
|
||||
|
||||
func (db *Database) TxnRepository() models.Repository {
|
||||
return models.Repository{
|
||||
TxnManager: db,
|
||||
Gallery: GalleryReaderWriter,
|
||||
Image: ImageReaderWriter,
|
||||
File: db.File,
|
||||
Folder: db.Folder,
|
||||
Gallery: db.Gallery,
|
||||
Image: db.Image,
|
||||
Movie: MovieReaderWriter,
|
||||
Performer: PerformerReaderWriter,
|
||||
Scene: SceneReaderWriter,
|
||||
Scene: db.Scene,
|
||||
SceneMarker: SceneMarkerReaderWriter,
|
||||
ScrapedItem: ScrapedItemReaderWriter,
|
||||
Studio: StudioReaderWriter,
|
||||
|
||||
Reference in New Issue
Block a user