services/*: Set content-type as best errort (#234)

* services/azblob: Set content type Signed-off-by: Xuanwo <github@xuanwo.io> * services/cos: Set content type correctly Signed-off-by: Xuanwo <github@xuanwo.io> * pkg/mime: Add TypeByFileName support Signed-off-by: Xuanwo <github@xuanwo.io> * services/fs: Try to set content type Signed-off-by: Xuanwo <github@xuanwo.io> * services/gcs: Set content type correctly Signed-off-by: Xuanwo <github@xuanwo.io> * services/kodo: Set content type Signed-off-by: Xuanwo <github@xuanwo.io> * services/oss: Set content type Signed-off-by: Xuanwo <github@xuanwo.io> * services/uss: Set content type Signed-off-by: Xuanwo <github@xuanwo.io>
beyondstorage · Mar 27, 2020 · 5cdafd6 · 5cdafd6
1 parent 2d3239e
commit 5cdafd6
Show file tree

Hide file tree

Showing 9 changed files with 102 additions and 41 deletions.
diff --git a/pkg/mime/mime.go b/pkg/mime/mime.go
@@ -0,0 +1,16 @@
+package mime
+
+import (
+	"mime"
+	"strings"
+)
+
+// TypeByFileName will get mime type via filename, and return "" if not detected.
+func TypeByFileName(filename string) string {
+	x := strings.Split(filename, ".")
+	if len(x) < 2 {
+		return ""
+	}
+
+	return mime.TypeByExtension("." + x[len(x)-1])
+}
diff --git a/pkg/mime/mime_test.go b/pkg/mime/mime_test.go
@@ -0,0 +1,27 @@
+package mime
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestTypeByFileName(t *testing.T) {
+	cases := []struct {
+		name     string
+		filename string
+		expected string
+	}{
+		{"normal case", "test.pdf", "application/pdf"},
+		{"no ext", "testxxx", ""},
+		{"not a valid type", "test.xxx", ""},
+		{"multiple dots", "test.xx.a.pdf", "application/pdf"},
+	}
+
+	for _, tt := range cases {
+		t.Run(tt.name, func(t *testing.T) {
+			got := TypeByFileName(tt.filename)
+			assert.Equal(t, tt.expected, got)
+		})
+	}
+}
diff --git a/services/azblob/storager.go b/services/azblob/storager.go
@@ -197,6 +197,9 @@ func (s *Storage) Stat(path string, pairs ...*types.Pair) (o *types.Object, err
 
 	o.SetETag(string(output.ETag()))
 
+	if output.ContentType() != "" {
+		o.SetContentType(output.ContentType())
+	}
 	if len(output.ContentMD5()) > 0 {
 		o.SetContentMD5(base64.StdEncoding.EncodeToString(output.ContentMD5()))
 	}
@@ -269,6 +272,9 @@ func (s *Storage) formatFileObject(v azblob.BlobItem) (o *types.Object, err erro
 	if v.Properties.ContentLength != nil {
 		o.Size = *v.Properties.ContentLength
 	}
+	if v.Properties.ContentType != nil && *v.Properties.ContentType != "" {
+		o.SetContentType(*v.Properties.ContentType)
+	}
 	if len(v.Properties.ContentMD5) > 0 {
 		o.SetContentMD5(base64.StdEncoding.EncodeToString(v.Properties.ContentMD5))
 	}

diff --git a/services/cos/storager.go b/services/cos/storager.go
@@ -241,7 +241,13 @@ func (s *Storage) Stat(path string, pairs ...*types.Pair) (o *types.Object, err
 	}
 	o.UpdatedAt = lastModified
 
-	o.SetETag(output.Header.Get("ETag"))
+	if v := output.Header.Get("Content-Type"); v != "" {
+		o.SetContentType(v)
+	}
+
+	if v := output.Header.Get("ETag"); v != "" {
+		o.SetETag(output.Header.Get(v))
+	}
 
 	storageClass, err := formatStorageClass(output.Header.Get(storageClassHeader))
 	if err != nil {

diff --git a/services/fs/storager.go b/services/fs/storager.go
@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 
 	"github.com/Xuanwo/storage/pkg/iowrap"
+	"github.com/Xuanwo/storage/pkg/mime"
 	"github.com/Xuanwo/storage/services"
 	"github.com/Xuanwo/storage/types"
 	"github.com/Xuanwo/storage/types/metadata"
@@ -81,6 +82,10 @@ func (s *Storage) List(path string, pairs ...*types.Pair) (err error) {
 			continue
 		}
 
+		if v := mime.TypeByFileName(v.Name()); v != "" {
+			o.SetContentType(v)
+		}
+
 		o.Type = types.ObjectTypeFile
 		if opt.HasFileFunc {
 			opt.FileFunc(o)
@@ -213,6 +218,10 @@ func (s *Storage) Stat(path string, pairs ...*types.Pair) (o *types.Object, err
 		return
 	}
 	if fi.Mode().IsRegular() {
+		if v := mime.TypeByFileName(path); v != "" {
+			o.SetContentType(v)
+		}
+
 		o.Type = types.ObjectTypeFile
 		return
 	}

diff --git a/services/gcs/storager.go b/services/gcs/storager.go
@@ -93,27 +93,10 @@ func (s *Storage) List(path string, pairs ...*types.Pair) (err error) {
 			continue
 		}
 
-		o := &types.Object{
-			ID:         object.Name,
-			Name:       s.getRelPath(object.Name),
-			Type:       types.ObjectTypeFile,
-			Size:       object.Size,
-			UpdatedAt:  object.Updated,
-			ObjectMeta: metadata.NewObjectMeta(),
-		}
-
-		o.SetContentType(object.ContentType)
-		o.SetETag(object.Etag)
-
-		if len(object.MD5) > 0 {
-			o.SetContentMD5(base64.StdEncoding.EncodeToString(object.MD5))
-		}
-
-		storageClass, err := formatStorageClass(object.StorageClass)
+		o, err := s.formatFileObject(object)
 		if err != nil {
 			return err
 		}
-		o.SetStorageClass(storageClass)
 
 		if opt.HasFileFunc {
 			opt.FileFunc(o)
@@ -206,28 +189,7 @@ func (s *Storage) Stat(path string, pairs ...*types.Pair) (o *types.Object, err
 		return nil, err
 	}
 
-	o = &types.Object{
-		ID:         attr.Name,
-		Name:       path,
-		Type:       types.ObjectTypeFile,
-		Size:       attr.Size,
-		UpdatedAt:  attr.Updated,
-		ObjectMeta: metadata.NewObjectMeta(),
-	}
-
-	o.SetETag(attr.Etag)
-
-	if len(attr.MD5) > 0 {
-		o.SetContentMD5(base64.StdEncoding.EncodeToString(attr.MD5))
-	}
-
-	storageClass, err := formatStorageClass(attr.StorageClass)
-	if err != nil {
-		return nil, err
-	}
-	o.SetStorageClass(storageClass)
-
-	return o, nil
+	return s.formatFileObject(attr)
 }
 
 // Delete implements Storager.Delete
@@ -274,3 +236,32 @@ func (s *Storage) formatError(op string, err error, path ...string) error {
 		Path:     path,
 	}
 }
+
+func (s *Storage) formatFileObject(v *gs.ObjectAttrs) (o *types.Object, err error) {
+	o = &types.Object{
+		ID:         v.Name,
+		Name:       s.getRelPath(v.Name),
+		Type:       types.ObjectTypeFile,
+		Size:       v.Size,
+		UpdatedAt:  v.Updated,
+		ObjectMeta: metadata.NewObjectMeta(),
+	}
+
+	if v.ContentType != "" {
+		o.SetContentType(v.ContentType)
+	}
+	if v.Etag != "" {
+		o.SetETag(v.Etag)
+	}
+	if len(v.MD5) > 0 {
+		o.SetContentMD5(base64.StdEncoding.EncodeToString(v.MD5))
+	}
+
+	storageClass, err := formatStorageClass(v.StorageClass)
+	if err != nil {
+		return nil, err
+	}
+	o.SetStorageClass(storageClass)
+
+	return
+}
diff --git a/services/kodo/storager.go b/services/kodo/storager.go
@@ -90,6 +90,7 @@ func (s *Storage) List(path string, pairs ...*types.Pair) (err error) {
 					UpdatedAt:  convertUnixTimestampToTime(v.PutTime),
 					ObjectMeta: metadata.NewObjectMeta(),
 				}
+
 				o.SetContentType(v.MimeType)
 				o.SetETag(v.Hash)
 
@@ -191,7 +192,9 @@ func (s *Storage) Stat(path string, pairs ...*types.Pair) (o *types.Object, err
 		UpdatedAt:  convertUnixTimestampToTime(fi.PutTime),
 		ObjectMeta: metadata.NewObjectMeta(),
 	}
+
 	o.SetETag(fi.Hash)
+	o.SetContentType(fi.MimeType)
 
 	storageClass, err := formatStorageClass(fi.Type)
 	if err != nil {

diff --git a/services/oss/storager.go b/services/oss/storager.go
@@ -223,6 +223,7 @@ func (s *Storage) Stat(path string, pairs ...*types.Pair) (o *types.Object, err
 	//
 	// ref: https://help.aliyun.com/document_detail/31965.html
 	o.SetETag(output.Get("ETag"))
+	o.SetContentType(output.Get("Content-Type"))
 
 	storageClass, err := formatStorageClass(output.Get(storageClassHeader))
 	if err != nil {

diff --git a/services/uss/storager.go b/services/uss/storager.go
@@ -86,6 +86,7 @@ func (s *Storage) List(path string, pairs ...*types.Pair) (err error) {
 				ObjectMeta: metadata.NewObjectMeta(),
 			}
 			o.SetETag(v.ETag)
+			o.SetContentType(v.ContentType)
 
 			if opt.HasObjectFunc {
 				opt.ObjectFunc(o)
@@ -187,6 +188,7 @@ func (s *Storage) Stat(path string, pairs ...*types.Pair) (o *types.Object, err
 		ObjectMeta: metadata.NewObjectMeta(),
 	}
 	o.SetETag(output.ETag)
+	o.SetContentType(output.ContentType)
 
 	return o, nil
 }