Compare commits

...

27 Commits

Author SHA1 Message Date
Ralph Slooten
74cb212d22 Merge tag '0.2.3' into develop
Release 0.2.3
2024-04-23 16:39:30 +12:00
Ralph Slooten
1a6942417b Merge branch 'release/0.2.3' 2024-04-23 16:39:28 +12:00
Ralph Slooten
2444204b32 0.2.3 2024-04-23 16:38:46 +12:00
Ralph Slooten
423ebc1494 Update README 2024-04-23 16:38:46 +12:00
Ralph Slooten
e5ecbe9bdf Switch to kovidgoyal/imaging to address CVE-2023-36308 2024-04-23 16:38:38 +12:00
Ralph Slooten
cc2b9d6b88 Merge tag '0.2.2' into develop
Release 0.2.2
2023-11-10 16:41:24 +13:00
Ralph Slooten
db2f3b8534 Merge branch 'release/0.2.2' 2023-11-10 16:41:22 +13:00
Ralph Slooten
b9e5afefd4 Merge branch 'feature/copy-exif' into develop 2023-11-10 16:40:21 +13:00
Ralph Slooten
e8f5085a11 0.2.2 2023-11-10 16:40:00 +13:00
Ralph Slooten
6956f5fb08 Update Go modules 2023-11-10 16:39:53 +13:00
Ralph Slooten
e55c5de522 Optionally preserve exif data 2023-11-10 16:39:41 +13:00
Ralph Slooten
75ca6b7017 Update Go libs 2023-10-07 22:44:32 +13:00
Ralph Slooten
ea2d490686 Use os.CreateTemp() rather than ioutil.TempFile() 2023-10-07 22:43:58 +13:00
Ralph Slooten
e8c7298c9c Merge tag '0.2.1' into develop
Release 0.2.1
2023-02-25 23:08:28 +13:00
Ralph Slooten
bb18d90d0e Merge branch 'release/0.2.1' 2023-02-25 23:08:26 +13:00
Ralph Slooten
90240fef3b Remove darwin 386 builds 2023-02-25 23:07:06 +13:00
Ralph Slooten
2b1b34a4e0 Merge tag '0.2.1' into develop
Release 0.2.1
2023-02-25 23:05:27 +13:00
Ralph Slooten
529ea6971c Merge branch 'release/0.2.1' 2023-02-25 23:05:23 +13:00
Ralph Slooten
4fa6fed8c9 0.2.1 2023-02-25 23:05:01 +13:00
Ralph Slooten
745bed1273 Update core modules 2023-02-25 23:04:02 +13:00
Ralph Slooten
d3cd263300 Fix typo 2022-04-22 22:48:04 +12:00
Ralph Slooten
88af2a0a0c Merge tag '0.2.0' into develop
Release 0.2.0
2019-12-13 23:13:14 +13:00
Ralph Slooten
fbb22582d1 Merge branch 'release/0.2.0' 2019-12-13 23:13:12 +13:00
Ralph Slooten
adac20101d 0.2.0 2019-12-13 23:12:57 +13:00
Ralph Slooten
521f3f24c1 Add threaded option 2019-12-13 22:21:00 +13:00
Ralph Slooten
3f9f09880c Update changelog 2019-11-03 19:21:18 +13:00
Ralph Slooten
eadd535e4c Merge tag '0.1.0' into develop
Release 0.1.0
2019-11-03 19:18:39 +13:00
8 changed files with 278 additions and 36 deletions

View File

@ -1,6 +1,27 @@
# Changelog
## [dev]
## [0.2.3]
- Switch to kovidgoyal/imaging to address CVE-2023-36308
## [0.2.2]
- Optionally preserve exif data for supported formats
- Update Go modules
## [0.2.1]
- Update core modules
## [0.2.0]
- Add threaded option (`-t`) to use all CPU cores
## [0.1.0]
- Switch to go mods - go (>= 1.11 required)
- Switch to axllent/semver for app updating

View File

@ -20,4 +20,4 @@ release:
$(call build,linux,arm)
$(call build,linux,arm64)
$(call build,darwin,amd64)
$(call build,darwin,386)
$(call build,darwin,arm64)

View File

