Remove duplicate test data, rename package

gocrop/cropper.go → gocropper/cropper.go

@@ -1,4 +1,4 @@
-package gocrop
+package gocropper
 
 import (
 	"fmt"

gocrop/cropper_test.go → gocropper/cropper_test.go

@@ -1,12 +1,12 @@
-package gocrop_test
+package gocropper_test
 
 import (
 	"image"
 	"path"
 	"sync"
 	"testing"
 
-	"github.com/H3Cki/gocrop/gocrop"
+	"github.com/H3Cki/gocrop/gocropper"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -19,24 +19,24 @@ func TestLoad(t *testing.T) {
 		{"blank.png", nil},
 		{"circle.png", nil},
 		{"line.gif", nil},
-		{"white.jpg", gocrop.ErrUnsupportedFormat},
+		{"white.jpg", gocropper.ErrUnsupportedFormat},
 		{"rect.png", nil},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.fn, func(t *testing.T) {
-			croppable, err := gocrop.Load(path.Join("testdata", tt.fn))
+			croppable, err := gocropper.Load(path.Join("testdata", tt.fn))
 			assert.ErrorIs(t, tt.exErr, err)
 			assert.Equal(t, croppable != nil, tt.exErr == nil)
 		})
 	}
 }
 
 func TestCropper_Rect(t *testing.T) {
-	basicCropper, _ := gocrop.NewCropper()
+	basicCropper, _ := gocropper.NewCropper()
 
 	tests := []struct {
-		cropper *gocrop.Cropper
+		cropper *gocropper.Cropper
 		fn      string
 		exRect  image.Rectangle
 	}{
@@ -74,7 +74,7 @@ func TestCropper_Rect(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.fn, func(t *testing.T) {
-			croppable, err := gocrop.Load(path.Join("testdata/described", tt.fn))
+			croppable, err := gocropper.Load(path.Join("testdata/described", tt.fn))
 			assert.NoError(t, err)
 			assert.NotNil(t, croppable)
 
@@ -86,10 +86,10 @@ func TestCropper_Rect(t *testing.T) {
 
 // TODO test only checks img size
 func TestCropper_Crop(t *testing.T) {
-	basicCropper, _ := gocrop.NewCropper()
+	basicCropper, _ := gocropper.NewCropper()
 
 	tests := []struct {
-		cropper *gocrop.Cropper
+		cropper *gocropper.Cropper
 		fn      string
 		exFn    string
 		ok      bool
@@ -134,7 +134,7 @@ func TestCropper_Crop(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.fn, func(t *testing.T) {
-			croppable, err := gocrop.Load(path.Join("testdata/described", tt.fn))
+			croppable, err := gocropper.Load(path.Join("testdata/described", tt.fn))
 			assert.NoError(t, err)
 			assert.NotNil(t, croppable)
 
@@ -145,7 +145,7 @@ func TestCropper_Crop(t *testing.T) {
 				return
 			}
 
-			expectedCrop, err := gocrop.Load(path.Join("testdata/described/cropped", tt.fn))
+			expectedCrop, err := gocropper.Load(path.Join("testdata/described/cropped", tt.fn))
 			assert.NoError(t, err)
 
 			assert.True(t, imagesEqual(expectedCrop.Image, cropped.Image))
@@ -158,8 +158,8 @@ func imagesEqual(img1, img2 image.Image) bool {
 }
 
 func BenchmarkCropper_Crop(b *testing.B) {
-	cropper, _ := gocrop.NewCropper(gocrop.WithOutDir("testoutput"))
-	cpbl, err := gocrop.Load("testdata/bigblank.png")
+	cropper, _ := gocropper.NewCropper(gocropper.WithOutDir("testoutput"))
+	cpbl, err := gocropper.Load("testdata/bigblank.png")
 	assert.NoError(b, err)
 
 	n := 10

gocrop/finder.go → gocropper/finder.go

@@ -1,4 +1,4 @@
-package gocrop
+package gocropper
 
 import (
 	"errors"

gocrop/io.go → gocropper/io.go

@@ -1,4 +1,4 @@
-package gocrop
+package gocropper
 
 import (
 	"errors"

gocrop/io_test.go → gocropper/io_test.go

@@ -1,4 +1,4 @@
-package gocrop
+package gocropper
 
 import (
 	"runtime"

main.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"sync"
 
-	"github.com/H3Cki/gocrop/gocrop"
+	"github.com/H3Cki/gocrop/gocropper"
 	"github.com/urfave/cli/v2"
 )
 
@@ -107,7 +107,7 @@ func main() {
 
 					for _, path := range paths {
 						go func(p string) {
-							croppable, err := gocrop.Load(p)
+							croppable, err := gocropper.Load(p)
 							if err != nil {
 								fmt.Println("error loading image: ", err.Error())
 								return
@@ -136,15 +136,15 @@ func main() {
 						return errors.New("no directories specified")
 					}
 
-					opts := []gocrop.FinderOptions{
-						gocrop.WithRecursive(cCtx.Bool("recursive")),
+					opts := []gocropper.FinderOptions{
+						gocropper.WithRecursive(cCtx.Bool("recursive")),
 					}
 
 					if cCtx.IsSet("regex") {
-						opts = append(opts, gocrop.WithRegex(cCtx.String("regex")))
+						opts = append(opts, gocropper.WithRegex(cCtx.String("regex")))
 					}
 
-					loader, err := gocrop.NewFinder(opts...)
+					loader, err := gocropper.NewFinder(opts...)
 					if err != nil {
 						return err
 					}
@@ -163,7 +163,7 @@ func main() {
 					wg.Add(len(crops))
 
 					for _, croppable := range crops {
-						go func(c *gocrop.Croppable) {
+						go func(c *gocropper.Croppable) {
 							defer wg.Done()
 
 							if err := c.Load(); err != nil {
@@ -191,12 +191,12 @@ func main() {
 	}
 }
 
-func cropperFromCtx(ctx *cli.Context) (*gocrop.Cropper, error) {
-	return gocrop.NewCropper(
-		gocrop.WithThreshold(uint32(ctx.Int64("threshold"))),
-		gocrop.WithPadding(ctx.Int("padding")),
-		gocrop.WithOutDir(ctx.String("out_dir")),
-		gocrop.WithOutPrefix(ctx.String("prefix")),
-		gocrop.WithOutSuffix(ctx.String("suffix")),
+func cropperFromCtx(ctx *cli.Context) (*gocropper.Cropper, error) {
+	return gocropper.NewCropper(
+		gocropper.WithThreshold(uint32(ctx.Int64("threshold"))),
+		gocropper.WithPadding(ctx.Int("padding")),
+		gocropper.WithOutDir(ctx.String("out_dir")),
+		gocropper.WithOutPrefix(ctx.String("prefix")),
+		gocropper.WithOutSuffix(ctx.String("suffix")),
 	)
 }