feat(exif): Using more cache from exif

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Aug 28, 2022 · ea74433 · ea74433
1 parent 22facdc
commit ea74433
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/pkg/exif/aggregate.go b/pkg/exif/aggregate.go
@@ -96,7 +96,7 @@ func (a App) computeAndSaveAggregate(ctx context.Context, dir absto.Item) error
 			return nil
 		}
 
-		exifData, err := a.loadExif(ctx, item)
+		exifData, err := a.GetExifFor(ctx, item)
 		if err != nil {
 			if absto.IsNotExist(err) {
 				return nil

diff --git a/pkg/exif/amqp.go b/pkg/exif/amqp.go
@@ -27,7 +27,7 @@ func (a App) AMQPHandler(ctx context.Context, message amqp.Delivery) error {
 		return nil
 	}
 
-	exif, err := a.loadExif(ctx, resp.Item)
+	exif, err := a.GetExifFor(ctx, resp.Item)
 	if err != nil && !absto.IsNotExist(err) {
 		logger.WithField("item", resp.Item.Pathname).Error("load exif: %s", err)
 	}

diff --git a/pkg/exif/exif.go b/pkg/exif/exif.go
@@ -121,7 +121,7 @@ func (a App) extractAndSaveExif(ctx context.Context, item absto.Item) (exif exas
 		return
 	}
 
-	previousExif, err := a.loadExif(ctx, item)
+	previousExif, err := a.GetExifFor(ctx, item)
 	if err != nil && !absto.IsNotExist(err) {
 		logger.WithField("item", item.Pathname).Error("load exif: %s", err)
 	}

diff --git a/pkg/exif/util.go b/pkg/exif/util.go
@@ -24,11 +24,11 @@ func Path(item absto.Item) string {
 
 func (a App) hasMetadata(ctx context.Context, item absto.Item) bool {
 	if item.IsDir {
-		_, err := a.storageApp.Info(ctx, Path(item))
+		_, err := a.GetAggregateFor(ctx, item)
 		return err == nil
 	}
 
-	data, err := a.loadExif(ctx, item)
+	data, err := a.GetExifFor(ctx, item)
 	if err != nil {
 		return false
 	}