@ -35,6 +35,7 @@ Options:
-m, --max string downscale to a maximum width & height in pixels (<width>x<height>)
-o, --out string output directory (default overwrites original)
-p, --preserve preserve file modification times (default true)
-t, --threaded run multi-threaded (use all CPU cores)
-u, --update update to latest release
-v, --version show version number
-h, --help show help
@ -61,7 +62,7 @@ Download the appropriate binary from the [releases](https://github.com/axllent/g
### Build requirements
Go >= 1.11 required.
Go >= 1.21 required.
```
go get github.com/axllent/goptimize

171
exifcopy.go Normal file
View File

@ -0,0 +1,171 @@
// https://stackoverflow.com/a/76779756
package main
import (
"bufio"
"errors"
"io"
"os"
)
const (
soi = 0xD8
eoi = 0xD9
sos = 0xDA
exif = 0xE1
copyright = 0xEE
comment = 0xFE
)
func isMetaTagType(tagType byte) bool {
// Adapt as needed
return tagType == exif || tagType == copyright || tagType == comment
}
func copySegments(dst *bufio.Writer, src *bufio.Reader, filterSegment func(tagType byte) bool) error {
var buf [2]byte
_, err := io.ReadFull(src, buf[:])
if err != nil {
return err
}
if buf != [2]byte{0xFF, soi} {
return errors.New("expected SOI")
}
for {
_, err := io.ReadFull(src, buf[:])
if err != nil {
return err
}
if buf[0] != 0xFF {
return errors.New("invalid tag type")
}
if buf[1] == eoi {
// Hacky way to check for EOF
_, err := src.Read(buf[:1])
if err != nil && err != io.EOF {
return err
}
// don't return an error as some cameras add the exif data at the end.
// if n > 0 {
// return errors.New("EOF expected after EOI")
// }
return nil
}
sos := buf[1] == 0xDA
filter := filterSegment(buf[1])
if filter {
_, err = dst.Write(buf[:])
if err != nil {
return err
}
}
_, err = io.ReadFull(src, buf[:])
if err != nil {
return err
}
if filter {
_, err = dst.Write(buf[:])
if err != nil {
return err
}
}
// Note: Includes the length, but not the tag, so subtract 2
tagLength := ((uint16(buf[0]) << 8) | uint16(buf[1])) - 2
if filter {
_, err = io.CopyN(dst, src, int64(tagLength))
} else {
_, err = src.Discard(int(tagLength))
}
if err != nil {
return err
}
if sos {
// Find next tag `FF xx` in the stream where `xx != 0` to skip ECS
// See https://stackoverflow.com/questions/2467137/parsing-jpeg-file-format-format-of-entropy-coded-segments-ecs
for {
bytes, err := src.Peek(2)
if err != nil {
return err
}
if bytes[0] == 0xFF {
data, rstMrk := bytes[1] == 0, bytes[1] >= 0xD0 && bytes[1] <= 0xD7
if !data && !rstMrk {
break
}
}
if filter {
err = dst.WriteByte(bytes[0])
if err != nil {
return err
}
}
_, err = src.Discard(1)
if err != nil {
return err
}
}
}
}
}
func copyMetadata(outImagePath, imagePath, metadataImagePath string) error {
outFile, err := os.Create(outImagePath)
if err != nil {
return err
}
defer outFile.Close()
writer := bufio.NewWriter(outFile)
imageFile, err := os.Open(imagePath)
if err != nil {
return err
}
defer imageFile.Close()
imageReader := bufio.NewReader(imageFile)
metaFile, err := os.Open(metadataImagePath)
if err != nil {
return err
}
defer metaFile.Close()
metaReader := bufio.NewReader(metaFile)
_, err = writer.Write([]byte{0xFF, soi})
if err != nil {
return err
}
// Copy metadata segments
// It seems that they need to come first!
err = copySegments(writer, metaReader, isMetaTagType)
if err != nil {
return err
}
// Copy all non-metadata segments
err = copySegments(writer, imageReader, func(tagType byte) bool {
return !isMetaTagType(tagType)
})
if err != nil {
return err
}
_, err = writer.Write([]byte{0xFF, eoi})
if err != nil {
return err
}
// Flush the writer, otherwise the last couple buffered writes (including the EOI) won't get written!
return writer.Flush()
}
func exifCopy(fromPath, toPath string) error {
copyPath := toPath + "~"
err := os.Rename(toPath, copyPath)
if err != nil {
return err
}
defer os.Remove(copyPath)
return copyMetadata(toPath, copyPath, fromPath)
}

12
go.mod
View File

@ -1,10 +1,14 @@
module github.com/axllent/goptimize
go 1.13
go 1.21
toolchain go1.22.2
require (
github.com/axllent/ghru v1.1.3
github.com/disintegration/imaging v1.6.1
github.com/axllent/ghru v1.2.1
github.com/kovidgoyal/imaging v1.6.3
github.com/spf13/pflag v1.0.5
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8
golang.org/x/image v0.15.0
)
require github.com/axllent/semver v0.0.1 // indirect

18
go.sum
View File

@ -1,12 +1,10 @@
github.com/axllent/ghru v1.1.3 h1:n0jYsuqCYaHHAR6DraXZl8hpBY4j0XV47y5Lyym/jGo=
github.com/axllent/ghru v1.1.3/go.mod h1:rFvMhcO1UAv2Cv6bXscS8EOc7qqNpfe8ZLp23utzs88=
github.com/axllent/semver v0.0.0-20191103011746-394cefa91ee9 h1:LHNcCfePzgC/agAJs5a/5K3hFo8uW04bEdDKDkoX4do=
github.com/axllent/semver v0.0.0-20191103011746-394cefa91ee9/go.mod h1:2xSPzvG8n9mRfdtxSvWvfTfQGWfHsMsHO1iZnKATMSc=
github.com/disintegration/imaging v1.6.1 h1:JnBbK6ECIZb1NsWIikP9pd8gIlTIRx7fuDNpU9fsxOE=
github.com/disintegration/imaging v1.6.1/go.mod h1:xuIt+sRxDFrHS0drzXUlCJthkJ8k7lkkUojDSR247MQ=
github.com/axllent/ghru v1.2.1 h1:PuJQQeILJJ42O9nvjTwObWQGZDyZ9/F71st9jNAqgoU=
github.com/axllent/ghru v1.2.1/go.mod h1:YgznIILRJpnII5x8N080q/G8Milzk3sy9Sh4dV1eGQw=
github.com/axllent/semver v0.0.1 h1:QqF+KSGxgj8QZzSXAvKFqjGWE5792ksOnQhludToK8E=
github.com/axllent/semver v0.0.1/go.mod h1:2xSPzvG8n9mRfdtxSvWvfTfQGWfHsMsHO1iZnKATMSc=
github.com/kovidgoyal/imaging v1.6.3 h1:iNPpv7ygiaB/NOztc6APMT7yr9UwBS+rOZwIbAdtyY8=
github.com/kovidgoyal/imaging v1.6.3/go.mod h1:sHvcLOOVhJuto2IoNdPLEqnAUoL5ZfHEF0PpNH+882g=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=

View File

@ -2,17 +2,17 @@ package main
import (
"fmt"
"image"
"image/gif"
"image/jpeg"
"image/png"
"io"
"io/ioutil"
"math"
"os"
"os/exec"
"path/filepath"
"github.com/disintegration/imaging"
"github.com/kovidgoyal/imaging"
"golang.org/x/image/bmp"
"golang.org/x/image/tiff"
)
@ -31,12 +31,21 @@ func Goptimize(file string) {
return
}
// open original, rotate if necessary
src, err := imaging.Open(file, imaging.AutoOrientation(true))
var src image.Image
if err != nil {
fmt.Printf("Error: %v (%s)\n", err, file)
return
if !copyExif {
// rotate if necessary
src, err = imaging.Open(file, imaging.AutoOrientation(true))
if err != nil {
fmt.Printf("Error: %v (%s)\n", err, file)
return
}
} else {
src, err = imaging.Open(file)
if err != nil {
fmt.Printf("Error: %v (%s)\n", err, file)
return
}
}
format, err := imaging.FormatFromFilename(file)
@ -83,7 +92,7 @@ func Goptimize(file string) {
resultW := dstBounds.Dx()
resultH := dstBounds.Dy()
tmpFile, err := ioutil.TempFile(os.TempDir(), "Goptimized-")
tmpFile, err := os.CreateTemp(os.TempDir(), "Goptimized-")
if err != nil {
fmt.Printf("Error: cannot create temporary file: %v\n", err)
@ -128,6 +137,13 @@ func Goptimize(file string) {
} else if jpegoptim != "" {
RunOptimizer(tmpFilename, false, jpegoptim, "-f", "-s", "-o")
}
if copyExif {
if err := exifCopy(file, tmpFilename); err != nil {
fmt.Printf("Error copying exif data: %v (%s)\n", err, file)
return
}
}
} else if format.String() == "PNG" {
if pngquant != "" {
RunOptimizer(tmpFilename, true, pngquant, "-f", "--output")
@ -227,7 +243,7 @@ func Goptimize(file string) {
// and overwrite it if the output is smaller than the original
func RunOptimizer(src string, outFileArg bool, args ...string) {
// create a new temp file
tmpFile, err := ioutil.TempFile(os.TempDir(), "Goptimized-")
tmpFile, err := os.CreateTemp(os.TempDir(), "Goptimized-")
if err != nil {
fmt.Printf("Cannot create temporary file: %v\n", err)

51
main.go
View File

@ -5,7 +5,9 @@ import (
"os"
"os/exec"
"regexp"
"runtime"
"strconv"
"sync"
"github.com/axllent/ghru"
"github.com/spf13/pflag"
@ -22,6 +24,8 @@ var (
optipng string
pngquant string
gifsicle string
copyExif bool
threads = 1
version = "dev"
)
@ -42,22 +46,24 @@ func main() {
fmt.Printf(" %s -o out/ -q 90 -m 1600x1600 *.jpg\n", os.Args[0])
fmt.Println("\nDetected optimizers:")
if err := displayDelectedOptimizer("jpegtran ", jpegtran); err != nil {
displayDelectedOptimizer("jpegoptim", jpegoptim)
if err := displayDetectedOptimizer("jpegtran ", jpegtran); err != nil {
displayDetectedOptimizer("jpegoptim", jpegoptim)
}
displayDelectedOptimizer("optipng ", optipng)
displayDelectedOptimizer("pngquant ", pngquant)
displayDelectedOptimizer("gifsicle ", gifsicle)
displayDetectedOptimizer("optipng ", optipng)
displayDetectedOptimizer("pngquant ", pngquant)
displayDetectedOptimizer("gifsicle ", gifsicle)
}
var maxSizes string
var update, showversion, showhelp bool
var multiThreaded, update, showversion, showhelp bool
flag.IntVarP(&quality, "quality", "q", 75, "quality, JPEG only")
flag.StringVarP(&maxSizes, "max", "m", "", "downscale to a maximum width & height in pixels (<width>x<height>)")
flag.StringVarP(&outputDir, "out", "o", "", "output directory (default overwrites original)")
flag.BoolVarP(&preserveModTimes, "preserve", "p", true, "preserve file modification times")
flag.BoolVarP(&copyExif, "exif", "e", false, "copy exif data")
flag.BoolVarP(&update, "update", "u", false, "update to latest release")
flag.BoolVarP(&multiThreaded, "threaded", "t", false, "run multi-threaded (use all CPU cores)")
flag.BoolVarP(&showversion, "version", "v", false, "show version number")
flag.BoolVarP(&showhelp, "help", "h", false, "show help")
@ -137,13 +143,38 @@ func main() {
}
}
for _, img := range args {
Goptimize(img)
if multiThreaded {
threads = runtime.NumCPU()
}
processChan := make(chan string)
wg := &sync.WaitGroup{} // Signal to main goroutine that worker goroutines are working/done working
wg.Add(threads)
for i := 0; i < threads; i++ {
go func() {
for nextFile := range processChan {
Goptimize(nextFile)
}
// Channel was closed, so we finished this goroutine.
wg.Done() // Let main goroutine know we are done.
}()
}
for _, img := range args {
processChan <- img
}
// Close the channel. This tells the worker goroutines that they can be done.
close(processChan)
// Wait for all worker goroutines to finish processing the IPs
wg.Wait()
}
// displayDelectedOptimizer prints whether the optimizer was found
func displayDelectedOptimizer(name, bin string) error {
// displayDetectedOptimizer prints whether the optimizer was found
func displayDetectedOptimizer(name, bin string) error {
exe, err := exec.LookPath(bin)
if err != nil {
return err