Some refactoring

.gitignore

@@ -1,2 +1,2 @@
-protodump
 .DS_Store
+bin/

README.md

@@ -9,7 +9,7 @@ Protodump is a utility to dump all Protobuf file descriptors from a given binary
 ```
 git clone https://github.com/arkadiyt/protodump
 cd protodump
-go build -o protodump cmd/main.go
+go build -o protodump cmd/protodump/main.go
 ./protodump -file <file to extract from> -output <output directory>
 ```
 

cmd/protodump/main.go

@@ -8,8 +8,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/arkadiyt/protodump/pkg/proto"
-	"github.com/arkadiyt/protodump/pkg/scan"
+	"github.com/arkadiyt/protodump/pkg/protodump"
 )
 
 var debug bool
@@ -38,13 +37,13 @@ func main() {
 		return
 	}
 
-	results, err := scan.ScanFile(*file)
+	results, err := protodump.ScanFile(*file)
 	if err != nil {
 		log.Fatalf("Got error scanning: %v\n", err)
 	}
 
 	for _, result := range results {
-		definition, err := proto.NewFromBytes(result)
+		definition, err := protodump.NewFromBytes(result)
 		if err != nil {
 			Debug("Got error parsing definition: %v\n", err)
 		} else {

go.mod

@@ -3,13 +3,13 @@ module github.com/arkadiyt/protodump
 go 1.19
 
 require (
-	golang.org/x/exp v0.0.0-20221229185413-b6b61370dfa8
+	github.com/stretchr/testify v1.8.1
 	google.golang.org/protobuf v1.28.1
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/stretchr/testify v1.8.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -3,6 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -12,14 +14,11 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-golang.org/x/exp v0.0.0-20221227203929-1b447090c38c h1:Govq2W3bnHJimHT2ium65kXcI7ZzTniZHcFATnLJM0Q=
-golang.org/x/exp v0.0.0-20221227203929-1b447090c38c/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/exp v0.0.0-20221229185413-b6b61370dfa8 h1:/09aNBEyXdSQMyJEalp+UtcHlmXZ+q7nTJAQppUpkV4=
-golang.org/x/exp v0.0.0-20221229185413-b6b61370dfa8/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
 google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

pkg/protodump/proto.go

@@ -1,4 +1,4 @@
-package proto
+package protodump
 
 import (
 	"fmt"

pkg/protodump/proto_test.go

@@ -1,4 +1,4 @@
-package proto
+package protodump
 
 import (
 	"os"

pkg/protodump/scan.go

@@ -1,4 +1,4 @@
-package scan
+package protodump
 
 import (
 	"bytes"

pkg/protodump/scan_test.go

@@ -0,0 +1 @@
+package protodump

pkg/scan/scan_test.go

@@ -1 +0,0 @@
-package scan