Galleries regenerate on scan

exl3m · Nov 13, 2021 · c5d4829 · c5d4829
1 parent 0d76fed
commit c5d4829
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/pkg/image/scan.go b/pkg/image/scan.go
@@ -101,6 +101,8 @@ func (scanner *Scanner) ScanExisting(existing file.FileBased, file file.SourceFi
 		}
 
 		scanner.PluginCache.ExecutePostHooks(scanner.Ctx, retImage.ID, plugin.ImageUpdatePost, nil, nil)
+	} else {
+		retImage = i
 	}
 
 	return

diff --git a/pkg/manager/task_scan_image.go b/pkg/manager/task_scan_image.go
@@ -52,33 +52,33 @@ func (t *ScanTask) scanImage() {
 			logger.Error(err.Error())
 			return
 		}
+	}
+
+	if i != nil {
+		if t.zipGallery != nil {
+			// associate with gallery
+			if err := t.TxnManager.WithTxn(context.TODO(), func(r models.Repository) error {
+				return gallery.AddImage(r.Gallery(), t.zipGallery.ID, i.ID)
+			}); err != nil {
+				logger.Error(err.Error())
+				return
+			}
+		} else if config.GetInstance().GetCreateGalleriesFromFolders() {
+			// create gallery from folder or associate with existing gallery
+			logger.Infof("Associating image %s with folder gallery", i.Path)
+			var galleryID int
+			var isNewGallery bool
+			if err := t.TxnManager.WithTxn(context.TODO(), func(r models.Repository) error {
+				var err error
+				galleryID, isNewGallery, err = t.associateImageWithFolderGallery(i.ID, r.Gallery())
+				return err
+			}); err != nil {
+				logger.Error(err.Error())
+				return
+			}
 
-		if i != nil {
-			if t.zipGallery != nil {
-				// associate with gallery
-				if err := t.TxnManager.WithTxn(context.TODO(), func(r models.Repository) error {
-					return gallery.AddImage(r.Gallery(), t.zipGallery.ID, i.ID)
-				}); err != nil {
-					logger.Error(err.Error())
-					return
-				}
-			} else if config.GetInstance().GetCreateGalleriesFromFolders() {
-				// create gallery from folder or associate with existing gallery
-				logger.Infof("Associating image %s with folder gallery", i.Path)
-				var galleryID int
-				var isNewGallery bool
-				if err := t.TxnManager.WithTxn(context.TODO(), func(r models.Repository) error {
-					var err error
-					galleryID, isNewGallery, err = t.associateImageWithFolderGallery(i.ID, r.Gallery())
-					return err
-				}); err != nil {
-					logger.Error(err.Error())
-					return
-				}
-
-				if isNewGallery {
-					GetInstance().PluginCache.ExecutePostHooks(t.ctx, galleryID, plugin.GalleryCreatePost, nil, nil)
-				}
+			if isNewGallery {
+				GetInstance().PluginCache.ExecutePostHooks(t.ctx, galleryID, plugin.GalleryCreatePost, nil, nil)
 			}
 		}
 	}