41 Commits
Author SHA1 Message Date
kashifshah 2f6a3780f3 updated go.mod 2023-05-23 11:01:19 +00:00
kashifshah 2241e5ec7a updating go.mod to match mirror repository 2023-05-23 10:52:09 +00: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
Ralph Slooten f9bf16d6c4 Merge branch 'release/0.1.0' 2019-11-03 19:18:37 +13:00
Ralph Slooten 6c1aabaa70 0.1.0 2019-11-03 19:18:03 +13:00
Ralph Slooten 8c3e478384 Switch to axllent/ghru 2019-11-03 19:12:02 +13:00
Ralph Slooten 7ffb944b0f Switch to go mods 2019-10-26 22:19:46 +13:00
Ralph Slooten cb4bde8c4e Update README 2019-09-07 23:11:06 +12:00
Ralph Slooten 49d7b9b12f Update README 2019-09-07 23:08:43 +12:00
Ralph Slooten fcdbf3e90b Merge tag '0.0.3' into develop
Release 0.0.3
2019-09-07 22:52:48 +12:00
Ralph Slooten 5096e6fbf0 Merge branch 'release/0.0.3' 2019-09-07 22:52:45 +12:00
Ralph Slooten d7d827fed7 Merge branch 'feature/gif' into develop 2019-09-07 22:51:55 +12:00
Ralph Slooten 19cf54b633 0.0.3 2019-09-07 22:51:37 +12:00
Ralph Slooten 57b1d33129 Detect & skip animated GIFs 2019-09-07 22:51:24 +12:00
Ralph Slooten c239a54ead Add Go report card 2019-09-07 15:16:46 +12:00
Ralph Slooten e6296f4719 Merge tag '0.0.2' into develop
Release 0.0.2
2019-08-24 23:32:00 +12:00
Ralph Slooten ee6aa69087 Merge branch 'release/0.0.2' 2019-08-24 23:31:58 +12:00
Ralph Slooten 8362617920 Add installation instructions 2019-08-24 23:29:25 +12:00
Ralph Slooten b157fcd72b Update README 2019-08-24 23:26:24 +12:00
Ralph Slooten 0c000fe262 Reorder flags 2019-08-24 23:22:19 +12:00
Ralph Slooten 97fa6c94c5 Switch to pflag 2019-08-24 23:17:55 +12:00
Ralph Slooten 36e9b4c8fa Typo 2019-08-23 19:17:56 +12:00
Ralph Slooten 5df486c53e Add all deps to Makefile 2019-08-03 19:21:42 +12:00
Ralph Slooten 120e5fefde Fix typo 2019-08-03 14:22:52 +12:00
Ralph Slooten d2a591a6d9 Add a TODO 2019-08-03 11:15:54 +12:00
Ralph Slooten 8e5e7b6098 New line 2019-08-03 10:45:44 +12:00
Ralph Slooten 47024e030b Add update/version to README 2019-08-03 10:44:59 +12:00
Ralph Slooten 45915d4b42 Merge tag '0.0.1' into develop
Release 0.0.1
2019-08-03 10:40:03 +12:00
8 changed files with 238 additions and 79 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
/dist/
goptimize
goptimize*
+26
View File
@@ -1,5 +1,31 @@
# Changelog
## [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
## [0.0.3]
- Detect & skip animated GIFs
## [0.0.2]
- Switch to [pflag](https://github.com/spf13/pflag) for better flag management
## [0.0.1]
- Initial release
+2 -3
View File
@@ -5,8 +5,7 @@ LDFLAGS=-ldflags "-s -w -X main.version=${VERSION}"
build = echo "\n\nBuilding $(1)-$(2)" && GOOS=$(1) GOARCH=$(2) go build ${LDFLAGS} -o dist/goptimize_${VERSION}_$(1)_$(2) \
&& bzip2 dist/goptimize_${VERSION}_$(1)_$(2)
goptimize: *.go
go get github.com/disintegration/imaging
goptimize: *.go go.*
go build ${LDFLAGS} -o goptimize
rm -rf /tmp/go-*
@@ -21,4 +20,4 @@ release:
$(call build,linux,arm)
$(call build,linux,arm64)
$(call build,darwin,amd64)
$(call build,darwin,386)
$(call build,darwin,arm64)
+43 -23
View File
@@ -1,11 +1,12 @@
# Goptimizer - downscales and optimizes images
Goptimizer is a commandline utility written in Golang. It downscales and optimize existing images JPEG, PNG and Gif files.
[![Go Report Card](https://goreportcard.com/badge/github.com/axllent/goptimize)](https://goreportcard.com/report/github.com/axllent/goptimize)
Image downscaling is done within Goptimize (`-m <width>x<height>`, see [Usage](#usage-options)), however optimization is done using the following additional tools (if they are installed):
Goptimizer is a commandline utility written in Golang. It downscales and optimizes JPEG, PNG, GIF, TIFF and BMP files.
- jpegoptim
- jpegtran (`libjpeg-turbo-progs`)
Image downscaling/rotation is done within goptimize (`-m <width>x<height>`, see [Usage](#usage-options)), however optimization is done using the following additional tools (if they are installed):
- jpegtran (`libjpeg-turbo-progs`) or jpegoptim
- optipng
- pngquant
- gifsicle
@@ -13,14 +14,16 @@ Image downscaling is done within Goptimize (`-m <width>x<height>`, see [Usage](#
## Notes
Both `jpegoptim` & `jpegtran` have almost identical optimization, so if both are installed then just `jpegtran` is used for JPG optimization. PNG optimization however will run through both `optipng` & `pngquant` (if installed) as this has definite advantages.
Both `jpegoptim` & `jpegtran` have almost identical optimization, so if both are installed then just `jpegtran` is used for JPG optimization. PNG optimization however will run through both `optipng` & `pngquant` (if installed) as this can result in better optimization.
It is highly recommended to install the necessary optimization tools, however they are not required to run goptimize.
Goptimize will remove all exif data from JPEG files, auto-rotating those that relied on it.
Goptimize will remove all exif data from JPEG files, auto-rotating those that depend on it for orientation.
It will also preserve (by default) the file's original modification times (`-p=false` to disable).
Animated GIF files are not supported and automatically get skipped.
## Usage options
@@ -28,23 +31,19 @@ It will also preserve (by default) the file's original modification times (`-p=f
Usage: ./goptimize [options] <images>
Options:
-gifsicle string
gifsicle binary (default "gifsicle")
-jpegoptim string
jpegoptim binary (default "jpegoptim")
-jpegtran string
jpegtran binary (default "jpegtran")
-m string
downscale to a maximum width & height in pixels (<width>x<height>)
-o string
output directory (default overwrites original)
-optipng string
optipng binary (default "optipng")
-p preserve file modification times (default true)
-pngquant string
pngquant binary (default "pngquant")
-q int
quality - JPEG only (default 75)
-q, --quality int quality, JPEG only (default 75)
-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
--jpegtran string jpegtran binary (default "jpegtran")
--jpegoptim string jpegoptim binary (default "jpegoptim")
--gifsicle string gifsicle binary (default "gifsicle")
--pngquant string pngquant binary (default "pngquant")
--optipng string optipng binary (default "optipng")
```
@@ -54,3 +53,24 @@ Options:
- `./goptimize -m 800x800 *` - optimize and downscale all image files to a maximum size of 800x800px
- `./goptimize -m 1200x0 image.jpg` - optimize and downscale a JPG file to a maximum size of width of 1200px
- `./goptimize -o out/ image.jpg` - optimize a JPG file and save it to `out/`
## Install
Download the appropriate binary from the [releases](https://github.com/axllent/goptimize/releases/latest), or if you have golang installed
### Build requirements
Go >= 1.11 required.
```
go get github.com/axllent/goptimize
```
## TODO
Some ideas for the future:
- Dry run
- Option to copy exif data (how?)
+12
View File
@@ -0,0 +1,12 @@
module git.sdf.org/kashifshah/goptimize
go 1.20
require (
github.com/axllent/ghru v1.2.1
github.com/disintegration/imaging v1.6.2
github.com/spf13/pflag v1.0.5
golang.org/x/image v0.5.0
)
require github.com/axllent/semver v0.0.1 // indirect
+35
View File
@@ -0,0 +1,35 @@
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/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+51 -25
View File
@@ -22,31 +22,38 @@ func Goptimize(file string) {
info, err := os.Stat(file)
if err != nil {
fmt.Printf("%s doesn't exist\n", file)
fmt.Printf("Error: %s doesn't exist\n", file)
return
}
if !info.Mode().IsRegular() {
// not a file
fmt.Printf("%s is not a file\n", file)
fmt.Printf("Error: %s is not a file\n", file)
return
}
// open original, rotate if neccesary
// open original, rotate if necessary
src, err := imaging.Open(file, imaging.AutoOrientation(true))
if err != nil {
fmt.Printf("%v (%s)\n", err, file)
fmt.Printf("Error: %v (%s)\n", err, file)
return
}
format, err := imaging.FormatFromFilename(file)
if err != nil {
fmt.Printf("Cannot detect format: %v\n", err)
fmt.Printf("Error: cannot detect format: %v\n", err)
return
}
if format.String() == "GIF" {
// return if GIF is animated - unsupported
if err := IsGIFAnimated(file); err != nil {
fmt.Printf("Error: animated GIF not supported (%v)\n", file)
return
}
}
outFilename := filepath.Base(file)
outDir := filepath.Dir(file)
dstFile := filepath.Join(outDir, outFilename)
@@ -60,7 +67,7 @@ func Goptimize(file string) {
srcW := srcBounds.Dx()
srcH := srcBounds.Dy()
// Ensure scaling does not upscale image
// do not upscale image
imgMaxW := maxWidth
if imgMaxW == 0 || imgMaxW > srcW {
imgMaxW = srcW
@@ -79,24 +86,25 @@ func Goptimize(file string) {
tmpFile, err := ioutil.TempFile(os.TempDir(), "Goptimized-")
if err != nil {
fmt.Printf("Cannot create temporary file: %v\n", err)
fmt.Printf("Error: cannot create temporary file: %v\n", err)
return
}
defer os.Remove(tmpFile.Name())
if format.String() == "JPEG" {
switch imgType := format.String(); imgType {
case "JPEG":
err = jpeg.Encode(tmpFile, resized, &jpeg.Options{Quality: quality})
} else if format.String() == "PNG" {
case "PNG":
err = png.Encode(tmpFile, resized)
} else if format.String() == "GIF" {
case "GIF":
err = gif.Encode(tmpFile, resized, nil)
} else if format.String() == "TIFF" {
case "TIFF":
err = tiff.Encode(tmpFile, resized, nil)
} else if format.String() == "BMP" {
case "BMP":
err = bmp.Encode(tmpFile, resized)
} else {
fmt.Printf("Unsupported file type %s\n", file)
default:
fmt.Printf("Error: unsupported file type (%s)\n", file)
return
}
@@ -112,23 +120,23 @@ func Goptimize(file string) {
// so we can modify it with system processes
tmpFile.Close()
// Run through optimizers
// run through optimizers
if format.String() == "JPEG" {
// run one or the other, running both has no advantage
if jpegtran != "" {
RunOptimiser(tmpFilename, true, jpegtran, "-optimize", "-outfile")
RunOptimizer(tmpFilename, true, jpegtran, "-optimize", "-outfile")
} else if jpegoptim != "" {
RunOptimiser(tmpFilename, false, jpegoptim, "-f", "-s", "-o")
RunOptimizer(tmpFilename, false, jpegoptim, "-f", "-s", "-o")
}
} else if format.String() == "PNG" {
if pngquant != "" {
RunOptimiser(tmpFilename, true, pngquant, "-f", "--output")
RunOptimizer(tmpFilename, true, pngquant, "-f", "--output")
}
if optipng != "" {
RunOptimiser(tmpFilename, true, optipng, "-out")
RunOptimizer(tmpFilename, true, optipng, "-out")
}
} else if format.String() == "GIF" && gifsicle != "" {
RunOptimiser(tmpFilename, true, gifsicle, "-o")
RunOptimizer(tmpFilename, true, gifsicle, "-o")
}
// re-open modified temporary file
@@ -166,7 +174,7 @@ func Goptimize(file string) {
defer out.Close()
if _, err := io.Copy(out, tmpFile); err != nil {
fmt.Printf("Error ovewriting original file: %v\n", err)
fmt.Printf("Error overwriting original file: %v\n", err)
return
}
@@ -179,7 +187,7 @@ func Goptimize(file string) {
fmt.Printf("Goptimized %s (%dx%d %s > %s %v%%)\n", dstFile, resultW, resultH, ByteCountSI(srcSize), ByteCountSI(dstSize), savedPercent)
} else {
// If the output directory is not the same,
// if the output directory is not the same,
// then write a copy of the original file
if outputDir != "" {
out, err := os.Create(dstFile)
@@ -215,9 +223,9 @@ func Goptimize(file string) {
}
// RunOptimiser will run the specified command on a copy of the temporary file,
// RunOptimizer will run the specified command on a copy of the temporary file,
// and overwrite it if the output is smaller than the original
func RunOptimiser(src string, outFileArg bool, args ...string) {
func RunOptimizer(src string, outFileArg bool, args ...string) {
// create a new temp file
tmpFile, err := ioutil.TempFile(os.TempDir(), "Goptimized-")
@@ -289,3 +297,21 @@ func ByteCountSI(b int64) string {
}
return fmt.Sprintf("%.1f%cB", float64(b)/float64(div), "kMGTPE"[exp])
}
// IsGIFAnimated will return an error if the GIF file has more than 1 frame
func IsGIFAnimated(gifFile string) error {
file, _ := os.Open(gifFile)
defer file.Close()
g, err := gif.DecodeAll(file)
if err != nil {
return err
}
// Single frame = OK
if len(g.Image) == 1 {
return nil
}
return fmt.Errorf("Animated gif")
}
+68 -27
View File
@@ -1,14 +1,16 @@
package main
import (
"flag"
"fmt"
"os"
"os/exec"
"regexp"
"runtime"
"strconv"
"sync"
"github.com/axllent/gitrel"
"github.com/axllent/ghru"
"github.com/spf13/pflag"
)
var (
@@ -22,15 +24,20 @@ var (
optipng string
pngquant string
gifsicle string
threads = 1
version = "dev"
)
func main() {
// set up new flag instance
flag := pflag.NewFlagSet(os.Args[0], pflag.ExitOnError)
// set the default help
flag.Usage = func() {
fmt.Println("Goptimize - downscales and optimizes images")
fmt.Printf("\nUsage: %s [options] <images>\n", os.Args[0])
fmt.Println("\nOptions:")
flag.SortFlags = false
flag.PrintDefaults()
fmt.Println("\nExamples:")
fmt.Printf(" %s image.png\n", os.Args[0])
@@ -38,33 +45,37 @@ 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 bool
var multiThreaded, update, showversion, showhelp bool
flag.IntVar(&quality, "q", 75, "quality - JPEG only")
flag.StringVar(&outputDir, "o", "", "output directory (default overwrites original)")
flag.BoolVar(&preserveModTimes, "p", true, "preserve file modification times")
flag.StringVar(&maxSizes, "m", "", "downscale to a maximum width & height in pixels (<width>x<height>)")
flag.BoolVar(&update, "u", false, "update to latest release")
flag.BoolVar(&showversion, "v", false, "show version number")
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(&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")
// third-party optimizers
flag.StringVar(&gifsicle, "gifsicle", "gifsicle", "gifsicle binary")
flag.StringVar(&jpegoptim, "jpegoptim", "jpegoptim", "jpegoptim binary")
flag.StringVar(&jpegtran, "jpegtran", "jpegtran", "jpegtran binary")
flag.StringVar(&optipng, "optipng", "optipng", "optipng binary")
flag.StringVar(&jpegoptim, "jpegoptim", "jpegoptim", "jpegoptim binary")
flag.StringVar(&gifsicle, "gifsicle", "gifsicle", "gifsicle binary")
flag.StringVar(&pngquant, "pngquant", "pngquant", "pngquant binary")
flag.StringVar(&optipng, "optipng", "optipng", "optipng binary")
// parse flags
flag.Parse()
flag.SortFlags = false
// parse args excluding os.Args[0]
flag.Parse(os.Args[1:])
// detect optimizer paths
gifsicle, _ = exec.LookPath(gifsicle)
@@ -73,22 +84,27 @@ func main() {
optipng, _ = exec.LookPath(optipng)
pngquant, _ = exec.LookPath(pngquant)
if showhelp {
flag.Usage()
os.Exit(1)
}
if showversion {
fmt.Println(fmt.Sprintf("Version: %s", version))
latest, _, _, err := gitrel.Latest("axllent/goptimize", "goptimize")
if err == nil && latest != version {
latest, _, _, err := ghru.Latest("axllent/goptimize", "goptimize")
if err == nil && ghru.GreaterThan(latest, version) {
fmt.Printf("Update available: %s\nRun `%s -u` to update.\n", latest, os.Args[0])
}
return
}
if update {
rel, err := gitrel.Update("axllent/goptimize", "goptimize", version)
rel, err := ghru.Update("axllent/goptimize", "goptimize", version)
if err != nil {
fmt.Println(err)
os.Exit(1)
}
fmt.Printf("Updated %s to version %s", os.Args[0], rel)
fmt.Printf("Updated %s to version %s\n", os.Args[0], rel)
return
}
@@ -125,13 +141,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