refactor(exif): Renaming exif to metadata and adding tag value

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Dec 30, 2022 · b881866 · b881866
1 parent 436eb05
commit b881866
Show file tree

Hide file tree

Showing 16 changed files with 238 additions and 221 deletions.
diff --git a/pkg/crud/crud.go b/pkg/crud/crud.go
@@ -11,7 +11,6 @@ import (
 
 	absto "github.com/ViBiOh/absto/pkg/model"
 	"github.com/ViBiOh/fibr/pkg/exclusive"
-	"github.com/ViBiOh/fibr/pkg/exif"
 	"github.com/ViBiOh/fibr/pkg/provider"
 	"github.com/ViBiOh/fibr/pkg/search"
 	"github.com/ViBiOh/fibr/pkg/thumbnail"
@@ -35,7 +34,7 @@ type App struct {
 	storageApp      absto.Storage
 	shareApp        provider.ShareManager
 	webhookApp      provider.WebhookManager
-	exifApp         provider.ExifManager
+	exifApp         provider.MetadataManager
 	searchApp       search.App
 	pushEvent       provider.EventProducer
 	exclusiveApp    exclusive.App
@@ -64,7 +63,7 @@ func Flags(fs *flag.FlagSet, prefix string) Config {
 	}
 }
 
-func New(config Config, storageApp absto.Storage, filteredStorage absto.Storage, rendererApp renderer.App, shareApp provider.ShareManager, webhookApp provider.WebhookManager, thumbnailApp thumbnail.App, exifApp exif.App, searchApp search.App, eventProducer provider.EventProducer, exclusiveApp exclusive.App, tracer trace.Tracer) (App, error) {
+func New(config Config, storageApp absto.Storage, filteredStorage absto.Storage, rendererApp renderer.App, shareApp provider.ShareManager, webhookApp provider.WebhookManager, thumbnailApp thumbnail.App, exifApp provider.MetadataManager, searchApp search.App, eventProducer provider.EventProducer, exclusiveApp exclusive.App, tracer trace.Tracer) (App, error) {
 	app := App{
 		sanitizeOnStart: *config.sanitizeOnStart,
 

diff --git a/pkg/crud/get.go b/pkg/crud/get.go
@@ -209,7 +209,7 @@ func (a App) serveGeoJSON(w http.ResponseWriter, r *http.Request, request provid
 		return
 	}
 
-	exifs, err := a.exifApp.ListExifFor(ctx, items...)
+	exifs, err := a.exifApp.GetAllMetadataFor(ctx, items...)
 	if err != nil {
 		a.error(w, r, request, err)
 	}

diff --git a/pkg/crud/get_test.go b/pkg/crud/get_test.go
@@ -41,9 +41,9 @@ func BenchmarkServeGeoJSON(b *testing.B) {
 	ctrl := gomock.NewController(b)
 	defer ctrl.Finish()
 
-	mockExif := mocks.NewExifManager(ctrl)
+	mockExif := mocks.NewMetadataManager(ctrl)
 
-	mockExif.EXPECT().ListExifFor(gomock.Any(), gomock.Any()).Return(map[string]provider.Metadata{
+	mockExif.EXPECT().GetAllMetadataFor(gomock.Any(), gomock.Any()).Return(map[string]provider.Metadata{
 		"9012": {
 			Exif: exas.Exif{
 				Geocode: exas.Geocode{

diff --git a/pkg/crud/list.go b/pkg/crud/list.go
@@ -45,7 +45,7 @@ func (a App) list(ctx context.Context, request provider.Request, message rendere
 	wg.Go(func() {
 		var err error
 
-		aggregates, err = a.exifApp.ListAggregateFor(ctx, files...)
+		aggregates, err = a.exifApp.GetAllAggregateFor(ctx, files...)
 		if err != nil {
 			listLogger(item.Pathname).Error("list exifs: %s", err)
 		}

diff --git a/pkg/crud/post.go b/pkg/crud/post.go
@@ -170,7 +170,7 @@ func (a App) handlePostDescription(w http.ResponseWriter, r *http.Request, reque
 
 	description := r.FormValue("description")
 
-	if err = a.exifApp.UpdateDescription(ctx, item, description); err != nil {
+	if _, err = a.exifApp.Update(ctx, item, provider.ReplaceDescription(description)); err != nil {
 		a.error(w, r, request, err)
 		return
 	}

diff --git a/pkg/crud/story.go b/pkg/crud/story.go
@@ -38,7 +38,7 @@ func (a App) story(r *http.Request, request provider.Request, item absto.Item, f
 	wg.Go(func() {
 		var err error
 
-		exifs, err = a.exifApp.ListExifFor(ctx, files...)
+		exifs, err = a.exifApp.GetAllMetadataFor(ctx, files...)
 		if err != nil {
 			logger.WithField("fn", "crud.story").WithField("item", request.Path).Error("list exifs: %s", err)
 		}

diff --git a/pkg/exif/aggregate.go b/pkg/exif/aggregate.go
@@ -33,7 +33,7 @@ func (a App) GetMetadataFor(ctx context.Context, item absto.Item) (provider.Meta
 	return a.exifCacheApp.Get(ctx, item)
 }
 
-func (a App) ListExifFor(ctx context.Context, items ...absto.Item) (map[string]provider.Metadata, error) {
+func (a App) GetAllMetadataFor(ctx context.Context, items ...absto.Item) (map[string]provider.Metadata, error) {
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "list_exif")
 	defer end()
 
@@ -65,7 +65,7 @@ func (a App) GetAggregateFor(ctx context.Context, item absto.Item) (provider.Agg
 	return a.aggregateCacheApp.Get(ctx, item)
 }
 
-func (a App) ListAggregateFor(ctx context.Context, items ...absto.Item) (map[string]provider.Aggregate, error) {
+func (a App) GetAllAggregateFor(ctx context.Context, items ...absto.Item) (map[string]provider.Aggregate, error) {
 	ctx, end := tracer.StartSpan(ctx, a.tracer, "list_aggregate")
 	defer end()
 

diff --git a/pkg/exif/amqp.go b/pkg/exif/amqp.go
@@ -26,6 +26,6 @@ func (a App) AMQPHandler(ctx context.Context, message amqp.Delivery) error {
 		return nil
 	}
 
-	_, err := a.update(ctx, resp.Item, WithExif(resp.Exif))
+	_, err := a.Update(ctx, resp.Item, provider.ReplaceExif(resp.Exif))
 	return err
 }
diff --git a/pkg/exif/exif.go b/pkg/exif/exif.go
@@ -148,7 +148,7 @@ func (a App) extractAndSaveExif(ctx context.Context, item absto.Item) (provider.
 		return provider.Metadata{}, fmt.Errorf("extract exif: %w", err)
 	}
 
-	return a.update(ctx, item, WithExif(exif))
+	return a.Update(ctx, item, provider.ReplaceExif(exif))
 }
 
 func (a App) extractExif(ctx context.Context, item absto.Item) (exif exas.Exif, err error) {

diff --git a/pkg/exif/metadata.go b/pkg/exif/metadata.go
@@ -5,31 +5,12 @@ import (
 	"fmt"
 
 	absto "github.com/ViBiOh/absto/pkg/model"
-	exas "github.com/ViBiOh/exas/pkg/model"
 	"github.com/ViBiOh/fibr/pkg/exclusive"
 	"github.com/ViBiOh/fibr/pkg/provider"
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 )
 
-type MetadataOption func(provider.Metadata) provider.Metadata
-
-func WithExif(exif exas.Exif) MetadataOption {
-	return func(instance provider.Metadata) provider.Metadata {
-		instance.Exif = exif
-
-		return instance
-	}
-}
-
-func WithDescription(description string) MetadataOption {
-	return func(instance provider.Metadata) provider.Metadata {
-		instance.Description = description
-
-		return instance
-	}
-}
-
-func (a App) update(ctx context.Context, item absto.Item, opts ...MetadataOption) (provider.Metadata, error) {
+func (a App) Update(ctx context.Context, item absto.Item, opts ...provider.MetadataAction) (provider.Metadata, error) {
 	var metadata provider.Metadata
 
 	return metadata, a.exclusiveApp.Execute(ctx, "fibr:mutex:"+item.ID, exclusive.Duration, func(ctx context.Context) error {
@@ -51,8 +32,3 @@ func (a App) update(ctx context.Context, item absto.Item, opts ...MetadataOption
 		return nil
 	})
 }
-
-func (a App) UpdateDescription(ctx context.Context, item absto.Item, description string) error {
-	_, err := a.update(ctx, item, WithDescription(description))
-	return err
-}
diff --git a/pkg/mocks/interfaces.go b/pkg/mocks/interfaces.go