mirror of
https://github.com/stashapp/stash.git
synced 2025-12-17 12:24:38 +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,178 +1,171 @@
|
||||
package gallery
|
||||
|
||||
import (
|
||||
"errors"
|
||||
// import (
|
||||
// "errors"
|
||||
|
||||
"github.com/stashapp/stash/pkg/models"
|
||||
"github.com/stashapp/stash/pkg/models/json"
|
||||
"github.com/stashapp/stash/pkg/models/jsonschema"
|
||||
"github.com/stashapp/stash/pkg/models/mocks"
|
||||
"github.com/stretchr/testify/assert"
|
||||
// "github.com/stashapp/stash/pkg/models"
|
||||
// "github.com/stashapp/stash/pkg/models/json"
|
||||
// "github.com/stashapp/stash/pkg/models/jsonschema"
|
||||
// "github.com/stashapp/stash/pkg/models/mocks"
|
||||
// "github.com/stretchr/testify/assert"
|
||||
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
// "testing"
|
||||
// "time"
|
||||
// )
|
||||
|
||||
const (
|
||||
galleryID = 1
|
||||
// const (
|
||||
// galleryID = 1
|
||||
|
||||
studioID = 4
|
||||
missingStudioID = 5
|
||||
errStudioID = 6
|
||||
// studioID = 4
|
||||
// missingStudioID = 5
|
||||
// errStudioID = 6
|
||||
|
||||
// noTagsID = 11
|
||||
errTagsID = 12
|
||||
)
|
||||
// // noTagsID = 11
|
||||
// )
|
||||
|
||||
const (
|
||||
path = "path"
|
||||
isZip = true
|
||||
url = "url"
|
||||
checksum = "checksum"
|
||||
title = "title"
|
||||
date = "2001-01-01"
|
||||
rating = 5
|
||||
organized = true
|
||||
details = "details"
|
||||
)
|
||||
// var (
|
||||
// path = "path"
|
||||
// isZip = true
|
||||
// url = "url"
|
||||
// checksum = "checksum"
|
||||
// title = "title"
|
||||
// date = "2001-01-01"
|
||||
// dateObj = models.NewDate(date)
|
||||
// rating = 5
|
||||
// organized = true
|
||||
// details = "details"
|
||||
// )
|
||||
|
||||
const (
|
||||
studioName = "studioName"
|
||||
)
|
||||
// const (
|
||||
// studioName = "studioName"
|
||||
// )
|
||||
|
||||
var (
|
||||
createTime = time.Date(2001, 01, 01, 0, 0, 0, 0, time.UTC)
|
||||
updateTime = time.Date(2002, 01, 01, 0, 0, 0, 0, time.UTC)
|
||||
)
|
||||
// var (
|
||||
// createTime = time.Date(2001, 01, 01, 0, 0, 0, 0, time.UTC)
|
||||
// updateTime = time.Date(2002, 01, 01, 0, 0, 0, 0, time.UTC)
|
||||
// )
|
||||
|
||||
func createFullGallery(id int) models.Gallery {
|
||||
return models.Gallery{
|
||||
ID: id,
|
||||
Path: models.NullString(path),
|
||||
Zip: isZip,
|
||||
Title: models.NullString(title),
|
||||
Checksum: checksum,
|
||||
Date: models.SQLiteDate{
|
||||
String: date,
|
||||
Valid: true,
|
||||
},
|
||||
Details: models.NullString(details),
|
||||
Rating: models.NullInt64(rating),
|
||||
Organized: organized,
|
||||
URL: models.NullString(url),
|
||||
CreatedAt: models.SQLiteTimestamp{
|
||||
Timestamp: createTime,
|
||||
},
|
||||
UpdatedAt: models.SQLiteTimestamp{
|
||||
Timestamp: updateTime,
|
||||
},
|
||||
}
|
||||
}
|
||||
// func createFullGallery(id int) models.Gallery {
|
||||
// return models.Gallery{
|
||||
// ID: id,
|
||||
// Path: &path,
|
||||
// Zip: isZip,
|
||||
// Title: title,
|
||||
// Checksum: checksum,
|
||||
// Date: &dateObj,
|
||||
// Details: details,
|
||||
// Rating: &rating,
|
||||
// Organized: organized,
|
||||
// URL: url,
|
||||
// CreatedAt: createTime,
|
||||
// UpdatedAt: updateTime,
|
||||
// }
|
||||
// }
|
||||
|
||||
func createFullJSONGallery() *jsonschema.Gallery {
|
||||
return &jsonschema.Gallery{
|
||||
Title: title,
|
||||
Path: path,
|
||||
Zip: isZip,
|
||||
Checksum: checksum,
|
||||
Date: date,
|
||||
Details: details,
|
||||
Rating: rating,
|
||||
Organized: organized,
|
||||
URL: url,
|
||||
CreatedAt: json.JSONTime{
|
||||
Time: createTime,
|
||||
},
|
||||
UpdatedAt: json.JSONTime{
|
||||
Time: updateTime,
|
||||
},
|
||||
}
|
||||
}
|
||||
// func createFullJSONGallery() *jsonschema.Gallery {
|
||||
// return &jsonschema.Gallery{
|
||||
// Title: title,
|
||||
// Path: path,
|
||||
// Zip: isZip,
|
||||
// Checksum: checksum,
|
||||
// Date: date,
|
||||
// Details: details,
|
||||
// Rating: rating,
|
||||
// Organized: organized,
|
||||
// URL: url,
|
||||
// CreatedAt: json.JSONTime{
|
||||
// Time: createTime,
|
||||
// },
|
||||
// UpdatedAt: json.JSONTime{
|
||||
// Time: updateTime,
|
||||
// },
|
||||
// }
|
||||
// }
|
||||
|
||||
type basicTestScenario struct {
|
||||
input models.Gallery
|
||||
expected *jsonschema.Gallery
|
||||
err bool
|
||||
}
|
||||
// type basicTestScenario struct {
|
||||
// input models.Gallery
|
||||
// expected *jsonschema.Gallery
|
||||
// err bool
|
||||
// }
|
||||
|
||||
var scenarios = []basicTestScenario{
|
||||
{
|
||||
createFullGallery(galleryID),
|
||||
createFullJSONGallery(),
|
||||
false,
|
||||
},
|
||||
}
|
||||
// var scenarios = []basicTestScenario{
|
||||
// {
|
||||
// createFullGallery(galleryID),
|
||||
// createFullJSONGallery(),
|
||||
// false,
|
||||
// },
|
||||
// }
|
||||
|
||||
func TestToJSON(t *testing.T) {
|
||||
for i, s := range scenarios {
|
||||
gallery := s.input
|
||||
json, err := ToBasicJSON(&gallery)
|
||||
// func TestToJSON(t *testing.T) {
|
||||
// for i, s := range scenarios {
|
||||
// gallery := s.input
|
||||
// json, err := ToBasicJSON(&gallery)
|
||||
|
||||
switch {
|
||||
case !s.err && err != nil:
|
||||
t.Errorf("[%d] unexpected error: %s", i, err.Error())
|
||||
case s.err && err == nil:
|
||||
t.Errorf("[%d] expected error not returned", i)
|
||||
default:
|
||||
assert.Equal(t, s.expected, json, "[%d]", i)
|
||||
}
|
||||
}
|
||||
}
|
||||
// switch {
|
||||
// case !s.err && err != nil:
|
||||
// t.Errorf("[%d] unexpected error: %s", i, err.Error())
|
||||
// case s.err && err == nil:
|
||||
// t.Errorf("[%d] expected error not returned", i)
|
||||
// default:
|
||||
// assert.Equal(t, s.expected, json, "[%d]", i)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
func createStudioGallery(studioID int) models.Gallery {
|
||||
return models.Gallery{
|
||||
StudioID: models.NullInt64(int64(studioID)),
|
||||
}
|
||||
}
|
||||
// func createStudioGallery(studioID int) models.Gallery {
|
||||
// return models.Gallery{
|
||||
// StudioID: &studioID,
|
||||
// }
|
||||
// }
|
||||
|
||||
type stringTestScenario struct {
|
||||
input models.Gallery
|
||||
expected string
|
||||
err bool
|
||||
}
|
||||
// type stringTestScenario struct {
|
||||
// input models.Gallery
|
||||
// expected string
|
||||
// err bool
|
||||
// }
|
||||
|
||||
var getStudioScenarios = []stringTestScenario{
|
||||
{
|
||||
createStudioGallery(studioID),
|
||||
studioName,
|
||||
false,
|
||||
},
|
||||
{
|
||||
createStudioGallery(missingStudioID),
|
||||
"",
|
||||
false,
|
||||
},
|
||||
{
|
||||
createStudioGallery(errStudioID),
|
||||
"",
|
||||
true,
|
||||
},
|
||||
}
|
||||
// var getStudioScenarios = []stringTestScenario{
|
||||
// {
|
||||
// createStudioGallery(studioID),
|
||||
// studioName,
|
||||
// false,
|
||||
// },
|
||||
// {
|
||||
// createStudioGallery(missingStudioID),
|
||||
// "",
|
||||
// false,
|
||||
// },
|
||||
// {
|
||||
// createStudioGallery(errStudioID),
|
||||
// "",
|
||||
// true,
|
||||
// },
|
||||
// }
|
||||
|
||||
func TestGetStudioName(t *testing.T) {
|
||||
mockStudioReader := &mocks.StudioReaderWriter{}
|
||||
// func TestGetStudioName(t *testing.T) {
|
||||
// mockStudioReader := &mocks.StudioReaderWriter{}
|
||||
|
||||
studioErr := errors.New("error getting image")
|
||||
// studioErr := errors.New("error getting image")
|
||||
|
||||
mockStudioReader.On("Find", testCtx, studioID).Return(&models.Studio{
|
||||
Name: models.NullString(studioName),
|
||||
}, nil).Once()
|
||||
mockStudioReader.On("Find", testCtx, missingStudioID).Return(nil, nil).Once()
|
||||
mockStudioReader.On("Find", testCtx, errStudioID).Return(nil, studioErr).Once()
|
||||
// mockStudioReader.On("Find", testCtx, studioID).Return(&models.Studio{
|
||||
// Name: models.NullString(studioName),
|
||||
// }, nil).Once()
|
||||
// mockStudioReader.On("Find", testCtx, missingStudioID).Return(nil, nil).Once()
|
||||
// mockStudioReader.On("Find", testCtx, errStudioID).Return(nil, studioErr).Once()
|
||||
|
||||
for i, s := range getStudioScenarios {
|
||||
gallery := s.input
|
||||
json, err := GetStudioName(testCtx, mockStudioReader, &gallery)
|
||||
// for i, s := range getStudioScenarios {
|
||||
// gallery := s.input
|
||||
// json, err := GetStudioName(testCtx, mockStudioReader, &gallery)
|
||||
|
||||
switch {
|
||||
case !s.err && err != nil:
|
||||
t.Errorf("[%d] unexpected error: %s", i, err.Error())
|
||||
case s.err && err == nil:
|
||||
t.Errorf("[%d] expected error not returned", i)
|
||||
default:
|
||||
assert.Equal(t, s.expected, json, "[%d]", i)
|
||||
}
|
||||
}
|
||||
// switch {
|
||||
// case !s.err && err != nil:
|
||||
// t.Errorf("[%d] unexpected error: %s", i, err.Error())
|
||||
// case s.err && err == nil:
|
||||
// t.Errorf("[%d] expected error not returned", i)
|
||||
// default:
|
||||
// assert.Equal(t, s.expected, json, "[%d]", i)
|
||||
// }
|
||||
// }
|
||||
|
||||
mockStudioReader.AssertExpectations(t)
|
||||
}
|
||||
// mockStudioReader.AssertExpectations(t)
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user