ires 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 251701d58fac515d1934c13b3918f2f8b2bc78de
-  data.tar.gz: 1896850d80b1efacc2e2c9d30fdea8c54554090a
+  metadata.gz: c60cd16be066b1b90bb6f5245891d53fc4b85145
+  data.tar.gz: 0ada5ab904e40c026a37cd7b6f97d0494ceaadb3
 SHA512:
-  metadata.gz: 53ce5e4d3f6772cc8e0693ba100ccfc597c1dc45b66cfb12725e654086e5f568e68b3f596e6ed6edf48e837def11d480ce2ae8a5848953da8aa27bf1958a3bd4
-  data.tar.gz: c51b9cac6a3057f9cb61c0be82e0590a5e0413f59cfebe6e61bd3b6aa4e4270dfd09b5d2125f19bd0c7600822b67c4116a25a63a2e4391a08cb707b0be5c461f
+  metadata.gz: a163c28c0d024e8cc28037f27b6f243c8676c219b204111775f9e7e8639e9a9e576ae5bd2acf7751d48cd92e7376a99defcf543121f8f59222545b3d38940d52
+  data.tar.gz: d6130e58d10d07b0155f1719c506508f138cdbe8a83823affabedc23a539affd46c292f71c8beca4236d98de9386d1065c19d3efb62e969da67045cd30f1e86a

data/README.md

@@ -34,43 +34,30 @@ Default: **30days**
 
 ### Saved directory
 
+####  Target image is local
+
 ```
-.
-└──  public
-    ├── image.jpg
-    └── ires
-        ├── crop
-        │   ├── 150x150
-        │   │   └── 20171012_image.jpg
-        │   ├── 200x170
-        │   │   └── 20171019_image.jpg
-        │   ├── 400x300
-        │   │   └── 20171028_image.jpg
-        │   └── 640x480
-        │       └── 20171005_image.jpg
-        ├── original
-        │   └── original
-        ├── resize
-        │   ├── 150x150
-        │   │   └── 20171012_image.jpg
-        │   ├── 200x170
-        │   │   └── 20171019_image.jpg
-        │   ├── 400x300
-        │   │   └── 20171028_image.jpg
-        │   └── 640x480
-        │       └── 20171005_image.jpg
-        └── resize_to_crop
-            ├── 150x150
-            │   └── 20171012_image.jpg
-            ├── 200x170
-            │   └── 20171019_image.jpg
-            ├── 400x300
-            │   └── 20171028_image.jpg
-            └── 640x480
-                └── 20171005_image.jpg
+public
+├── image.jpg
+└── ires
+    ├── crop
+    │   ├── 20171019_image_120x90_crop.jpg
+    │   ├── 20171117_image_200x200_crop.jpg
+    │   └── 20171117_image_400x300_crop.jpg
+    ├── resize
+    │   ├── 20171019_image_120x90_resize.jpg
+    │   ├── 20171117_image_200x200_resize.jpg
+    │   └── 20171117_image_400x300_resize.jpg
+    └── resize_to_crop
+        ├── 20171019_image_120x90_resize_to_crop.jpg
+        ├── 20171117_image_200x200_resize_to_crop.jpg
+        └── 20171117_image_400x300_resize_to_crop.jpg
 ```
 
-`original` directory where downloaded images are saved.
+#### Target image is http
+
+Parse URL & Create directory by parse URL.
+
 
 ## Installation
 Add this line to your application's Gemfile:
@@ -97,34 +84,34 @@ $ gem install ires
 
 ## Development
 
-環境はDockerで準備しています
+Docker environment.
 
 ```shell
 $ docker build -t ires:v1 .
 
-# コンテナに入る
+# Into the ires container.
 $ docker run -it -v $(pwd):/go/src/github.com/endotakuya/ires -p 3000:3000 ires:v1 /bin/bash
 ```
 
-## Gemテスト
+## Gem test
 
-以下、コンテナ内の作業になります
+Working in ires container.
 
-### 1. Go（shared objectの作成）
+### 1. Go（Create a shared object）
 
