update

photoview · Jan 23, 2023 · 597c373 · 597c373
1 parent c96f210
commit 597c373
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/api/scanner/exif/exif.go b/api/scanner/exif/exif.go
@@ -40,7 +40,7 @@ func SaveEXIF(tx *gorm.DB, media *models.Media) (*models.MediaEXIF, error) {
 				return nil, errors.Wrap(err, "get EXIF for media from database")
 			}
 
-			return &exif, nil
+			tx.Delete(&exif)
 		}
 	}
 

diff --git a/api/scanner/scanner_tasks/exif_task.go b/api/scanner/scanner_tasks/exif_task.go
@@ -14,10 +14,6 @@ type ExifTask struct {
 
 func (t ExifTask) AfterMediaFound(ctx scanner_task.TaskContext, media *models.Media, newMedia bool) error {
 
-	if !newMedia {
-		return nil
-	}
-
 	_, err := exif.SaveEXIF(ctx.GetDB(), media)
 	if err != nil {
 		log.Printf("WARN: SaveEXIF for %s failed: %s\n", media.Title, err)

diff --git a/api/scanner/watcher_scanner/watcher_scanner.go b/api/scanner/watcher_scanner/watcher_scanner.go
@@ -100,7 +100,9 @@ func (ws watcherScanner) processWatchEvents() {
 				if err != nil {
 					log.Println("delete media from cache", err)
 				}
-				ws.db.Select(clause.Associations).Delete(&media)
+				if media != nil && media.ID != 0 {
+					ws.db.Select(clause.Associations).Delete(&media)
+				}
 				log.Println("remove event ", event.Name, event.Op)
 			} else if event.Has(fsnotify.Rename) {
 				log.Println("rename event ", event.Name, event.Op)