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

File storage rewrite (#2676)

Browse Source 
* 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
2022-07-13 16:30:54 +10:00
parent 30877c75fb
commit 5495d72849
359 changed files with 43690 additions and 16000 deletions
Download Patch File Download Diff File Expand all files Collapse all files

156
internal/identify/scene_test.go
View File

@@ -16,7 +16,7 @@ import (
func Test_sceneRelationships_studio(t *testing.T) {
validStoredID := "1"
var validStoredIDInt int64 = 1
var validStoredIDInt = 1
invalidStoredID := "invalidStoredID"
createMissing := true
@@ -39,7 +39,7 @@ func Test_sceneRelationships_studio(t *testing.T) {
scene *models.Scene
fieldOptions *FieldOptions
result *models.ScrapedStudio
want *int64
want *int
wantErr bool
}{
{
@@ -75,7 +75,7 @@ func Test_sceneRelationships_studio(t *testing.T) {
{
"same stored id",
&models.Scene{
StudioID: models.NullInt64(validStoredIDInt),
StudioID: &validStoredIDInt,
},
defaultOptions,
&models.ScrapedStudio{
@@ -156,19 +156,25 @@ func Test_sceneRelationships_performers(t *testing.T) {
Strategy: FieldStrategyMerge,
}
mockSceneReaderWriter := &mocks.SceneReaderWriter{}
mockSceneReaderWriter.On("GetPerformerIDs", testCtx, sceneID).Return(nil, nil)
mockSceneReaderWriter.On("GetPerformerIDs", testCtx, sceneWithPerformerID).Return([]int{existingPerformerID}, nil)
mockSceneReaderWriter.On("GetPerformerIDs", testCtx, errSceneID).Return(nil, errors.New("error getting IDs"))
emptyScene := &models.Scene{
ID: sceneID,
}
sceneWithPerformer := &models.Scene{
ID: sceneWithPerformerID,
PerformerIDs: []int{
existingPerformerID,
},
}
tr := sceneRelationships{
sceneReader: mockSceneReaderWriter,
sceneReader: &mocks.SceneReaderWriter{},
fieldOptions: make(map[string]*FieldOptions),
}
tests := []struct {
name string
sceneID int
sceneID *models.Scene
fieldOptions *FieldOptions
scraped []*models.ScrapedPerformer
ignoreMale bool
@@ -177,7 +183,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
}{
{
"ignore",
sceneID,
emptyScene,
&FieldOptions{
Strategy: FieldStrategyIgnore,
},
@@ -192,27 +198,16 @@ func Test_sceneRelationships_performers(t *testing.T) {
},
{
"none",
sceneID,
emptyScene,
defaultOptions,
[]*models.ScrapedPerformer{},
false,
nil,
false,
},
{
"error getting ids",
errSceneID,
defaultOptions,
[]*models.ScrapedPerformer{
{},
},
false,
nil,
true,
},
{
"merge existing",
sceneWithPerformerID,
sceneWithPerformer,
defaultOptions,
[]*models.ScrapedPerformer{
{
@@ -226,7 +221,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
},
{
"merge add",
sceneWithPerformerID,
sceneWithPerformer,
defaultOptions,
[]*models.ScrapedPerformer{
{
@@ -240,7 +235,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
},
{
"ignore male",
sceneID,
emptyScene,
defaultOptions,
[]*models.ScrapedPerformer{
{
@@ -255,7 +250,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
},
{
"overwrite",
sceneWithPerformerID,
sceneWithPerformer,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
},
@@ -271,7 +266,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
},
{
"ignore male (not male)",
sceneWithPerformerID,
sceneWithPerformer,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
},
@@ -288,7 +283,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
},
{
"error getting tag ID",
sceneID,
emptyScene,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
CreateMissing: &createMissing,
@@ -306,9 +301,7 @@ func Test_sceneRelationships_performers(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tr.scene = &models.Scene{
ID: tt.sceneID,
}
tr.scene = tt.sceneID
tr.fieldOptions["performers"] = tt.fieldOptions
tr.result = &scrapeResult{
result: &scraper.ScrapedScene{
@@ -347,11 +340,19 @@ func Test_sceneRelationships_tags(t *testing.T) {
Strategy: FieldStrategyMerge,
}
emptyScene := &models.Scene{
ID: sceneID,
}
sceneWithTag := &models.Scene{
ID: sceneWithTagID,
TagIDs: []int{
existingID,
},
}
mockSceneReaderWriter := &mocks.SceneReaderWriter{}
mockTagReaderWriter := &mocks.TagReaderWriter{}
mockSceneReaderWriter.On("GetTagIDs", testCtx, sceneID).Return(nil, nil)
mockSceneReaderWriter.On("GetTagIDs", testCtx, sceneWithTagID).Return([]int{existingID}, nil)
mockSceneReaderWriter.On("GetTagIDs", testCtx, errSceneID).Return(nil, errors.New("error getting IDs"))
mockTagReaderWriter.On("Create", testCtx, mock.MatchedBy(func(p models.Tag) bool {
return p.Name == validName
@@ -370,7 +371,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
tests := []struct {
name string
sceneID int
scene *models.Scene
fieldOptions *FieldOptions
scraped []*models.ScrapedTag
want []int
@@ -378,7 +379,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
}{
{
"ignore",
sceneID,
emptyScene,
&FieldOptions{
Strategy: FieldStrategyIgnore,
},
@@ -392,25 +393,15 @@ func Test_sceneRelationships_tags(t *testing.T) {
},
{
"none",
sceneID,
emptyScene,
defaultOptions,
[]*models.ScrapedTag{},
nil,
false,
},
{
"error getting ids",
errSceneID,
defaultOptions,
[]*models.ScrapedTag{
{},
},
nil,
true,
},
{
"merge existing",
sceneWithTagID,
sceneWithTag,
defaultOptions,
[]*models.ScrapedTag{
{
@@ -423,7 +414,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
},
{
"merge add",
sceneWithTagID,
sceneWithTag,
defaultOptions,
[]*models.ScrapedTag{
{
@@ -436,7 +427,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
},
{
"overwrite",
sceneWithTagID,
sceneWithTag,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
},
@@ -451,7 +442,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
},
{
"error getting tag ID",
sceneID,
emptyScene,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
},
@@ -466,7 +457,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
},
{
"create missing",
sceneID,
emptyScene,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
CreateMissing: &createMissing,
@@ -481,7 +472,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
},
{
"error creating",
sceneID,
emptyScene,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
CreateMissing: &createMissing,
@@ -497,9 +488,7 @@ func Test_sceneRelationships_tags(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tr.scene = &models.Scene{
ID: tt.sceneID,
}
tr.scene = tt.scene
tr.fieldOptions["tags"] = tt.fieldOptions
tr.result = &scrapeResult{
result: &scraper.ScrapedScene{
@@ -536,15 +525,21 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
Strategy: FieldStrategyMerge,
}
mockSceneReaderWriter := &mocks.SceneReaderWriter{}
mockSceneReaderWriter.On("GetStashIDs", testCtx, sceneID).Return(nil, nil)
mockSceneReaderWriter.On("GetStashIDs", testCtx, sceneWithStashID).Return([]*models.StashID{
{
StashID: remoteSiteID,
Endpoint: existingEndpoint,
emptyScene := &models.Scene{
ID: sceneID,
}
sceneWithStashIDs := &models.Scene{
ID: sceneWithStashID,
StashIDs: []models.StashID{
{
StashID: remoteSiteID,
Endpoint: existingEndpoint,
},
},
}, nil)
mockSceneReaderWriter.On("GetStashIDs", testCtx, errSceneID).Return(nil, errors.New("error getting IDs"))
}
mockSceneReaderWriter := &mocks.SceneReaderWriter{}
tr := sceneRelationships{
sceneReader: mockSceneReaderWriter,
@@ -553,7 +548,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
tests := []struct {
name string
sceneID int
scene *models.Scene
fieldOptions *FieldOptions
endpoint string
remoteSiteID *string
@@ -562,7 +557,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
}{
{
"ignore",
sceneID,
emptyScene,
&FieldOptions{
Strategy: FieldStrategyIgnore,
},
@@ -573,7 +568,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
},
{
"no endpoint",
sceneID,
emptyScene,
defaultOptions,
"",
&remoteSiteID,
@@ -582,25 +577,16 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
},
{
"no site id",
sceneID,
emptyScene,
defaultOptions,
newEndpoint,
nil,
nil,
false,
},
{
"error getting ids",
errSceneID,
defaultOptions,
newEndpoint,
&remoteSiteID,
nil,
true,
},
{
"merge existing",
sceneWithStashID,
sceneWithStashIDs,
defaultOptions,
existingEndpoint,
&remoteSiteID,
@@ -609,7 +595,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
},
{
"merge existing new value",
sceneWithStashID,
sceneWithStashIDs,
defaultOptions,
existingEndpoint,
&newRemoteSiteID,
@@ -623,7 +609,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
},
{
"merge add",
sceneWithStashID,
sceneWithStashIDs,
defaultOptions,
newEndpoint,
&newRemoteSiteID,
@@ -641,7 +627,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
},
{
"overwrite",
sceneWithStashID,
sceneWithStashIDs,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
},
@@ -657,7 +643,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
},
{
"overwrite same",
sceneWithStashID,
sceneWithStashIDs,
&FieldOptions{
Strategy: FieldStrategyOverwrite,
},
@@ -669,9 +655,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
tr.scene = &models.Scene{
ID: tt.sceneID,
}
tr.scene = tt.scene
tr.fieldOptions["stash_ids"] = tt.fieldOptions
tr.result = &scrapeResult{
source: ScraperSource{
@@ -688,7 +672,7 @@ func Test_sceneRelationships_stashIDs(t *testing.T) {
return
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("sceneRelationships.stashIDs() = %v, want %v", got, tt.want)
t.Errorf("sceneRelationships.stashIDs() = %+v, want %+v", got, tt.want)
}
})
}