-
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #77 from osspkg/add-images
Add images
- Loading branch information
Showing
22 changed files
with
248 additions
and
73 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ use ( | |
| ./errors | ||
| ./examples | ||
| ./geoip | ||
| ./graphics | ||
| ./iofile | ||
| ./iosync | ||
| ./ioutil | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| module go.osspkg.com/goppy/graphics | ||
|
|
||
| go 1.18 | ||
|
|
||
| replace ( | ||
| go.osspkg.com/goppy/errors => ../errors | ||
| go.osspkg.com/goppy/syscall => ../syscall | ||
| ) | ||
|
|
||
| require ( | ||
| go.osspkg.com/goppy/errors v0.1.2 | ||
| golang.org/x/image v0.15.0 | ||
| ) | ||
|
|
||
| require go.osspkg.com/goppy/syscall v0.1.3 // indirect |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8= | ||
| golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE= |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| /* | ||
| * Copyright (c) 2023 Mikhail Knyazhev <[email protected]>. All rights reserved. | ||
| * Use of this source code is governed by a BSD-3-Clause license that can be found in the LICENSE file. | ||
| */ | ||
|
|
||
| package graphics | ||
|
|
||
| import ( | ||
| "crypto/sha1" | ||
| "fmt" | ||
| "image" | ||
| "image/jpeg" | ||
| "image/png" | ||
| "io" | ||
| "os" | ||
| "path/filepath" | ||
| "strings" | ||
| "sync" | ||
|
|
||
| "go.osspkg.com/goppy/errors" | ||
| "golang.org/x/image/bmp" | ||
| "golang.org/x/image/draw" | ||
| "golang.org/x/image/tiff" | ||
| "golang.org/x/image/webp" | ||
| ) | ||
|
|
||
| var ( | ||
| ExtNotSupported = errors.New("ext is not supported") | ||
| ) | ||
|
|
||
| type ( | ||
| ImageScale struct { | ||
| folder string | ||
| cache map[string]ImageInfo | ||
| mux sync.Mutex | ||
| } | ||
|
|
||
| ImageInfo struct { | ||
| Hash string | ||
| Origin string | ||
| Scale string | ||
| Thumb string | ||
| } | ||
| ) | ||
|
|
||
| var decoders = map[string]func(r io.Reader) (image.Image, error){ | ||
| ".jpg": jpeg.Decode, | ||
| ".jpeg": jpeg.Decode, | ||
| ".png": png.Decode, | ||
| ".webp": webp.Decode, | ||
| ".bmp": bmp.Decode, | ||
| ".tiff": tiff.Decode, | ||
| } | ||
|
|
||
| func NewImageScale() *ImageScale { | ||
| return &ImageScale{ | ||
| folder: "", | ||
| cache: make(map[string]ImageInfo, 100), | ||
| } | ||
| } | ||
|
|
||
| func (v *ImageScale) SetFolder(dir string) error { | ||
| if err := os.MkdirAll(dir, 0755); err != nil { | ||
| return fmt.Errorf("create image folder: %w", err) | ||
| } | ||
| v.folder = dir | ||
| return nil | ||
| } | ||
|
|
||
| func (v *ImageScale) Build(filename string, scale, thumb int) (*ImageInfo, error) { | ||
| var err error | ||
| img := &ImageInfo{} | ||
|
|
||
| if img.Hash, err = v.getHash(filename); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| v.mux.Lock() | ||
| i, ok := v.cache[img.Hash] | ||
| v.mux.Unlock() | ||
| if ok { | ||
| return &i, nil | ||
| } | ||
|
|
||
| if img.Origin, err = v.resize(filename, img.Hash+".orig", 0); err != nil { | ||
| return nil, err | ||
| } | ||
| if img.Scale, err = v.resize(filename, img.Hash+".scale", scale); err != nil { | ||
| return nil, err | ||
| } | ||
| if img.Thumb, err = v.resize(filename, img.Hash+".thumb", thumb); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| v.mux.Lock() | ||
| v.cache[img.Hash] = *img | ||
| v.mux.Unlock() | ||
|
|
||
| return img, nil | ||
| } | ||
|
|
||
| func (v *ImageScale) resize(filename, suffix string, width int) (string, error) { | ||
| src, name, err := v.readFile(filename) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| x, y := v.scaleFactor(src.Bounds().Max.X, src.Bounds().Max.Y, width) | ||
| dst := image.NewNRGBA(image.Rect(0, 0, x, y)) | ||
| draw.CatmullRom.Scale(dst, dst.Rect, src, src.Bounds(), draw.Over, nil) | ||
| newFilename := fmt.Sprintf("%s-%s.png", name, suffix) | ||
| return newFilename, v.writeFile(v.folder+"/"+newFilename, dst) | ||
| } | ||
|
|
||
| func (v *ImageScale) scaleFactor(oW, oH, width int) (int, int) { | ||
| if width == 0 { | ||
| return oW, oH | ||
| } | ||
| oWF, oHF := float64(oW), float64(oH) | ||
| nWidth := float64(width) | ||
| scale := oWF / nWidth | ||
| return int(oWF / scale), int(oHF / scale) | ||
| } | ||
|
|
||
| func (v *ImageScale) writeFile(filename string, img image.Image) error { | ||
| file, err := os.Create(filename) | ||
| if err != nil { | ||
| return fmt.Errorf("write image `%s`: %w", filename, err) | ||
| } | ||
| if err = png.Encode(file, img); err != nil { | ||
| return errors.Wrap( | ||
| fmt.Errorf("encode image `%s`: %w", filename, err), | ||
| file.Close(), | ||
| ) | ||
| } | ||
| return file.Close() | ||
| } | ||
|
|
||
| func (v *ImageScale) readFile(filename string) (image.Image, string, error) { | ||
| ext := filepath.Ext(filename) | ||
| dec, ok := decoders[ext] | ||
| if !ok { | ||
| return nil, "", ExtNotSupported | ||
| } | ||
| file, err := os.Open(filename) | ||
| if err != nil { | ||
| return nil, "", fmt.Errorf("read image `%s`: %w", filename, err) | ||
| } | ||
| img, err := dec(file) | ||
| if err != nil { | ||
| return nil, "", errors.Wrap( | ||
| fmt.Errorf("decode image `%s`: %w", filename, err), | ||
| file.Close(), | ||
| ) | ||
| } | ||
| fi, err := file.Stat() | ||
| if err != nil { | ||
| return nil, "", errors.Wrap( | ||
| fmt.Errorf("info image `%s`: %w", filename, err), | ||
| file.Close(), | ||
| ) | ||
| } | ||
| if err = file.Close(); err != nil { | ||
| return nil, "", fmt.Errorf("close image `%s`: %w", filename, err) | ||
| } | ||
| return img, strings.Replace(fi.Name(), ext, "", 1), nil | ||
| } | ||
|
|
||
| func (v *ImageScale) getHash(filename string) (string, error) { | ||
| file, err := os.Open(filename) | ||
| if err != nil { | ||
| return "", fmt.Errorf("read image `%s`: %w", filename, err) | ||
| } | ||
| h := sha1.New() | ||
| if _, err = io.Copy(h, file); err != nil { | ||
| return "", errors.Wrap( | ||
| fmt.Errorf("calc hash image `%s`: %w", filename, err), | ||
| file.Close(), | ||
| ) | ||
| } | ||
| if err = file.Close(); err != nil { | ||
| return "", fmt.Errorf("close image `%s`: %w", filename, err) | ||
| } | ||
| return fmt.Sprintf("%x", h.Sum(nil)), nil | ||
| } |
Oops, something went wrong.