refactor(api/proto): extract filepb package

modernice · Oct 19, 2022 · a865b79 · a865b79
1 parent 2480f01
commit a865b79
Show file tree

Hide file tree

Showing 6 changed files with 244 additions and 147 deletions.
diff --git a/api/proto/gen/file/v0/file.go b/api/proto/gen/file/v0/file.go
@@ -0,0 +1,17 @@
+package filepb
+
+import "github.com/modernice/media-entity/file"
+
+func NewStorage(s file.Storage) *Storage {
+	return &Storage{
+		Provider: s.Provider,
+		Path:     s.Path,
+	}
+}
+
+func (s *Storage) AsStorage() file.Storage {
+	return file.Storage{
+		Provider: s.GetProvider(),
+		Path:     s.GetPath(),
+	}
+}
diff --git a/api/proto/gen/file/v0/storage.pb.go b/api/proto/gen/file/v0/storage.pb.go
diff --git a/api/proto/gen/image/v0/image.go b/api/proto/gen/image/v0/image.go
@@ -1,14 +1,15 @@
 package imagepb
 
 import (
+	filepb "github.com/modernice/media-entity/api/proto/gen/file/v0"
 	"github.com/modernice/media-entity/image"
 	"github.com/modernice/media-entity/internal/mapx"
 	"github.com/modernice/media-entity/internal/slicex"
 )
 
 func New(img image.Image) *Image {
 	return &Image{
-		Storage:      NewStorage(img.Storage),
+		Storage:      filepb.NewStorage(img.Storage),
 		Filename:     img.Filename,
 		Filesize:     int64(img.Filesize),
 		Dimensions:   NewDimensions(img.Dimensions),
@@ -30,20 +31,6 @@ func (img *Image) AsImage() image.Image {
 	}
 }
 
-func NewStorage(s image.Storage) *Storage {
-	return &Storage{
-		Provider: s.Provider,
-		Path:     s.Path,
-	}
-}
-
-func (s *Storage) AsStorage() image.Storage {
-	return image.Storage{
-		Provider: s.GetProvider(),
-		Path:     s.GetPath(),
-	}
-}
-
 func NewDimensions(d image.Dimensions) *Dimensions {
 	return &Dimensions{
 		Width:  int64(d.Width()),