Refactor interface StorageService: does not depend on any struct

core-go · Aug 22, 2021 · 55ba098 · 55ba098
1 parent 1a8f036
commit 55ba098
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/echo/handler.go b/echo/handler.go
@@ -74,7 +74,7 @@ func (s FileHandler) UploadFile() echo.HandlerFunc {
 		bytes := bufferFile.Bytes()
 		contentTye := handler.Header.Get(contentTypeHeader)
 		if len(contentTye) == 0 {
-			contentTye = filepath.Ext(handler.Filename)
+			contentTye = getExt(handler.Filename)
 		}
 		rs, err2 := s.Service.Upload(r.Context(), s.Directory, handler.Filename, bytes, contentTye)
 		if err2 != nil {
@@ -90,3 +90,11 @@ func log(logError func(context.Context, string), r *http.Request, err string) {
 		logError(r.Context(), err)
 	}
 }
+func getExt(file string) string {
+	ext := filepath.Ext(file)
+	if strings.HasPrefix(ext, ":") {
+		ext = ext[1:]
+		return ext
+	}
+	return ext
+}
diff --git a/echo_v3/handler.go b/echo_v3/handler.go
@@ -74,7 +74,7 @@ func (s FileHandler) UploadFile() echo.HandlerFunc {
 		bytes := bufferFile.Bytes()
 		contentTye := handler.Header.Get(contentTypeHeader)
 		if len(contentTye) == 0 {
-			contentTye = filepath.Ext(handler.Filename)
+			contentTye = getExt(handler.Filename)
 		}
 		rs, err2 := s.Service.Upload(r.Context(), s.Directory, handler.Filename, bytes, contentTye)
 		if err2 != nil {
@@ -90,3 +90,11 @@ func log(logError func(context.Context, string), r *http.Request, err string) {
 		logError(r.Context(), err)
 	}
 }
+func getExt(file string) string {
+	ext := filepath.Ext(file)
+	if strings.HasPrefix(ext, ":") {
+		ext = ext[1:]
+		return ext
+	}
+	return ext
+}
diff --git a/gin/handler.go b/gin/handler.go
@@ -77,7 +77,7 @@ func (s FileHandler) UploadFile() gin.HandlerFunc {
 		bytes := bufferFile.Bytes()
 		contentTye := handler.Header.Get(contentTypeHeader)
 		if len(contentTye) == 0 {
-			contentTye = filepath.Ext(handler.Filename)
+			contentTye = getExt(handler.Filename)
 		}
 		rs, err2 := s.Service.Upload(r.Context(), s.Directory, handler.Filename, bytes, contentTye)
 		if err2 != nil {
@@ -94,3 +94,11 @@ func log(logError func(context.Context, string), r *http.Request, err string) {
 		logError(r.Context(), err)
 	}
 }
+func getExt(file string) string {
+	ext := filepath.Ext(file)
+	if strings.HasPrefix(ext, ":") {
+		ext = ext[1:]
+		return ext
+	}
+	return ext
+}
diff --git a/handler.go b/handler.go
@@ -71,7 +71,7 @@ func (s FileHandler) UploadFile(w http.ResponseWriter, r *http.Request) {
 	bytes := bufferFile.Bytes()
 	contentTye := handler.Header.Get(contentTypeHeader)
 	if len(contentTye) == 0 {
-		contentTye = filepath.Ext(handler.Filename)
+		contentTye = getExt(handler.Filename)
 	}
 	rs, err2 := s.Service.Upload(r.Context(), s.Directory, handler.Filename, bytes, contentTye)
 	if err2 != nil {
@@ -94,3 +94,11 @@ func log(logError func(context.Context, string), r *http.Request, err string) {
 		logError(r.Context(), err)
 	}
 }
+func getExt(file string) string {
+	ext := filepath.Ext(file)
+	if strings.HasPrefix(ext, ":") {
+		ext = ext[1:]
+		return ext
+	}
+	return ext
+}