-パッケージ管理は[dep](https://github.com/golang/dep)を使っています
+Package manager is [dep](https://github.com/golang/dep).
 
 ```shell
-# パッケージの依存関係を解決
+# Dependent resolution
 $ dep ensure
 
-# shared object として出力する
+# Output to a shared object.
 $ CGO_ENABLED=1 GOOS=linux go build -v -buildmode=c-shared -o shared/linux/ires.so ext/main.go
 ```
-※ 現状のDockerでは、linux環境のみbuildができます  
-※ 他の環境でbuildしたい場合はGCCを追加するか、ホスト側でGoを導入してbuildしてください🙇
+※ In the current Docker, you can build only linux environment.  
+※ If you want to build in other environments, add GCC or install Go on the host side.🙇
 
-### 2. Railsアプリの起動
+### 2. Start rails server
 
 ```shell
 $ test/dummy/bin/rails s -b 0.0.0.0

data/ext/Gopkg.lock

@@ -1,6 +1,24 @@
 # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
 
 
+[[projects]]
+  name = "github.com/PuerkitoBio/purell"
+  packages = ["."]
+  revision = "0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4"
+  version = "v1.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/PuerkitoBio/urlesc"
+  packages = ["."]
+  revision = "de5bf2ad457846296e2031421a34e2568e304e35"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/goware/urlx"
+  packages = ["."]
+  revision = "e22571dfbd216d3ca34207d9a1d877f38d8f051c"
+
 [[projects]]
   branch = "master"
   name = "github.com/nfnt/resize"
@@ -13,9 +31,21 @@
   revision = "5cd9c24de6524b7251ac6b8600b0ba8f43a85963"
   version = "v0.2.0"
 
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = ["idna"]
+  revision = "1087133bc4af3073e18add999345c6ae75918503"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/text"
+  packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"]
+  revision = "c01e4764d870b77f8abe5096ee19ad20d80e8075"
+
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "555c9d2045607d7c797b9ed9663b0c2916aa91b14b6001e4119e9be49a742484"
+  inputs-digest = "3d6ab4a2e0add98d17152b4fad7a36186d53460b01e73cab8f775b505ce51736"
   solver-name = "gps-cdcl"
   solver-version = 1

data/ext/ires/image.go

@@ -0,0 +1,227 @@
+package ires
+
+import (
+	"bytes"
+	"image"
+	"image/gif"
+	"image/jpeg"
+	"image/png"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"path"
+	"time"
+
+	"github.com/nfnt/resize"
+	"github.com/oliamb/cutter"
+)
+
+
+// Input image
+func InputImage(i *Ires) (image.Image, string, bool) {
+	if i.IsLocal {
+		img, format := LocalImage(i.Uri)
+		return img, format, true
+	} else {
+		return DownloadImage(i)
+	}
+}
+
+
+// Save http image
+func DownloadImage(i *Ires) (image.Image, string, bool) {
+	res, err := http.Get(i.Uri)
+	if err != nil {
+		panic(err)
+	}
+	defer res.Body.Close()
+
+	header, r := CopyReader(res.Body)
+	format := FormatSearch(r)
+
+	img, _, err := image.Decode(io.MultiReader(header, res.Body))
+	if err != nil {
+		return nil, "", false
+	}
+	return CreateImage(img, i.ImagePath(IMAGE_MODE_ORIGINAL), format), format, true
+}
+
+
+func CreateImage(img image.Image, path, format string) image.Image {
+	file, err := os.Create(path)
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+
+	switch format {
+	case "jpeg":
+		jpeg.Encode(file, img, nil)
+	case "png":
+		png.Encode(file, img)
+	case "gif":
+		gif.Encode(file, img, nil)
+	default:
+		jpeg.Encode(file, img, nil)
+	}
+	return img
+}
+
+
+// Load image
+func LocalImage(uri string) (image.Image, string) {
+	file, err := os.Open(uri)
+	if err != nil{
+		panic(err)
+	}
+	defer file.Close()
+
+	// Decode jpeg into image.Image
+	header, r := CopyReader(file)
+	format := FormatSearch(r)
+
+	img, _, err := image.Decode(io.MultiReader(header, file))
+	if err != nil {
+		panic(err)
+	}
+	return img, format
+}
+
+
+// Resizing & Cropping
+func ResizeToCrop(i *Ires, inputImg image.Image) image.Image {
+	var outputImg image.Image
+	var imagePath string
+	if i.IsLocal {
+		imagePath = i.Uri
+	} else {
+		imagePath = i.ImagePath(IMAGE_MODE_ORIGINAL)
+	}
+	isAsp, conf := IsValidAspectRatio(imagePath, i.Size)
+
+	width  := i.Size.Width
+	height := i.Size.Height
+
+	if isAsp {
+		outputImg = resize.Resize(uint(width), uint(height), inputImg, resize.Lanczos3)
+	} else {
+		var resizeImg image.Image
+
+		// Resize
+		mode := ResizeMode(conf, i.Size)
+		switch mode {
+		case 1, 3:
+			resizeImg = resize.Resize(uint(width), 0, inputImg, resize.Lanczos3)
+		case 2, 4:
+			resizeImg = resize.Resize(0, uint(height), inputImg, resize.Lanczos3)
+		default:
+			resizeImg = inputImg
+		}
+
+		// Cropping
+		outputImg, _ = cutter.Crop(resizeImg, cutter.Config{
+			Width:  width,
+			Height: height,
+			Mode: cutter.Centered,
+			Options: cutter.Copy,
+		})
+
+	}
+	return outputImg
+}
+
+
+// Check expiration date
+func (i *Ires) DeleteExpireImage(mode int) {
+	today := time.Now().Format("20060102")
+	dir := i.ReadImageDir(mode)
+	files, err := ioutil.ReadDir(dir)
+	if err != nil {
+		return
+	}
+
+	for _, file := range files {
+		findName := file.Name()
+		matched,_ := path.Match(today + "_*", findName)
+		if matched {
+			DeleteImage(path.Join(dir, findName))
+		}
+	}
+}
+
+
+// Delete image
+func DeleteImage(path string) {
+	_, err := os.Stat(path)
+	if err == nil {
+		if err := os.Remove(path); err != nil {
+			panic(err)
+		}
+	}
+}
+
+
+// Verify aspect ratio
+func IsValidAspectRatio(path string, s Size) (bool, image.Config) {
+	conf := ImageConfig(path)
+	aspH := (conf.Height * s.Width) / conf.Width
+	if aspH == s.Height {
+		return true, conf
+	} else {
+		return false, conf
+	}
+}
+
+
+// Image config
+func ImageConfig(path string) image.Config {
+	file, err := os.Open(path)
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+
+	conf, _, err := image.DecodeConfig(file)
+	if err != nil {
+		panic(err)
+	}
+	return conf
+}
+
+
+// Select image resize mode
+func ResizeMode(conf image.Config, s Size) int {
+	srcWidth  := s.Width
+	srcHeight := s.Height
+
+	if conf.Width >= conf.Height && srcWidth >= srcHeight {
+		return 1
+	} else if conf.Width >= conf.Height && srcWidth < srcHeight {
+		return 2
+	} else if conf.Width < conf.Height && srcWidth >= srcHeight {
+		return 3
+	} else if conf.Width < conf.Height && srcWidth < srcHeight {
+		return 4
+	}
+	return 0
+}
+
+
+// Search image format
+// if defined, return "jpeg"
+func FormatSearch(r io.Reader) string{
+	_, format, err := image.DecodeConfig(r)
+	if err != nil {
+		return "jpeg"
+	}
+	return format
+}
+
+
+// Copy Reader
+func CopyReader(body io.Reader) (io.Reader, io.Reader) {
+	header := bytes.NewBuffer(nil)
+	r := io.TeeReader(body, header)
+	return header, r
+}

data/ext/ires/ires.go

@@ -1,10 +1,6 @@
 package ires
 
 import (
-	"strings"
-
-	"github.com/endotakuya/ires/ext/operate"
-	"github.com/endotakuya/ires/ext/util/uri"
 	"github.com/nfnt/resize"
 	"github.com/oliamb/cutter"
 )
@@ -16,99 +12,91 @@ const (
 	IMAGE_MODE_ORIGINAL
 )
 
-type Request struct {
-	Uri 	string
-	Width 	int
-	Height 	int
-	Dir 	string
-	Expire 	string
+type Size struct {
+	Width, Height int
+}
+
+type Ires struct {
+	Uri 		string
+	Size
+	Dir 		string
+	Expire 		string
+	IsLocal 	bool
 }
 
 
-func (r *Request) Resize() string {
-	size := []int{r.Width, r.Height}
+func (i *Ires) Resize() string {
+	// Check image type
+	i.IsLocalFile()
 
 	// Delete the expiration date image
-	util.DeleteExpireImage(r.Uri, r.Dir, IMAGE_MODE_RESIZE, size...)
+	i.DeleteExpireImage(IMAGE_MODE_RESIZE)
 
-	path := r.fullPath(IMAGE_MODE_RESIZE)
+	distPath := i.ImagePath(IMAGE_MODE_RESIZE)
 	// When the image exists, return the image path
-	if util.IsExistsImage(path) {
-		return r.imagePath(path)
+	if IsExistsImage(distPath) {
+		return i.TargetImagePath(distPath)
 	}
 
-	inputImg, format, isImageExist := operate.InputImage(r.Uri, r.originalFullPath())
+	inputImg, format, isImageExist := InputImage(i)
 	if !isImageExist {
-		return r.Uri
+		return i.Uri
 	}
 
-	outputImg 		:= resize.Resize(uint(r.Width), uint(r.Height), inputImg, resize.Lanczos3)
-	_, fullPath, _ 	:= operate.CreateImage(outputImg, path, format)
-
-	return r.imagePath(fullPath)
+	outputImg 		:= resize.Resize(uint(i.Width), uint(i.Height), inputImg, resize.Lanczos3)
+	CreateImage(outputImg, distPath, format)
+	return i.TargetImagePath(distPath)
 }
 
-func (r *Request) Crop() string {
-	size := []int{r.Width, r.Height}
+func (i *Ires) Crop() string {
+	// Check image type
+	i.IsLocalFile()
 
 	// Delete the expiration date image
-	util.DeleteExpireImage(r.Uri, r.Dir, IMAGE_MODE_CROP, size...)
+	i.DeleteExpireImage(IMAGE_MODE_CROP)
 
-	path := r.fullPath(IMAGE_MODE_CROP)
+	distPath := i.ImagePath(IMAGE_MODE_CROP)
 	// When the image exists, return the image path
-	if util.IsExistsImage(path) {
-		return r.imagePath(path)
+	if IsExistsImage(distPath) {
+		return i.TargetImagePath(distPath)
 	}
 
-	inputImg, format, isImageExist := operate.InputImage(r.Uri, r.originalFullPath())
+	inputImg, format, isImageExist := InputImage(i)
 	if !isImageExist {
-		return r.Uri
+		return i.Uri
 	}
 
 	outputImg, _ := cutter.Crop(inputImg, cutter.Config{
-		Width:  r.Width,
-		Height: r.Height,
+		Width:  i.Width,
+		Height: i.Height,
 		Mode: cutter.Centered,
 		Options: cutter.Copy,
 	})
-	_, fullPath, _ := operate.CreateImage(outputImg, path, format)
+	CreateImage(outputImg, distPath, format)
 
-	return r.imagePath(fullPath)
+	return i.TargetImagePath(distPath)
 }
 
-func (r *Request) ResizeToCrop() string {
-	size := []int{r.Width, r.Height}
+func (i *Ires) ResizeToCrop() string {
+	// Check image type
+	i.IsLocalFile()
 
 	// Delete the expiration date image
-	util.DeleteExpireImage(r.Uri, r.Dir, IMAGE_MODE_RESIZE_TO_CROP, size...)
+	i.DeleteExpireImage(IMAGE_MODE_RESIZE_TO_CROP)
 
-	path := r.fullPath(IMAGE_MODE_RESIZE_TO_CROP)
+	distPath := i.ImagePath(IMAGE_MODE_RESIZE_TO_CROP)
 	// When the image exists, return the image path
-	if util.IsExistsImage(path) {
-		return r.imagePath(path)
+	if IsExistsImage(distPath) {
+		return i.TargetImagePath(distPath)
 	}
 
-	originalImagePath := r.originalFullPath()
-	inputImg, format, isImageExist := operate.InputImage(r.Uri, originalImagePath)
+	inputImg, format, isImageExist := InputImage(i)
 	if !isImageExist {
-		return r.Uri
+		return i.Uri
 	}
 
-	outputImg 		:= operate.ResizeToCrop(originalImagePath, size, inputImg)
-	_, fullPath, _ 	:= operate.CreateImage(outputImg, path, format)
+	outputImg := ResizeToCrop(i ,inputImg)
+	CreateImage(outputImg, distPath, format)
 
-	return r.imagePath(fullPath)
+	return i.TargetImagePath(distPath)
 }
-
-func (r *Request) fullPath(mode int) string {
-	size := []int{ r.Width, r.Height }
-	return util.NewImagePath(r.Uri, r.Dir, r.Expire, mode, size...)
-}
-
-func (r *Request) originalFullPath() string {
-	return util.NewImagePath(r.Uri, r.Dir, r.Expire, IMAGE_MODE_ORIGINAL)
-}
-
-func (r *Request) imagePath(fullPath string) string {
-	return strings.Replace(fullPath, r.Dir, "", -1)
-}