fix: mime type case statement fallthrough

Commit `b18549a`

Eric Bower · 2026-07-16 19:59:19 -0400 EDT

parent 4af7648

fix: mime type case statement fallthrough

2 files changed, +8, -12

M pkg/shared/mime/mime.go

M pkg/storage/fs.go

M pkg/shared/mime/mime.go

+4, -8

......@@ -18,11 +18,9 @@ func GetMimeType(fpath string) string {
		return "image/x-icon"
	case ".pdf":
		return "application/pdf"
	case ".htm":
	case ".html":
	case ".htm", ".html":
		return "text/html"
	case ".jpeg":
	case ".jpg":
	case ".jpeg", ".jpg":
		return "image/jpeg"
	case ".png":
		return "image/png"

......@@ -40,8 +38,7 @@ func GetMimeType(fpath string) string {
		return "font/ttf"
	case ".md":
		return "text/markdown; charset=UTF-8"
	case ".map":
	case ".json":
	case ".map", ".json":
		return "application/json"
	case ".rss":
		return "application/rss+xml"

......@@ -75,8 +72,7 @@ func GetMimeType(fpath string) string {
		return "text/x-opml"
	case ".eot":
		return "application/vnd.ms-fontobject"
	case ".yaml":
	case ".yml":
	case ".yaml", ".yml":
		return "text/x-yaml"
	case ".zip":
		return "application/zip"

M pkg/storage/fs.go

+4, -4

......@@ -102,11 +102,12 @@ func (s *StorageFS) DeleteBucket(bucket Bucket) error {
}

func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderAtCloser, *ObjectInfo, error) {
	contentType := mime.GetMimeType(fpath)
	objInfo := &ObjectInfo{
		Size:         0,
		LastModified: time.Time{},
		ETag:         "",
		ContentType:  "",
		ContentType:  contentType,
	}

	dat, err := os.Open(filepath.Join(bucket.Path, fpath))

......@@ -119,6 +120,8 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderA
		_ = dat.Close()
		return nil, objInfo, err
	}
	objInfo.Size = info.Size()
	objInfo.LastModified = info.ModTime()

	etag := ""
	// only generate etag if file is less than 10MB

......@@ -141,9 +144,6 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderA
	}

	objInfo.ETag = etag
	objInfo.Size = info.Size()
	objInfo.LastModified = info.ModTime()
	objInfo.ContentType = mime.GetMimeType(fpath)
	return dat, objInfo, nil
}

...	...		@@ -102,11 +102,12 @@ func (s *StorageFS) DeleteBucket(bucket Bucket) error {
102	102		}
103	103
104	104		func (s StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderAtCloser, ObjectInfo, error) {
	105	+	contentType := mime.GetMimeType(fpath)
105	106		objInfo := &ObjectInfo{
106	107		Size: 0,
107	108		LastModified: time.Time{},
108	109		ETag: "",
109		-	ContentType: "",
	110	+	ContentType: contentType,
110	111		}
111	112
112	113		dat, err := os.Open(filepath.Join(bucket.Path, fpath))

...	...		@@ -141,9 +144,6 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderA
141	144		}
142	145
143	146		objInfo.ETag = etag
144		-	objInfo.Size = info.Size()
145		-	objInfo.LastModified = info.ModTime()
146		-	objInfo.ContentType = mime.GetMimeType(fpath)
147	147		return dat, objInfo, nil
148	148		}
149	149

...	...		@@ -18,11 +18,9 @@ func GetMimeType(fpath string) string {
18	18		return "image/x-icon"
19	19		case ".pdf":
20	20		return "application/pdf"
21		-	case ".htm":
22		-	case ".html":
	21	+	case ".htm", ".html":
23	22		return "text/html"
24		-	case ".jpeg":
25		-	case ".jpg":
	23	+	case ".jpeg", ".jpg":
26	24		return "image/jpeg"
27	25		case ".png":
28	26		return "image/png"

...	...		@@ -40,8 +38,7 @@ func GetMimeType(fpath string) string {
40	38		return "font/ttf"
41	39		case ".md":
42	40		return "text/markdown; charset=UTF-8"
43		-	case ".map":
44		-	case ".json":
	41	+	case ".map", ".json":
45	42		return "application/json"
46	43		case ".rss":
47	44		return "application/rss+xml"

...	...		@@ -75,8 +72,7 @@ func GetMimeType(fpath string) string {
75	72		return "text/x-opml"
76	73		case ".eot":
77	74		return "application/vnd.ms-fontobject"
78		-	case ".yaml":
79		-	case ".yml":
	75	+	case ".yaml", ".yml":
80	76		return "text/x-yaml"
81	77		case ".zip":
82	78		return "application/zip"

...	...		@@ -119,6 +120,8 @@ func (s *StorageFS) GetObject(bucket Bucket, fpath string) (utils.ReadAndReaderA
119	120		_ = dat.Close()
120	121		return nil, objInfo, err
121	122		}
	123	+	objInfo.Size = info.Size()
	124	+	objInfo.LastModified = info.ModTime()
122	125
123	126		etag := ""
124	127		// only generate etag if file is less than 10MB

Commit b18549a

Commit `b18549a`