refactor thumbnails

Signed-off-by: Christian Richter <crichter@owncloud.com>

extensions/thumbnails/pkg/server/grpc/option.go

@@ -0,0 +1,92 @@
+package grpc
+
+import (
+	"context"
+
+	"github.com/owncloud/ocis/extensions/thumbnails/pkg/config"
+	"github.com/owncloud/ocis/extensions/thumbnails/pkg/metrics"
+	"github.com/owncloud/ocis/ocis-pkg/log"
+	"github.com/urfave/cli/v2"
+)
+
+// Option defines a single option function.
+type Option func(o *Options)
+
+// Options defines the available options for this package.
+type Options struct {
+	Name      string
+	Address   string
+	Logger    log.Logger
+	Context   context.Context
+	Config    *config.Config
+	Metrics   *metrics.Metrics
+	Namespace string
+	Flags     []cli.Flag
+}
+
+// newOptions initializes the available default options.
+func newOptions(opts ...Option) Options {
+	opt := Options{}
+
+	for _, o := range opts {
+		o(&opt)
+	}
+
+	return opt
+}
+
+// Logger provides a function to set the logger option.
+func Logger(val log.Logger) Option {
+	return func(o *Options) {
+		o.Logger = val
+	}
+}
+
+// Name provides a name for the service.
+func Name(val string) Option {
+	return func(o *Options) {
+		o.Name = val
+	}
+}
+
+// Address provides an address for the service.
+func Address(val string) Option {
+	return func(o *Options) {
+		o.Address = val
+	}
+}
+
+// Context provides a function to set the context option.
+func Context(val context.Context) Option {
+	return func(o *Options) {
+		o.Context = val
+	}
+}
+
+// Config provides a function to set the config option.
+func Config(val *config.Config) Option {
+	return func(o *Options) {
+		o.Config = val
+	}
+}
+
+// Metrics provides a function to set the metrics option.
+func Metrics(val *metrics.Metrics) Option {
+	return func(o *Options) {
+		o.Metrics = val
+	}
+}
+
+// Namespace provides a function to set the namespace option.
+func Namespace(val string) Option {
+	return func(o *Options) {
+		o.Namespace = val
+	}
+}
+
+// Flags provides a function to set the flags option.
+func Flags(flags []cli.Flag) Option {
+	return func(o *Options) {
+		o.Flags = append(o.Flags, flags...)
+	}
+}

extensions/thumbnails/pkg/server/grpc/server.go

@@ -0,0 +1,60 @@
+package grpc
+
+import (
+	"github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool"
+	svc "github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0"
+	"github.com/owncloud/ocis/extensions/thumbnails/pkg/service/grpc/v0/decorators"
+	"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/imgsource"
+	"github.com/owncloud/ocis/extensions/thumbnails/pkg/thumbnail/storage"
+	"github.com/owncloud/ocis/ocis-pkg/service/grpc"
+	"github.com/owncloud/ocis/ocis-pkg/version"
+	thumbnailssvc "github.com/owncloud/ocis/protogen/gen/ocis/services/thumbnails/v0"
+)
+
+// NewService initializes the grpc service and server.
+func NewService(opts ...Option) grpc.Service {
+	options := newOptions(opts...)
+
+	service := grpc.NewService(
+		grpc.Logger(options.Logger),
+		grpc.Namespace(options.Namespace),
+		grpc.Name(options.Name),
+		grpc.Version(version.String),
+		grpc.Address(options.Address),
+		grpc.Context(options.Context),
+		grpc.Flags(options.Flags...),
+		grpc.Version(version.String),
+	)
+	tconf := options.Config.Thumbnail
+	gc, err := pool.GetGatewayServiceClient(tconf.RevaGateway)
+	if err != nil {
+		options.Logger.Error().Err(err).Msg("could not get gateway client")
+		return grpc.Service{}
+	}
+	var thumbnail decorators.DecoratedService
+	{
+		thumbnail = svc.NewService(
+			svc.Config(options.Config),
+			svc.Logger(options.Logger),
+			svc.ThumbnailSource(imgsource.NewWebDavSource(tconf)),
+			svc.ThumbnailStorage(
+				storage.NewFileSystemStorage(
+					tconf.FileSystemStorage,
+					options.Logger,
+				),
+			),
+			svc.CS3Source(imgsource.NewCS3Source(tconf, gc)),
+			svc.CS3Client(gc),
+		)
+		thumbnail = decorators.NewInstrument(thumbnail, options.Metrics)
+		thumbnail = decorators.NewLogging(thumbnail, options.Logger)
+		thumbnail = decorators.NewTracing(thumbnail)
+	}
+
+	_ = thumbnailssvc.RegisterThumbnailServiceHandler(
+		service.Server(),
+		thumbnail,
+	)
+
+	return service
+}