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

Model refactor, part 2 (#4092)

Browse Source 
* Move conversions into changesetTranslator
* Improve mutation error messages
* Use models.New and models.NewPartial everywhere
* Replace getStashIDsFor functions
* Remove ImageCreateInput
* Remove unused parameters
* Refactor matching functions
---------
Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
DingDongSoLong4
2023-09-11 04:24:15 +02:00
committed by GitHub
parent cf3301c8bc
commit 24e4719abc
61 changed files with 1514 additions and 1407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/image/import.go
View File

@@ -148,11 +148,10 @@ func (i *Importer) populateStudio(ctx context.Context) error {
}
func (i *Importer) createStudio(ctx context.Context, name string) (int, error) {
newStudio := &models.Studio{
Name: name,
}
newStudio := models.NewStudio()
newStudio.Name = name
err := i.StudioWriter.Create(ctx, newStudio)
err := i.StudioWriter.Create(ctx, &newStudio)
if err != nil {
return 0, err
}
@@ -261,7 +260,8 @@ func (i *Importer) populatePerformers(ctx context.Context) error {
func (i *Importer) createPerformers(ctx context.Context, names []string) ([]*models.Performer, error) {
var ret []*models.Performer
for _, name := range names {
newPerformer := *models.NewPerformer(name)
newPerformer := models.NewPerformer()
newPerformer.Name = name
err := i.PerformerWriter.Create(ctx, &newPerformer)
if err != nil {
@@ -331,10 +331,7 @@ func (i *Importer) Create(ctx context.Context) (*int, error) {
fileIDs = append(fileIDs, f.Base().ID)
}
err := i.ReaderWriter.Create(ctx, &models.ImageCreateInput{
Image: &i.image,
FileIDs: fileIDs,
})
err := i.ReaderWriter.Create(ctx, &i.image, fileIDs)
if err != nil {
return nil, fmt.Errorf("error creating image: %v", err)
}
@@ -394,14 +391,15 @@ func importTags(ctx context.Context, tagWriter models.TagFinderCreator, names []
func createTags(ctx context.Context, tagWriter models.TagCreator, names []string) ([]*models.Tag, error) {
var ret []*models.Tag
for _, name := range names {
newTag := models.NewTag(name)
newTag := models.NewTag()
newTag.Name = name
err := tagWriter.Create(ctx, newTag)
err := tagWriter.Create(ctx, &newTag)
if err != nil {
return nil, err
}
ret = append(ret, newTag)
ret = append(ret, &newTag)
}
return ret, nil