From 505ea8ea9afdd9e394e6b0e1c54dd1089b7deaa0 Mon Sep 17 00:00:00 2001 From: Stash Dev Date: Mon, 11 Feb 2019 06:41:59 -0800 Subject: [PATCH] Fixed nil pointers in export task --- manager/task_export.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/manager/task_export.go b/manager/task_export.go index da4f5a84f..6e1bc5236 100644 --- a/manager/task_export.go +++ b/manager/task_export.go @@ -162,9 +162,8 @@ func (t *ExportTask) ExportScenes(ctx context.Context) { sceneJSON, err := instance.JSON.getScene(scene.Checksum) if err != nil { - logger.Errorf("[scenes] error reading scene json: %s", err.Error()) - } - if jsonschema.CompareJSON(*sceneJSON, newSceneJSON) { + logger.Debugf("[scenes] error reading scene json: %s", err.Error()) + } else if jsonschema.CompareJSON(*sceneJSON, newSceneJSON) { continue } @@ -264,9 +263,8 @@ func (t *ExportTask) ExportPerformers(ctx context.Context) { performerJSON, err := instance.JSON.getPerformer(performer.Checksum) if err != nil { - logger.Errorf("[performers] error reading performer json: %s", err.Error()) - } - if jsonschema.CompareJSON(*performerJSON, newPerformerJSON) { + logger.Debugf("[performers] error reading performer json: %s", err.Error()) + } else if jsonschema.CompareJSON(*performerJSON, newPerformerJSON) { continue } @@ -306,9 +304,8 @@ func (t *ExportTask) ExportStudios(ctx context.Context) { studioJSON, err := instance.JSON.getStudio(studio.Checksum) if err != nil { - logger.Errorf("[studios] error reading studio json: %s", err.Error()) - } - if jsonschema.CompareJSON(*studioJSON, newStudioJSON) { + logger.Debugf("[studios] error reading studio json: %s", err.Error()) + } else if jsonschema.CompareJSON(*studioJSON, newStudioJSON) { continue } @@ -392,7 +389,7 @@ func (t *ExportTask) ExportScrapedItems(ctx context.Context) { scrapedJSON, err := instance.JSON.getScraped() if err != nil { - logger.Errorf("[scraped sites] error reading json: %s", err.Error()) + logger.Debugf("[scraped sites] error reading json: %s", err.Error()) } if !jsonschema.CompareJSON(scrapedJSON, t.Scraped) { if err := instance.JSON.saveScaped(t.Scraped); err != nil {