generate .jpeg thumbnails for .png images

ShoshinNikita · Jul 18, 2023 · f0321f0 · f0321f0
1 parent 8b93a4f
commit f0321f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/tests/thumbnails_test.go b/tests/thumbnails_test.go
@@ -29,7 +29,7 @@ func TestThumbnailGeneration(t *testing.T) {
 		mimeType  string
 	}{
 		{imageType: "jpg", file: "Images/birds-g64b44607c_640.jpg", mimeType: "image/jpeg"},
-		{imageType: "png", file: "Images/ytrewq.png", mimeType: "image/png"},
+		{imageType: "png", file: "Images/ytrewq.png", mimeType: "image/jpeg"},
 		{imageType: "webp", file: "Images/qwerty.webp", mimeType: "image/webp"},
 		{imageType: "heic", file: "Images/asdfgh.heic", mimeType: "image/jpeg"}, // we should generate .jpeg thumbnails for .heic images
 	} {

diff --git a/thumbnails/service.go b/thumbnails/service.go
@@ -278,13 +278,11 @@ func createCacheFileFromTempFile(tempFile *os.File, cacheFilepath string, origin
 func resizeWithVips(originalFile, cacheFile string, fileID rview.FileID) error {
 	output := cacheFile
 	switch getImageType(fileID) {
-	case heicImageType:
-		// We generate .jpeg thumbnails for .heic images.
+	case pngImageType, heicImageType:
+		// We generate .jpeg thumbnails for .png and .heic images.
 		fallthrough
 	case jpegImageType:
 		output += "[Q=80,optimize_coding,strip]"
-	case pngImageType:
-		output += "[strip]"
 	case webpImageType:
 		output += "[strip]"
 	default:
@@ -459,8 +457,8 @@ func (c *cacheWrapper) Remove(id rview.FileID) error {
 // convertToThumbnailFileID returns a file id for working with the thumbnail cache.
 func convertToThumbnailFileID(id rview.FileID) rview.FileID {
 	switch id.GetExt() {
-	case ".heic":
-		// We generate .jpeg thumbnails for .heic images.
+	case ".png", ".heic":
+		// We generate .jpeg thumbnails for .png and .heic images.
 		path := id.GetPath() + ".jpeg"
 		return rview.NewFileID(path, id.GetModTime().Unix())