refactor typesniffer functions

Author: silverwind

modules/typesniffer/typesniffer.go

@@ -70,15 +70,14 @@ func (ct SniffedType) IsRepresentableAsText() bool {
 	return ct.IsText() || ct.IsSvgImage()
 }
 
-// IsBrowsableType returns whether the file content can be displayed in a browser
-// note, this excludes text types
-func (ct SniffedType) IsBrowsableType() bool {
+// IsBrowsableType returns whether a non-text type can be displayed in a browser
+func (ct SniffedType) IsBrowsableBinaryType() bool {
 	return ct.IsImage() || ct.IsSvgImage() || ct.IsPDF() || ct.IsVideo() || ct.IsAudio()
 }
 
-// GetContentType returns the contentType
-func (ct SniffedType) GetContentType() string {
-	return ct.contentType
+// GetMimeType returns the mime type
+func (ct SniffedType) GetMimeType() string {
+	return ct.contentType[:strings.Index(ct.contentType, ";")]
 }
 
 // DetectContentType extends http.DetectContentType with more content types. Defaults to text/unknown if input is empty.

routers/common/repo.go

@@ -73,8 +73,8 @@ func ServeData(ctx *context.Context, filePath string, size int64, reader io.Read
 	}
 
 	if mimeType == "" {
-		if st.IsBrowsableType() {
-			mimeType = st.GetContentType()
+		if st.IsBrowsableBinaryType() {
+			mimeType = st.GetMimeType()
 		} else if isPlain {
 			mimeType = "text/plain"
 		} else {