Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 12:24:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add nil checks in identify (#3905)

Browse Source
This commit is contained in:
WithoutPants
2023-07-12 10:53:46 +10:00
committed by GitHub
parent c1352f9048
commit 3e810cf8b1
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/identify/identify.go
View File

@@ -180,13 +180,10 @@ func (t *SceneIdentifier) getSceneUpdater(ctx context.Context, s *models.Scene,
scene: s, scene: s,
result: result, result: result,
fieldOptions: fieldOptions, fieldOptions: fieldOptions,
skipSingleNamePerformers: *options.SkipSingleNamePerformers, skipSingleNamePerformers: utils.IsTrue(options.SkipSingleNamePerformers),
} }
setOrganized := false setOrganized := utils.IsTrue(options.SetOrganized)
if options.SetOrganized != nil {
setOrganized = *options.SetOrganized
}
ret.Partial = getScenePartial(s, scraped, fieldOptions, setOrganized) ret.Partial = getScenePartial(s, scraped, fieldOptions, setOrganized)
studioID, err := rel.studio(ctx) studioID, err := rel.studio(ctx)
@@ -223,7 +220,7 @@ func (t *SceneIdentifier) getSceneUpdater(ctx context.Context, s *models.Scene,
if err != nil { if err != nil {
return nil, err return nil, err
} }
if addSkipSingleNamePerformerTag { if addSkipSingleNamePerformerTag && options.SkipSingleNamePerformerTag != nil {
tagID, err := strconv.ParseInt(*options.SkipSingleNamePerformerTag, 10, 64) tagID, err := strconv.ParseInt(*options.SkipSingleNamePerformerTag, 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("error converting tag ID %s: %w", *options.SkipSingleNamePerformerTag, err) return nil, fmt.Errorf("error converting tag ID %s: %w", *options.SkipSingleNamePerformerTag, err)
@@ -249,7 +246,7 @@ func (t *SceneIdentifier) getSceneUpdater(ctx context.Context, s *models.Scene,
} }
} }
if options.SetCoverImage != nil && *options.SetCoverImage { if utils.IsTrue(options.SetCoverImage) {
ret.CoverImage, err = rel.cover(ctx) ret.CoverImage, err = rel.cover(ctx)
if err != nil { if err != nil {
return nil, err return nil, err