Refine the image cache things.

rest/matter_service.go

@@ -3,8 +3,6 @@ package rest
 import (
 	"errors"
 	"fmt"
-	"github.com/disintegration/imaging"
-	"image"
 	"io"
 	"mime"
 	"mime/multipart"
@@ -248,113 +246,6 @@ func (this *MatterService) Crawl(url string, filename string, user *User, puuid
 	return matter
 }
 
-//图片预处理功能。
-func (this *MatterService) ResizeImage(request *http.Request, filePath string) *image.NRGBA {
-
-	diskFile, err := os.Open(filePath)
-	this.PanicError(err)
-	defer diskFile.Close()
-
-	imageResizeM := request.FormValue("imageResizeM")
-	if imageResizeM == "" {
-		imageResizeM = "fit"
-	} else if imageResizeM != "fit" && imageResizeM != "fill" && imageResizeM != "fixed" {
-		panic("imageResizeM参数错误")
-	}
-	imageResizeWStr := request.FormValue("imageResizeW")
-	var imageResizeW int
-	if imageResizeWStr != "" {
-		imageResizeW, err = strconv.Atoi(imageResizeWStr)
-		this.PanicError(err)
-		if imageResizeW < 1 || imageResizeW > 4096 {
-			panic("缩放尺寸不能超过4096")
-		}
-	}
-	imageResizeHStr := request.FormValue("imageResizeH")
-	var imageResizeH int
-	if imageResizeHStr != "" {
-		imageResizeH, err = strconv.Atoi(imageResizeHStr)
-		this.PanicError(err)
-		if imageResizeH < 1 || imageResizeH > 4096 {
-			panic("缩放尺寸不能超过4096")
-		}
-	}
-
-	//单边缩略
-	if imageResizeM == "fit" {
-		//将图缩略成宽度为100，高度按比例处理。
-		if imageResizeW > 0 {
-			src, err := imaging.Decode(diskFile)
-			this.PanicError(err)
-			return imaging.Resize(src, imageResizeW, 0, imaging.Lanczos)
-
-		} else if imageResizeH > 0 {
-			//将图缩略成高度为100，宽度按比例处理。
-			src, err := imaging.Decode(diskFile)
-			this.PanicError(err)
-			return imaging.Resize(src, 0, imageResizeH, imaging.Lanczos)
-
-		} else {
-			panic("单边缩略必须指定imageResizeW或imageResizeH")
-		}
-	} else if imageResizeM == "fill" {
-		//固定宽高，自动裁剪
-		if imageResizeW > 0 && imageResizeH > 0 {
-			src, err := imaging.Decode(diskFile)
-			this.PanicError(err)
-			return imaging.Fill(src, imageResizeW, imageResizeH, imaging.Center, imaging.Lanczos)
-
-		} else {
-			panic("固定宽高，自动裁剪 必须同时指定imageResizeW和imageResizeH")
-		}
-	} else if imageResizeM == "fixed" {
-		//强制宽高缩略
-		if imageResizeW > 0 && imageResizeH > 0 {
-			src, err := imaging.Decode(diskFile)
-			this.PanicError(err)
-			return imaging.Resize(src, imageResizeW, imageResizeH, imaging.Lanczos)
-
-		} else {
-			panic("强制宽高缩略必须同时指定imageResizeW和imageResizeH")
-		}
-	} else {
-		panic("不支持" + imageResizeM + "处理模式")
-	}
-}
-
-//下载处理后的图片
-func (this *MatterService) DownloadImage(writer http.ResponseWriter, fileWriter io.Writer, dstImage *image.NRGBA, filename string) {
-
-	// 防止中文乱码
-	fileName := url.QueryEscape(filename)
-	mimeType := GetMimeType(fileName)
-	writer.Header().Set("Content-Type", mimeType)
-
-	//当前的文件是否是图片，只有图片才能处理。
-	extension := GetExtension(filename)
-	formats := map[string]imaging.Format{
-		".jpg":  imaging.JPEG,
-		".jpeg": imaging.JPEG,
-		".png":  imaging.PNG,
-		".tif":  imaging.TIFF,
-		".tiff": imaging.TIFF,
-		".bmp":  imaging.BMP,
-		".gif":  imaging.GIF,
-	}
-
-	format, ok := formats[extension]
-	if !ok {
-		panic("该图片格式不支持处理")
-	}
-
-	err := imaging.Encode(writer, dstImage, format)
-	this.PanicError(err)
-
-	//处理后的图片存放在本地
-	err = imaging.Encode(fileWriter, dstImage, format)
-	this.PanicError(err)
-}
-
 // httpRange specifies the byte range to be sent to the client.
 type httpRange struct {
 	start, length int64