Skip to content

Commit

Permalink
Fix scene file name parser update (#998)
Browse files Browse the repository at this point in the history
* Fix conversion of input maps
* Only set changed scene values in parser update
  • Loading branch information
WithoutPants authored Dec 23, 2020
1 parent e84c923 commit c8bcaaf
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
9 changes: 8 additions & 1 deletion pkg/api/changeset_translator.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,14 @@ func getUpdateInputMaps(ctx context.Context) []map[string]interface{} {
input, _ := args[updateInputField]
var ret []map[string]interface{}
if input != nil {
ret, _ = input.([]map[string]interface{})
// convert []interface{} into []map[string]interface{}
iSlice, _ := input.([]interface{})
for _, i := range iSlice {
m, _ := i.(map[string]interface{})
if m != nil {
ret = append(ret, m)
}
}
}

return ret
Expand Down
19 changes: 6 additions & 13 deletions ui/v2.5/src/components/SceneFilenameParser/SceneParserRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,12 @@ export class SceneParserResult {
public toSceneUpdateInput() {
return {
id: this.id,
details: this.scene.details,
url: this.scene.url,
rating: this.rating.isSet ? this.rating.value : this.scene.rating,
gallery_id: this.scene.gallery?.id,
title: this.title.isSet ? this.title.value : this.scene.title,
date: this.date.isSet ? this.date.value : this.scene.date,
studio_id: this.studio.isSet ? this.studio.value : this.scene.studio?.id,
performer_ids: this.performers.isSet
? this.performers.value
: this.scene.performers.map((performer) => performer.id),
tag_ids: this.tags.isSet
? this.tags.value
: this.scene.tags.map((tag) => tag.id),
rating: this.rating.isSet ? this.rating.value : undefined,
title: this.title.isSet ? this.title.value : undefined,
date: this.date.isSet ? this.date.value : undefined,
studio_id: this.studio.isSet ? this.studio.value : undefined,
performer_ids: this.performers.isSet ? this.performers.value : undefined,
tag_ids: this.tags.isSet ? this.tags.value : undefined,
};
}
}
Expand Down

0 comments on commit c8bcaaf

Please sign in to comment.