mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 04:44:37 +03:00
Model refactor, part 2 (#4092)
* 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:
@@ -169,11 +169,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
|
||||
}
|
||||
@@ -279,7 +278,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 {
|
||||
@@ -338,9 +338,10 @@ func (i *Importer) populateMovies(ctx context.Context) error {
|
||||
}
|
||||
|
||||
func (i *Importer) createMovie(ctx context.Context, name string) (int, error) {
|
||||
newMovie := models.NewMovie(name)
|
||||
newMovie := models.NewMovie()
|
||||
newMovie.Name = name
|
||||
|
||||
err := i.MovieWriter.Create(ctx, newMovie)
|
||||
err := i.MovieWriter.Create(ctx, &newMovie)
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
@@ -468,14 +469,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
|
||||
|
||||
Reference in New Issue
Block a user