Imagemagickを抹殺

cmd/config.go

@@ -51,9 +51,6 @@ type Config struct {
 		Enabled bool `mapstructure:"enabled" yaml:"enabled"`
 	} `mapstructure:"accessLog" yaml:"accessLog"`
 
-	// ImageMagick ImageMagick実行ファイルパス
-	ImageMagick string `mapstructure:"imagemagick" yaml:"imagemagick"`
-
 	// Imaging 画像処理設定
 	Imaging struct {
 		// MaxPixels 処理可能な最大画素数 (default: 2560*1600)
@@ -263,7 +260,6 @@ func init() {
 	viper.SetDefault("gzip", true)
 	viper.SetDefault("allowSignUp", false)
 	viper.SetDefault("accessLog.enabled", true)
-	viper.SetDefault("imagemagick", "")
 	viper.SetDefault("imaging.maxPixels", 2560*1600)
 	viper.SetDefault("imaging.concurrency", 1)
 	viper.SetDefault("mariadb.host", "127.0.0.1")
@@ -470,7 +466,6 @@ func provideImageProcessorConfig(c *Config) imaging.Config {
 		MaxPixels:        c.Imaging.MaxPixels,
 		Concurrency:      c.Imaging.Concurrency,
 		ThumbnailMaxSize: image.Pt(360, 480),
-		ImageMagickPath:  c.ImageMagick,
 	}
 }
 

router/utils/process_image.go

@@ -13,7 +13,6 @@ import (
 	"github.com/traPtitech/traQ/router/extension/herror"
 	"github.com/traPtitech/traQ/service/file"
 	imaging2 "github.com/traPtitech/traQ/service/imaging"
-	"github.com/traPtitech/traQ/utils/imaging"
 )
 
 const (
@@ -71,7 +70,7 @@ func saveUploadImage(p imaging2.Processor, c echo.Context, m file.Manager, name
 		}
 
 		// PNGに変換
-		var b = bytes.Buffer{}
+		b := bytes.Buffer{}
 		if err := png.Encode(&b, img); err != nil {
 			return uuid.Nil, herror.InternalServerError(err)
 		}
@@ -86,10 +85,7 @@ func saveUploadImage(p imaging2.Processor, c echo.Context, m file.Manager, name
 		b, err := p.FitAnimationGIF(src, maxImageSize, maxImageSize)
 		if err != nil {
 			switch err {
-			case imaging.ErrImageMagickUnavailable:
-				// gifは一時的にサポートされていない
-				return uuid.Nil, herror.BadRequest("gif file is temporarily unsupported")
-			case imaging2.ErrInvalidImageSrc, imaging2.ErrTimeout:
+			case imaging2.ErrInvalidImageSrc:
 				// 不正なgifである
 				return uuid.Nil, herror.BadRequest(badImage)
 			default:

router/v1/router_test.go

@@ -61,7 +61,6 @@ func TestMain(m *testing.M) {
 			MaxPixels:        1000 * 1000,
 			Concurrency:      1,
 			ThumbnailMaxSize: image.Pt(360, 480),
-			ImageMagickPath:  "",
 		})
 		env.FileManager, _ = file.InitFileManager(env.Repository, storage.NewInMemoryFileStorage(), env.ImageProcessor, zap.NewNop())
 

router/v3/router_test.go

@@ -109,7 +109,6 @@ func TestMain(m *testing.M) {
 			MaxPixels:        1000 * 1000,
 			Concurrency:      1,
 			ThumbnailMaxSize: image.Pt(360, 480),
-			ImageMagickPath:  "",
 		})
 		env.FM, _ = file.InitFileManager(repo, storage.NewInMemoryFileStorage(), env.IP, l.Named("FM"))
 

service/imaging/config.go

@@ -8,7 +8,6 @@ import (
 var (
 	ErrPixelLimitExceeded = errors.New("the image exceeds max pixels limit")
 	ErrInvalidImageSrc    = errors.New("invalid image src")
-	ErrTimeout            = errors.New("processing timeout")
 )
 
 type Config struct {
@@ -19,6 +18,4 @@ type Config struct {
 	Concurrency int
 	// ThumbnailMaxSize サムネイル画像サイズ
 	ThumbnailMaxSize image.Point
-	// ImageMagickPath imagemagickの実行パス
-	ImageMagickPath string
 }

service/imaging/mks2013_filter.go

@@ -4,23 +4,34 @@ import (
 	"math"
 
 	"github.com/disintegration/imaging"
+	"golang.org/x/image/draw"
 )
 
-// Magic Kernel Sharp 2013
-// http://johncostella.com/magic/
-var mks2013Filter = imaging.ResampleFilter{
-	Support: 2.5,
-	Kernel: func(x float64) float64 {
-		x = math.Abs(x)
-		if x >= 2.5 {
-			return 0.0
-		}
-		if x >= 1.5 {
-			return -0.125 * (x - 2.5) * (x - 2.5)
-		}
-		if x >= 0.5 {
-			return 0.25 * (4*x*x - 11*x + 7)
-		}
-		return 1.0625 - 1.75*x*x
-	},
-}
+var (
+	// Magic Kernel Sharp 2013
+	// http://johncostella.com/magic/
+	mks2013Filter = imaging.ResampleFilter{
+		Support: 2.5,
+		Kernel: func(x float64) float64 {
+			x = math.Abs(x)
+			if x >= 2.5 {
+				return 0.0
+			}
+			if x >= 1.5 {
+				return -0.125 * (x - 2.5) * (x - 2.5)
+			}
+			if x >= 0.5 {
+				return 0.25 * (4*x*x - 11*x + 7)
+			}
+			return 1.0625 - 1.75*x*x
+		},
+	}
+
+	// mks2013Filterのdraw.Kernelへの型キャスト
+	// Magic Kernel Sharp 2013
+	// http://johncostella.com/magic/
+	mks2013FilterKernel = draw.Kernel{
+		Support: mks2013Filter.Support,
+		At:      mks2013Filter.Kernel,
+	}
+)

service/imaging/processor_default.go

@@ -5,17 +5,19 @@ import (
 	"context"
 	"fmt"
 	"image"
+	"image/gif"
 	_ "image/jpeg" // image.Decode用
 	_ "image/png"  // image.Decode用
 	"io"
-	"time"
+	"math"
 
 	_ "golang.org/x/image/webp" // image.Decode用
 
 	"github.com/disintegration/imaging"
 	"github.com/go-audio/wav"
 	"github.com/hajimehoshi/go-mp3"
 	"github.com/motoki317/go-waveform"
+	"golang.org/x/image/draw"
 	"golang.org/x/sync/semaphore"
 
 	imaging2 "github.com/traPtitech/traQ/utils/imaging"
@@ -72,22 +74,50 @@ func (p *defaultProcessor) Fit(src io.ReadSeeker, width, height int) (image.Imag
 	return orig, nil
 }
 
-func (p *defaultProcessor) FitAnimationGIF(src io.Reader, width, height int) (*bytes.Reader, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) // 10秒以内に終わらないファイルは無効
-	defer cancel()
-
-	b, err := imaging2.ResizeAnimationGIF(ctx, p.c.ImageMagickPath, src, width, height, false)
+func (p *defaultProcessor) FitAnimationGIF(srcFile io.Reader, width, height int) (*bytes.Reader, error) {
+	src, err := gif.DecodeAll(srcFile)
 	if err != nil {
-		switch err {
-		case context.DeadlineExceeded:
-			return nil, ErrTimeout
-		case imaging2.ErrInvalidImageSrc:
-			return nil, ErrInvalidImageSrc
-		default:
-			return nil, err
-		}
+		return nil, ErrInvalidImageSrc
+	}
+
+	srcWidth, srcHeight := src.Config.Width, src.Config.Height
+	// 画素数チェック
+	if srcWidth*srcHeight > p.c.MaxPixels {
+		return nil, ErrPixelLimitExceeded
 	}
-	return b, nil
+	// 画像が十分小さければスキップ
+	if srcWidth <= width && srcHeight <= height {
+		return imaging2.GifToBytesReader(src)
+	}
+
+	// 元の比率を保つよう調整
+	floatSrcWidth, floatSrcHeight, floatWidth, floatHeight := float64(srcWidth), float64(srcHeight), float64(width), float64(height)
+	if floatSrcWidth/floatSrcHeight > floatWidth/floatHeight {
+		height = int(math.Round(floatSrcHeight * floatWidth / floatSrcWidth))
+	} else if floatSrcWidth/floatSrcHeight < floatWidth/floatHeight {
+		width = int(math.Round(floatSrcWidth * floatHeight / floatSrcHeight))
+	}
+
+	dst := &gif.GIF{
+		Delay:     src.Delay,
+		LoopCount: src.LoopCount,
+		Disposal:  src.Disposal,
+		Config: image.Config{
+			ColorModel: src.Config.ColorModel,
+			Width:      width,
+			Height:     height,
+		},
+		BackgroundIndex: src.BackgroundIndex,
+	}
+
+	targetBounds := image.Rect(0, 0, width, height)
+	for _, frame := range src.Image {
+		destFrame := image.NewPaletted(targetBounds, frame.Palette)
+		mks2013FilterKernel.Scale(destFrame, targetBounds, frame, frame.Bounds(), draw.Src, nil)
+		dst.Image = append(dst.Image, destFrame)
+	}
+
+	return imaging2.GifToBytesReader(dst)
 }
 
 func (p *defaultProcessor) WaveformMp3(src io.ReadSeeker, width, height int) (r io.Reader, err error) {

service/imaging/processor_default_test.go

@@ -26,7 +26,6 @@ func setup() (Processor, *os.File) {
 		MaxPixels:        500 * 500,
 		Concurrency:      1,
 		ThumbnailMaxSize: image.Point{50, 50},
-		ImageMagickPath:  "",
 	})
 	return processor, mustOpen("test.png")
 }

utils/imaging/gif.go

@@ -0,0 +1,15 @@
+package imaging
+
+import (
+	"bytes"
+	"image/gif"
+)
+
+// GifToBytesReader GIF画像を*bytes.Readerに書き出します
+func GifToBytesReader(src *gif.GIF) (*bytes.Reader, error) {
+	buf := new(bytes.Buffer)
+	if err := gif.EncodeAll(buf, src); err != nil {
+		return nil, err
+	}
+	return bytes.NewReader(buf.Bytes()), nil
+}