Calculate and store filesize on file uploads

Author: demophoon

pkg/cli/serve/demo.go

@@ -51,7 +51,7 @@ func setupDemo() {
 			},
 		},
 	})
-	ref, err := d.CreateFile([]byte("This is an example of an uploaded file"))
+	ref, size, err := d.CreateFile([]byte("This is an example of an uploaded file"))
 	if err != nil {
 		log.Errorf("Unable to upload example file: %s", err)
 	}
@@ -60,6 +60,7 @@ func setupDemo() {
 			Content: &pb.ExpandedURL_File{
 				File: &pb.Upload{
 					Ref: ref,
+					Size: size,
 				},
 			},
 		},

server/gen/shrls.pb.go

@@ -317,6 +317,10 @@
       "properties": {
         "id": {
           "type": "string"
+        },
+        "size": {
+          "type": "string",
+          "format": "int64"
         }
       }
     },
@@ -536,6 +540,11 @@
         "ref": {
           "type": "string",
           "title": "Reference to pass to storage backend to find uploaded file"
+        },
+        "size": {
+          "type": "string",
+          "format": "int64",
+          "title": "File size in bytes"
         }
       },
       "title": "File Upload"

server/gen/shrls.swagger.json

@@ -129,6 +129,7 @@ message Ref {
 	message FileUpload {
 		oneof ref {
 			string id = 1;
+			int64 size = 2;
 		}
 	}
 }
@@ -169,6 +170,7 @@ message Redirect {
 // File Upload
 message Upload {
 	string ref = 1; // Reference to pass to storage backend to find uploaded file
+	int64 size = 2; // File size in bytes
 }
 
 message ExpandedURL {

server/proto/shrls.proto

@@ -1,7 +1,7 @@
 package server
 
 type ServerStorage interface {
-	CreateFile([]byte) (string, error)
+	CreateFile([]byte) (string, int64, error)
 	ReadFile(string) ([]byte, error)
 	DeleteFile(string) error
 }

server/storage.go

@@ -8,7 +8,7 @@ import (
 
 func (s Server) PostFileUpload(ctx context.Context, req *pb.PostFileUploadRequest) (*pb.PostFileUploadResponse, error) {
 	file := req.File
-	key, err := s.storage.CreateFile(file)
+	key, _, err := s.storage.CreateFile(file)
 	if err != nil {
 		return nil, err
 	}

service/fileupload.go

@@ -27,6 +27,7 @@ type URL struct {
 	Alias          string
 	Location       string
 	UploadLocation string
+	UploadSize     int64
 	SnippetTitle   string
 	Snippet        string
 	CreatedAt      time.Time `storm:"index"`
@@ -68,6 +69,7 @@ func (s *BoltDBState) pbShrlToUrl(in *pb.ShortURL) *URL {
 	case *pb.ExpandedURL_File:
 		out.Type = UploadedFile
 		out.UploadLocation = in.Content.GetFile().GetRef()
+		out.UploadSize = in.Content.GetFile().GetSize()
 	case *pb.ExpandedURL_Snippet:
 		out.Type = TextSnippet
 		out.Snippet = string(in.Content.GetSnippet().GetBody())
@@ -100,6 +102,7 @@ func (s *BoltDBState) urlToPbShrl(in *URL) *pb.ShortURL {
 			Content: &pb.ExpandedURL_File{
 				File: &pb.Upload{
 					Ref: in.UploadLocation,
+					Size: in.UploadSize,
 				},
 			},
 		}

state/boltdb/shrl.go

@@ -33,6 +33,7 @@ type URL struct {
 	Alias          string             `bson:"alias" json:"alias"`
 	Location       string             `bson:"location" json:"location"`
 	UploadLocation string             `bson:"upload_location" json:"-"`
+	UploadSize     int64              `bson:"upload_size" json:"-"`
 	SnippetTitle   string             `bson:"snippet_title" json:"snippet_title,omitempty"`
 	Snippet        string             `bson:"snippet" json:"snippet,omitempty"`
 	CreatedAt      time.Time          `bson:"created_at" json:"created_at"`
@@ -79,6 +80,7 @@ func (s *MongoDBState) urlToPbShrl(u *URL) *pb.ShortURL {
 			Content: &pb.ExpandedURL_File{
 				File: &pb.Upload{
 					Ref: u.UploadLocation,
+					Size: u.UploadSize,
 				},
 			},
 		}
@@ -129,6 +131,7 @@ func (s *MongoDBState) pbShrlToUrl(u *pb.ShortURL) *URL {
 	case *pb.ExpandedURL_File:
 		url.Type = UploadedFile
 		url.UploadLocation = u.Content.GetFile().GetRef()
+		url.UploadSize = u.Content.GetFile().GetSize()
 	case *pb.ExpandedURL_Snippet:
 		url.Type = TextSnippet
 		url.Snippet = string(u.Content.GetSnippet().GetBody())

state/mongo/shrl.go

@@ -14,21 +14,21 @@ type DirectoryStorage struct {
 	upload_location string
 }
 
-func (d *DirectoryStorage) CreateFile(file []byte) (string, error) {
+func (d *DirectoryStorage) CreateFile(file []byte) (string, int64, error) {
 	err := os.MkdirAll(d.upload_location, os.ModePerm)
 	if err != nil {
-		return "", err
+		return "", 0, err
 	}
 
 	key := uuid.New()
 	filepath := path.Join(d.upload_location, key.String())
 
 	err = os.WriteFile(filepath, file, os.ModePerm)
 	if err != nil {
-		return "", err
+		return "", 0, err
 	}
 
-	return key.String(), nil
+	return key.String(), int64(len(file)), nil
 }
 
 func (d *DirectoryStorage) ReadFile(key string) ([]byte, error) {