Skip to content

Commit

Permalink
refactor: Renaming exif package to metadata
Browse files Browse the repository at this point in the history
Signed-off-by: Vincent Boutour <[email protected]>
  • Loading branch information
ViBiOh committed Dec 30, 2022
1 parent b881866 commit 10442ab
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions cmd/fibr/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/ViBiOh/absto/pkg/absto"
basicMemory "github.com/ViBiOh/auth/v2/pkg/store/memory"
"github.com/ViBiOh/fibr/pkg/crud"
"github.com/ViBiOh/fibr/pkg/exif"
"github.com/ViBiOh/fibr/pkg/metadata"
"github.com/ViBiOh/fibr/pkg/share"
"github.com/ViBiOh/fibr/pkg/storage"
"github.com/ViBiOh/fibr/pkg/thumbnail"
Expand Down Expand Up @@ -44,7 +44,7 @@ type configuration struct {
renderer renderer.Config
absto absto.Config
thumbnail thumbnail.Config
exif exif.Config
metadata metadata.Config
amqp amqp.Config
amqpThumbnail amqphandler.Config
amqpExif amqphandler.Config
Expand Down Expand Up @@ -75,7 +75,7 @@ func newConfig() (configuration, error) {
renderer: renderer.Flags(fs, "", flags.NewOverride("PublicURL", "http://localhost:1080"), flags.NewOverride("Title", "fibr")),
absto: absto.Flags(fs, "storage"),
thumbnail: thumbnail.Flags(fs, "thumbnail"),
exif: exif.Flags(fs, "exif"),
metadata: metadata.Flags(fs, "exif"),
amqp: amqp.Flags(fs, "amqp"),
amqpThumbnail: amqphandler.Flags(fs, "amqpThumbnail", flags.NewOverride("Exchange", "fibr"), flags.NewOverride("Queue", "fibr.thumbnail"), flags.NewOverride("RoutingKey", "thumbnail_output")),
amqpExif: amqphandler.Flags(fs, "amqpExif", flags.NewOverride("Exchange", "fibr"), flags.NewOverride("Queue", "fibr.exif"), flags.NewOverride("RoutingKey", "exif_output")),
Expand Down
12 changes: 6 additions & 6 deletions cmd/fibr/fibr.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
basicMemory "github.com/ViBiOh/auth/v2/pkg/store/memory"
"github.com/ViBiOh/fibr/pkg/crud"
"github.com/ViBiOh/fibr/pkg/exclusive"
"github.com/ViBiOh/fibr/pkg/exif"
"github.com/ViBiOh/fibr/pkg/fibr"
"github.com/ViBiOh/fibr/pkg/metadata"
"github.com/ViBiOh/fibr/pkg/provider"
"github.com/ViBiOh/fibr/pkg/search"
"github.com/ViBiOh/fibr/pkg/share"
Expand Down Expand Up @@ -99,7 +99,7 @@ func main() {
exclusiveApp = exclusive.New(client.redis)
}

exifApp, err := exif.New(config.exif, storageApp, prometheusRegisterer, client.tracer, client.amqp, client.redis, exclusiveApp)
metadataApp, err := metadata.New(config.metadata, storageApp, prometheusRegisterer, client.tracer, client.amqp, client.redis, exclusiveApp)
logger.Fatal(err)

webhookApp, err := webhook.New(config.webhook, storageApp, prometheusRegisterer, client.amqp, rendererApp, thumbnailApp, exclusiveApp)
Expand All @@ -111,7 +111,7 @@ func main() {
amqpThumbnailApp, err := amqphandler.New(config.amqpThumbnail, client.amqp, client.tracer.GetTracer("amqp_handler_thumbnail"), thumbnailApp.AMQPHandler)
logger.Fatal(err)

amqpExifApp, err := amqphandler.New(config.amqpExif, client.amqp, client.tracer.GetTracer("amqp_handler_exif"), exifApp.AMQPHandler)
amqpExifApp, err := amqphandler.New(config.amqpExif, client.amqp, client.tracer.GetTracer("amqp_handler_exif"), metadataApp.AMQPHandler)
logger.Fatal(err)

amqpShareApp, err := amqphandler.New(config.amqpShare, client.amqp, client.tracer.GetTracer("amqp_handler_share"), shareApp.AMQPHandler)
Expand All @@ -120,9 +120,9 @@ func main() {
amqpWebhookApp, err := amqphandler.New(config.amqpWebhook, client.amqp, client.tracer.GetTracer("amqp_handler_webhook"), webhookApp.AMQPHandler)
logger.Fatal(err)

searchApp := search.New(filteredStorage, thumbnailApp, exifApp, exclusiveApp, client.tracer.GetTracer("search"))
searchApp := search.New(filteredStorage, thumbnailApp, metadataApp, exclusiveApp, client.tracer.GetTracer("search"))

crudApp, err := crud.New(config.crud, storageApp, filteredStorage, rendererApp, shareApp, webhookApp, thumbnailApp, exifApp, searchApp, eventBus.Push, exclusiveApp, client.tracer.GetTracer("crud"))
crudApp, err := crud.New(config.crud, storageApp, filteredStorage, rendererApp, shareApp, webhookApp, thumbnailApp, metadataApp, searchApp, eventBus.Push, exclusiveApp, client.tracer.GetTracer("crud"))
logger.Fatal(err)

var middlewareApp provider.Auth
Expand All @@ -143,7 +143,7 @@ func main() {
go webhookApp.Start(ctx)
go shareApp.Start(ctx)
go crudApp.Start(ctx)
go eventBus.Start(ctx, storageApp, []provider.Renamer{thumbnailApp.Rename, exifApp.Rename}, shareApp.EventConsumer, thumbnailApp.EventConsumer, exifApp.EventConsumer, webhookApp.EventConsumer)
go eventBus.Start(ctx, storageApp, []provider.Renamer{thumbnailApp.Rename, metadataApp.Rename}, shareApp.EventConsumer, thumbnailApp.EventConsumer, metadataApp.EventConsumer, webhookApp.EventConsumer)

go promServer.Start("prometheus", client.health.End(), client.prometheus.Handler())
go appServer.Start("http", client.health.End(), httputils.Handler(handler, client.health, recoverer.Middleware, client.prometheus.Middleware, client.tracer.Middleware, owasp.New(config.owasp).Middleware))
Expand Down
4 changes: 2 additions & 2 deletions pkg/crud/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"time"

absto "github.com/ViBiOh/absto/pkg/model"
"github.com/ViBiOh/fibr/pkg/exif"
"github.com/ViBiOh/fibr/pkg/geo"
"github.com/ViBiOh/fibr/pkg/metadata"
"github.com/ViBiOh/fibr/pkg/provider"
"github.com/ViBiOh/httputils/v4/pkg/logger"
"github.com/ViBiOh/httputils/v4/pkg/model"
Expand Down Expand Up @@ -303,7 +303,7 @@ func (a App) exifHash(ctx context.Context, items []absto.Item) string {
hasher := sha.Stream()

for _, item := range items {
if info, err := a.storageApp.Info(ctx, exif.Path(item)); err == nil {
if info, err := a.storageApp.Info(ctx, metadata.Path(item)); err == nil {
hasher.Write(info)
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/aggregate.go → pkg/metadata/aggregate.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/amqp.go → pkg/metadata/amqp.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/date.go → pkg/metadata/date.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/error.go → pkg/metadata/error.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/event.go → pkg/metadata/event.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/exif.go → pkg/metadata/exif.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/exif_test.go → pkg/metadata/exif_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"flag"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/metadata.go → pkg/metadata/metadata.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/metric.go → pkg/metadata/metric.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

func (a App) increaseExif(state string) {
if a.exifMetric == nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/model.go → pkg/metadata/model.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"strings"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/util.go → pkg/metadata/util.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion pkg/exif/util_test.go → pkg/metadata/util_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package exif
package metadata

import (
"testing"
Expand Down

0 comments on commit 10442ab

Please sign in to comment.