diff --git a/docs/endpoints.MD b/docs/endpoints.MD index 12bcb91c..01bb5df6 100644 --- a/docs/endpoints.MD +++ b/docs/endpoints.MD @@ -252,9 +252,9 @@ this is normally used as updateURL and installation URL. ### Get style's preview ``` -GET /style/preview/. +GET /style/preview/. ``` -Gets an optimized jpeg/webp/avif version of the style's preview. +Gets an optimized jpeg/webp version of the style's preview. ### List all styles ``` diff --git a/handlers/api/preview.go b/handlers/api/preview.go index 8b952f34..3650a9c9 100644 --- a/handlers/api/preview.go +++ b/handlers/api/preview.go @@ -62,22 +62,6 @@ func GetPreviewScreenshot(c *fiber.Ctx) error { } stat = info.WebP mimeType = "image/webp" - case "avif": - fileName = images.CacheFolder + styleID + ".avif" - if info.Avif == nil { - err = images.DecodeImage(orignalFile, fileName, images.ImageTypeAVIF) - if err != nil { - return notFound(c) - } - avifStat, err := os.Stat(fileName) - if err != nil { - return notFound(c) - } - stat = avifStat - break - } - stat = info.Avif - mimeType = "image/avif" } if stat == nil || fileName == "" { diff --git a/handlers/style/edit.go b/handlers/style/edit.go index 6a71b1d0..773a79d8 100644 --- a/handlers/style/edit.go +++ b/handlers/style/edit.go @@ -105,14 +105,12 @@ func EditPost(c *fiber.Ctx) error { // So we don't care about the error. _ = os.Remove(images.CacheFolder + styleID + ".jpeg") _ = os.Remove(images.CacheFolder + styleID + ".webp") - _ = os.Remove(images.CacheFolder + styleID + ".avif") q.Preview = "https://userstyles.world/api/preview/" + styleID + ".jpeg" } if q.Preview != s.Preview { _ = os.Remove(images.CacheFolder + styleID + ".original") - _ = os.Remove(images.CacheFolder + styleID + ".avif") _ = os.Remove(images.CacheFolder + styleID + ".jpeg") _ = os.Remove(images.CacheFolder + styleID + ".webp") } diff --git a/modules/images/info.go b/modules/images/info.go index 7dd656a0..8fda51c9 100644 --- a/modules/images/info.go +++ b/modules/images/info.go @@ -12,7 +12,6 @@ import ( type ImageInfo struct { Original fs.FileInfo - Avif fs.FileInfo Jpeg fs.FileInfo WebP fs.FileInfo } @@ -39,7 +38,6 @@ func GetImageFromStyle(id string) (ImageInfo, error) { template := CacheFolder + id original := template + ".original" jpeg := template + ".jpeg" - avif := template + ".avif" webp := template + ".webp" if fileExist(original) == nil { style, err := models.GetStyleByID(id) @@ -76,7 +74,6 @@ func GetImageFromStyle(id string) (ImageInfo, error) { return ImageInfo{ Original: fileExist(original), - Avif: fileExist(avif), WebP: fileExist(webp), Jpeg: fileExist(jpeg), }, nil diff --git a/modules/images/processing.go b/modules/images/processing.go index dba9980f..b8b2f297 100644 --- a/modules/images/processing.go +++ b/modules/images/processing.go @@ -9,8 +9,7 @@ import ( type ImageType int const ( - ImageTypeAVIF ImageType = iota - ImageTypeWEBP + ImageTypeWEBP ImageType = iota ImageTypeJPEG ) @@ -50,8 +49,6 @@ func DecodeImage(original, newPath string, imageType ImageType) error { switch imageType { case ImageTypeWEBP: vipsCommand = exec.Command("vips", "webpsave", "--strip", "--reduction-effort", "4", "--Q", "50", original, newPath) - case ImageTypeAVIF: - vipsCommand = exec.Command("vips", "heifsave", "--strip", "--compression", "av1", "--Q", "50", original, newPath) case ImageTypeJPEG: vipsCommand = exec.Command("vips", "jpegsave", "--strip", "--Q", "50", "--optimize-coding", "--optimize-scans", "--trellis-quant", "--quant-table", "3", original, newPath) } diff --git a/views/partials/preview-image.html b/views/partials/preview-image.html index 4f1bdac7..dd44b172 100644 --- a/views/partials/preview-image.html +++ b/views/partials/preview-image.html @@ -1,8 +1,6 @@ -{{ $avif := printf "/api/style/preview/%d.avif" .ID }} {{ $webp := printf "/api/style/preview/%d.webp" .ID }} {{ if .Preview }} -