refactor: Aggregate directory at the end

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Oct 23, 2022 · fc2713e · fc2713e
1 parent 9833c98
commit fc2713e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/pkg/crud/crud.go b/pkg/crud/crud.go
@@ -159,6 +159,8 @@ func (a App) start(ctx context.Context) {
 
 	done := ctx.Done()
 
+	var directories []absto.Item
+
 	err := a.storageApp.Walk(ctx, "", func(item absto.Item) error {
 		select {
 		case <-done:
@@ -167,12 +169,21 @@ func (a App) start(ctx context.Context) {
 		}
 
 		item = a.sanitizeName(ctx, item)
-		a.notify(ctx, provider.NewStartEvent(item))
+
+		if item.IsDir {
+			directories = append(directories, item)
+		} else {
+			a.notify(ctx, provider.NewStartEvent(item))
+		}
 
 		return nil
 	})
 	if err != nil {
-		logger.Error("%s", err)
+		logger.Error("start: %s", err)
+	}
+
+	for _, directory := range directories {
+		a.notify(ctx, provider.NewStartEvent(directory))
 	}
 }
 

diff --git a/pkg/crud/regenerate.go b/pkg/crud/regenerate.go
@@ -36,12 +36,23 @@ func (a App) regenerate(w http.ResponseWriter, r *http.Request, request provider
 	}
 
 	go func(ctx context.Context) {
+		var directories []absto.Item
+
 		err := a.storageApp.Walk(ctx, pathname, func(item absto.Item) error {
-			a.notify(ctx, provider.NewRestartEvent(item, subset))
+			if item.IsDir {
+				directories = append(directories, item)
+			} else {
+				a.notify(ctx, provider.NewRestartEvent(item, subset))
+			}
+
 			return nil
 		})
 		if err != nil {
-			logger.Error("error during regenerate of `%s`: %s", pathname, err)
+			logger.Error("regenerate of `%s`: %s", pathname, err)
+		}
+
+		for _, directory := range directories {
+			a.notify(ctx, provider.NewStartEvent(directory))
 		}
 	}(tracer.CopyToBackground(ctx))
 

diff --git a/pkg/exif/event.go b/pkg/exif/event.go
@@ -87,7 +87,7 @@ func (a App) handleStartEvent(ctx context.Context, event provider.Event) error {
 		return nil
 	}
 
-	return a.handleUploadEvent(ctx, item, !forced)
+	return a.handleUploadEvent(ctx, item, false)
 }
 
 func (a App) handleUploadEvent(ctx context.Context, item absto.Item, aggregate bool) error {