mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 04:44: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:
@@ -8,37 +8,17 @@ import (
|
||||
)
|
||||
|
||||
type PartialUpdater interface {
|
||||
Update(ctx context.Context, updatedImage models.ImagePartial) (*models.Image, error)
|
||||
UpdatePartial(ctx context.Context, id int, partial models.ImagePartial) (*models.Image, error)
|
||||
}
|
||||
|
||||
type PerformerUpdater interface {
|
||||
GetPerformerIDs(ctx context.Context, imageID int) ([]int, error)
|
||||
UpdatePerformers(ctx context.Context, imageID int, performerIDs []int) error
|
||||
}
|
||||
|
||||
type TagUpdater interface {
|
||||
GetTagIDs(ctx context.Context, imageID int) ([]int, error)
|
||||
UpdateTags(ctx context.Context, imageID int, tagIDs []int) error
|
||||
}
|
||||
|
||||
func UpdateFileModTime(ctx context.Context, qb PartialUpdater, id int, modTime models.NullSQLiteTimestamp) (*models.Image, error) {
|
||||
return qb.Update(ctx, models.ImagePartial{
|
||||
ID: id,
|
||||
FileModTime: &modTime,
|
||||
})
|
||||
}
|
||||
|
||||
func AddPerformer(ctx context.Context, qb PerformerUpdater, id int, performerID int) (bool, error) {
|
||||
performerIDs, err := qb.GetPerformerIDs(ctx, id)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
oldLen := len(performerIDs)
|
||||
performerIDs = intslice.IntAppendUnique(performerIDs, performerID)
|
||||
|
||||
if len(performerIDs) != oldLen {
|
||||
if err := qb.UpdatePerformers(ctx, id, performerIDs); err != nil {
|
||||
func AddPerformer(ctx context.Context, qb PartialUpdater, i *models.Image, performerID int) (bool, error) {
|
||||
if !intslice.IntInclude(i.PerformerIDs, performerID) {
|
||||
if _, err := qb.UpdatePartial(ctx, i.ID, models.ImagePartial{
|
||||
PerformerIDs: &models.UpdateIDs{
|
||||
IDs: []int{performerID},
|
||||
Mode: models.RelationshipUpdateModeAdd,
|
||||
},
|
||||
}); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
@@ -48,17 +28,14 @@ func AddPerformer(ctx context.Context, qb PerformerUpdater, id int, performerID
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func AddTag(ctx context.Context, qb TagUpdater, id int, tagID int) (bool, error) {
|
||||
tagIDs, err := qb.GetTagIDs(ctx, id)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
oldLen := len(tagIDs)
|
||||
tagIDs = intslice.IntAppendUnique(tagIDs, tagID)
|
||||
|
||||
if len(tagIDs) != oldLen {
|
||||
if err := qb.UpdateTags(ctx, id, tagIDs); err != nil {
|
||||
func AddTag(ctx context.Context, qb PartialUpdater, i *models.Image, tagID int) (bool, error) {
|
||||
if !intslice.IntInclude(i.TagIDs, tagID) {
|
||||
if _, err := qb.UpdatePartial(ctx, i.ID, models.ImagePartial{
|
||||
TagIDs: &models.UpdateIDs{
|
||||
IDs: []int{tagID},
|
||||
Mode: models.RelationshipUpdateModeAdd,
|
||||
},
|
||||
}); err != nil {
|
||||
return false, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user