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:
WithoutPants
@@ -1,211 +1,211 @@
|
||||
package scene
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
// import (
|
||||
// "context"
|
||||
// "errors"
|
||||
// "testing"
|
||||
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
"github.com/stashapp/stash/pkg/models/jsonschema"
|
||||
"github.com/stashapp/stash/pkg/models/mocks"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/mock"
|
||||
)
|
||||
// "github.com/stashapp/stash/pkg/models"
|
||||
// "github.com/stashapp/stash/pkg/models/jsonschema"
|
||||
// "github.com/stashapp/stash/pkg/models/mocks"
|
||||
// "github.com/stretchr/testify/assert"
|
||||
// "github.com/stretchr/testify/mock"
|
||||
// )
|
||||
|
||||
const (
|
||||
seconds = "5"
|
||||
secondsFloat = 5.0
|
||||
errSceneID = 999
|
||||
)
|
||||
// const (
|
||||
// seconds = "5"
|
||||
// secondsFloat = 5.0
|
||||
// errSceneID = 999
|
||||
// )
|
||||
|
||||
func TestMarkerImporterName(t *testing.T) {
|
||||
i := MarkerImporter{
|
||||
Input: jsonschema.SceneMarker{
|
||||
Title: title,
|
||||
Seconds: seconds,
|
||||
},
|
||||
}
|
||||
// func TestMarkerImporterName(t *testing.T) {
|
||||
// i := MarkerImporter{
|
||||
// Input: jsonschema.SceneMarker{
|
||||
// Title: title,
|
||||
// Seconds: seconds,
|
||||
// },
|
||||
// }
|
||||
|
||||
assert.Equal(t, title+" (5)", i.Name())
|
||||
}
|
||||
// assert.Equal(t, title+" (5)", i.Name())
|
||||
// }
|
||||
|
||||
func TestMarkerImporterPreImportWithTag(t *testing.T) {
|
||||
tagReaderWriter := &mocks.TagReaderWriter{}
|
||||
ctx := context.Background()
|
||||
// func TestMarkerImporterPreImportWithTag(t *testing.T) {
|
||||
// tagReaderWriter := &mocks.TagReaderWriter{}
|
||||
// ctx := context.Background()
|
||||
|
||||
i := MarkerImporter{
|
||||
TagWriter: tagReaderWriter,
|
||||
MissingRefBehaviour: models.ImportMissingRefEnumFail,
|
||||
Input: jsonschema.SceneMarker{
|
||||
PrimaryTag: existingTagName,
|
||||
},
|
||||
}
|
||||
// i := MarkerImporter{
|
||||
// TagWriter: tagReaderWriter,
|
||||
// MissingRefBehaviour: models.ImportMissingRefEnumFail,
|
||||
// Input: jsonschema.SceneMarker{
|
||||
// PrimaryTag: existingTagName,
|
||||
// },
|
||||
// }
|
||||
|
||||
tagReaderWriter.On("FindByNames", ctx, []string{existingTagName}, false).Return([]*models.Tag{
|
||||
{
|
||||
ID: existingTagID,
|
||||
Name: existingTagName,
|
||||
},
|
||||
}, nil).Times(4)
|
||||
tagReaderWriter.On("FindByNames", ctx, []string{existingTagErr}, false).Return(nil, errors.New("FindByNames error")).Times(2)
|
||||
// tagReaderWriter.On("FindByNames", ctx, []string{existingTagName}, false).Return([]*models.Tag{
|
||||
// {
|
||||
// ID: existingTagID,
|
||||
// Name: existingTagName,
|
||||
// },
|
||||
// }, nil).Times(4)
|
||||
// tagReaderWriter.On("FindByNames", ctx, []string{existingTagErr}, false).Return(nil, errors.New("FindByNames error")).Times(2)
|
||||
|
||||
err := i.PreImport(ctx)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, existingTagID, i.marker.PrimaryTagID)
|
||||
// err := i.PreImport(ctx)
|
||||
// assert.Nil(t, err)
|
||||
// assert.Equal(t, existingTagID, i.marker.PrimaryTagID)
|
||||
|
||||
i.Input.PrimaryTag = existingTagErr
|
||||
err = i.PreImport(ctx)
|
||||
assert.NotNil(t, err)
|
||||
// i.Input.PrimaryTag = existingTagErr
|
||||
// err = i.PreImport(ctx)
|
||||
// assert.NotNil(t, err)
|
||||
|
||||
i.Input.PrimaryTag = existingTagName
|
||||
i.Input.Tags = []string{
|
||||
existingTagName,
|
||||
}
|
||||
err = i.PreImport(ctx)
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, existingTagID, i.tags[0].ID)
|
||||
// i.Input.PrimaryTag = existingTagName
|
||||
// i.Input.Tags = []string{
|
||||
// existingTagName,
|
||||
// }
|
||||
// err = i.PreImport(ctx)
|
||||
// assert.Nil(t, err)
|
||||
// assert.Equal(t, existingTagID, i.tags[0].ID)
|
||||
|
||||
i.Input.Tags[0] = existingTagErr
|
||||
err = i.PreImport(ctx)
|
||||
assert.NotNil(t, err)
|
||||
// i.Input.Tags[0] = existingTagErr
|
||||
// err = i.PreImport(ctx)
|
||||
// assert.NotNil(t, err)
|
||||
|
||||
tagReaderWriter.AssertExpectations(t)
|
||||
}
|
||||
// tagReaderWriter.AssertExpectations(t)
|
||||
// }
|
||||
|
||||
func TestMarkerImporterPostImportUpdateTags(t *testing.T) {
|
||||
sceneMarkerReaderWriter := &mocks.SceneMarkerReaderWriter{}
|
||||
ctx := context.Background()
|
||||
// func TestMarkerImporterPostImportUpdateTags(t *testing.T) {
|
||||
// sceneMarkerReaderWriter := &mocks.SceneMarkerReaderWriter{}
|
||||
// ctx := context.Background()
|
||||
|
||||
i := MarkerImporter{
|
||||
ReaderWriter: sceneMarkerReaderWriter,
|
||||
tags: []*models.Tag{
|
||||
{
|
||||
ID: existingTagID,
|
||||
},
|
||||
},
|
||||
}
|
||||
// i := MarkerImporter{
|
||||
// ReaderWriter: sceneMarkerReaderWriter,
|
||||
// tags: []*models.Tag{
|
||||
// {
|
||||
// ID: existingTagID,
|
||||
// },
|
||||
// },
|
||||
// }
|
||||
|
||||
updateErr := errors.New("UpdateTags error")
|
||||
// updateErr := errors.New("UpdateTags error")
|
||||
|
||||
sceneMarkerReaderWriter.On("UpdateTags", ctx, sceneID, []int{existingTagID}).Return(nil).Once()
|
||||
sceneMarkerReaderWriter.On("UpdateTags", ctx, errTagsID, mock.AnythingOfType("[]int")).Return(updateErr).Once()
|
||||
// sceneMarkerReaderWriter.On("UpdateTags", ctx, sceneID, []int{existingTagID}).Return(nil).Once()
|
||||
// sceneMarkerReaderWriter.On("UpdateTags", ctx, errTagsID, mock.AnythingOfType("[]int")).Return(updateErr).Once()
|
||||
|
||||
err := i.PostImport(ctx, sceneID)
|
||||
assert.Nil(t, err)
|
||||
// err := i.PostImport(ctx, sceneID)
|
||||
// assert.Nil(t, err)
|
||||
|
||||
err = i.PostImport(ctx, errTagsID)
|
||||
assert.NotNil(t, err)
|
||||
// err = i.PostImport(ctx, errTagsID)
|
||||
// assert.NotNil(t, err)
|
||||
|
||||
sceneMarkerReaderWriter.AssertExpectations(t)
|
||||
}
|
||||
// sceneMarkerReaderWriter.AssertExpectations(t)
|
||||
// }
|
||||
|
||||
func TestMarkerImporterFindExistingID(t *testing.T) {
|
||||
readerWriter := &mocks.SceneMarkerReaderWriter{}
|
||||
ctx := context.Background()
|
||||
// func TestMarkerImporterFindExistingID(t *testing.T) {
|
||||
// readerWriter := &mocks.SceneMarkerReaderWriter{}
|
||||
// ctx := context.Background()
|
||||
|
||||
i := MarkerImporter{
|
||||
ReaderWriter: readerWriter,
|
||||
SceneID: sceneID,
|
||||
marker: models.SceneMarker{
|
||||
Seconds: secondsFloat,
|
||||
},
|
||||
}
|
||||
// i := MarkerImporter{
|
||||
// ReaderWriter: readerWriter,
|
||||
// SceneID: sceneID,
|
||||
// marker: models.SceneMarker{
|
||||
// Seconds: secondsFloat,
|
||||
// },
|
||||
// }
|
||||
|
||||
expectedErr := errors.New("FindBy* error")
|
||||
readerWriter.On("FindBySceneID", ctx, sceneID).Return([]*models.SceneMarker{
|
||||
{
|
||||
ID: existingSceneID,
|
||||
Seconds: secondsFloat,
|
||||
},
|
||||
}, nil).Times(2)
|
||||
readerWriter.On("FindBySceneID", ctx, errSceneID).Return(nil, expectedErr).Once()
|
||||
// expectedErr := errors.New("FindBy* error")
|
||||
// readerWriter.On("FindBySceneID", ctx, sceneID).Return([]*models.SceneMarker{
|
||||
// {
|
||||
// ID: existingSceneID,
|
||||
// Seconds: secondsFloat,
|
||||
// },
|
||||
// }, nil).Times(2)
|
||||
// readerWriter.On("FindBySceneID", ctx, errSceneID).Return(nil, expectedErr).Once()
|
||||
|
||||
id, err := i.FindExistingID(ctx)
|
||||
assert.Equal(t, existingSceneID, *id)
|
||||
assert.Nil(t, err)
|
||||
// id, err := i.FindExistingID(ctx)
|
||||
// assert.Equal(t, existingSceneID, *id)
|
||||
// assert.Nil(t, err)
|
||||
|
||||
i.marker.Seconds++
|
||||
id, err = i.FindExistingID(ctx)
|
||||
assert.Nil(t, id)
|
||||
assert.Nil(t, err)
|
||||
// i.marker.Seconds++
|
||||
// id, err = i.FindExistingID(ctx)
|
||||
// assert.Nil(t, id)
|
||||
// assert.Nil(t, err)
|
||||
|
||||
i.SceneID = errSceneID
|
||||
id, err = i.FindExistingID(ctx)
|
||||
assert.Nil(t, id)
|
||||
assert.NotNil(t, err)
|
||||
// i.SceneID = errSceneID
|
||||
// id, err = i.FindExistingID(ctx)
|
||||
// assert.Nil(t, id)
|
||||
// assert.NotNil(t, err)
|
||||
|
||||
readerWriter.AssertExpectations(t)
|
||||
}
|
||||
// readerWriter.AssertExpectations(t)
|
||||
// }
|
||||
|
||||
func TestMarkerImporterCreate(t *testing.T) {
|
||||
readerWriter := &mocks.SceneMarkerReaderWriter{}
|
||||
ctx := context.Background()
|
||||
// func TestMarkerImporterCreate(t *testing.T) {
|
||||
// readerWriter := &mocks.SceneMarkerReaderWriter{}
|
||||
// ctx := context.Background()
|
||||
|
||||
scene := models.SceneMarker{
|
||||
Title: title,
|
||||
}
|
||||
// scene := models.SceneMarker{
|
||||
// Title: title,
|
||||
// }
|
||||
|
||||
sceneErr := models.SceneMarker{
|
||||
Title: sceneNameErr,
|
||||
}
|
||||
// sceneErr := models.SceneMarker{
|
||||
// Title: sceneNameErr,
|
||||
// }
|
||||
|
||||
i := MarkerImporter{
|
||||
ReaderWriter: readerWriter,
|
||||
marker: scene,
|
||||
}
|
||||
// i := MarkerImporter{
|
||||
// ReaderWriter: readerWriter,
|
||||
// marker: scene,
|
||||
// }
|
||||
|
||||
errCreate := errors.New("Create error")
|
||||
readerWriter.On("Create", ctx, scene).Return(&models.SceneMarker{
|
||||
ID: sceneID,
|
||||
}, nil).Once()
|
||||
readerWriter.On("Create", ctx, sceneErr).Return(nil, errCreate).Once()
|
||||
// errCreate := errors.New("Create error")
|
||||
// readerWriter.On("Create", ctx, scene).Return(&models.SceneMarker{
|
||||
// ID: sceneID,
|
||||
// }, nil).Once()
|
||||
// readerWriter.On("Create", ctx, sceneErr).Return(nil, errCreate).Once()
|
||||
|
||||
id, err := i.Create(ctx)
|
||||
assert.Equal(t, sceneID, *id)
|
||||
assert.Nil(t, err)
|
||||
// id, err := i.Create(ctx)
|
||||
// assert.Equal(t, sceneID, *id)
|
||||
// assert.Nil(t, err)
|
||||
|
||||
i.marker = sceneErr
|
||||
id, err = i.Create(ctx)
|
||||
assert.Nil(t, id)
|
||||
assert.NotNil(t, err)
|
||||
// i.marker = sceneErr
|
||||
// id, err = i.Create(ctx)
|
||||
// assert.Nil(t, id)
|
||||
// assert.NotNil(t, err)
|
||||
|
||||
readerWriter.AssertExpectations(t)
|
||||
}
|
||||
// readerWriter.AssertExpectations(t)
|
||||
// }
|
||||
|
||||
func TestMarkerImporterUpdate(t *testing.T) {
|
||||
readerWriter := &mocks.SceneMarkerReaderWriter{}
|
||||
ctx := context.Background()
|
||||
// func TestMarkerImporterUpdate(t *testing.T) {
|
||||
// readerWriter := &mocks.SceneMarkerReaderWriter{}
|
||||
// ctx := context.Background()
|
||||
|
||||
scene := models.SceneMarker{
|
||||
Title: title,
|
||||
}
|
||||
// scene := models.SceneMarker{
|
||||
// Title: title,
|
||||
// }
|
||||
|
||||
sceneErr := models.SceneMarker{
|
||||
Title: sceneNameErr,
|
||||
}
|
||||
// sceneErr := models.SceneMarker{
|
||||
// Title: sceneNameErr,
|
||||
// }
|
||||
|
||||
i := MarkerImporter{
|
||||
ReaderWriter: readerWriter,
|
||||
marker: scene,
|
||||
}
|
||||
// i := MarkerImporter{
|
||||
// ReaderWriter: readerWriter,
|
||||
// marker: scene,
|
||||
// }
|
||||
|
||||
errUpdate := errors.New("Update error")
|
||||
// errUpdate := errors.New("Update error")
|
||||
|
||||
// id needs to be set for the mock input
|
||||
scene.ID = sceneID
|
||||
readerWriter.On("Update", ctx, scene).Return(nil, nil).Once()
|
||||
// // id needs to be set for the mock input
|
||||
// scene.ID = sceneID
|
||||
// readerWriter.On("Update", ctx, scene).Return(nil, nil).Once()
|
||||
|
||||
err := i.Update(ctx, sceneID)
|
||||
assert.Nil(t, err)
|
||||
// err := i.Update(ctx, sceneID)
|
||||
// assert.Nil(t, err)
|
||||
|
||||
i.marker = sceneErr
|
||||
// i.marker = sceneErr
|
||||
|
||||
// need to set id separately
|
||||
sceneErr.ID = errImageID
|
||||
readerWriter.On("Update", ctx, sceneErr).Return(nil, errUpdate).Once()
|
||||
// // need to set id separately
|
||||
// sceneErr.ID = errImageID
|
||||
// readerWriter.On("Update", ctx, sceneErr).Return(nil, errUpdate).Once()
|
||||
|
||||
err = i.Update(ctx, errImageID)
|
||||
assert.NotNil(t, err)
|
||||
// err = i.Update(ctx, errImageID)
|
||||
// assert.NotNil(t, err)
|
||||
|
||||
readerWriter.AssertExpectations(t)
|
||||
}
|
||||
// readerWriter.AssertExpectations(t)
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user