Skip to content

Commit ebeec52

Browse files
boyterboyter
committed
fix up styles
1 parent 626738b commit ebeec52

File tree

5 files changed

+56
-32
lines changed

5 files changed

+56
-32
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ require (
1010
github.com/spf13/cobra v1.8.1
1111
github.com/zeebo/blake3 v0.2.3
1212
golang.org/x/crypto v0.25.0
13+
modernc.org/sqlite v1.36.0
1314
)
1415

1516
require (
@@ -27,5 +28,4 @@ require (
2728
modernc.org/libc v1.61.13 // indirect
2829
modernc.org/mathutil v1.7.1 // indirect
2930
modernc.org/memory v1.8.2 // indirect
30-
modernc.org/sqlite v1.36.0 // indirect
3131
)

‎go.sum

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ github.com/djherbis/times v1.6.0 h1:w2ctJ92J8fBvWPxugmXIv7Nz7Q3iDMKNx9v5ocVH20c=
55
github.com/djherbis/times v1.6.0/go.mod h1:gOHeRAz2h+VJNZ5Gmc/o7iD9k4wW7NMVqieYCY99oc0=
66
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
77
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
8+
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd h1:gbpYu9NMq8jhDVbvlGkMFWCjLFlqqEZjEmObmhUy6Vo=
9+
github.com/google/pprof v0.0.0-20240409012703-83162a5b38cd/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw=
810
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
911
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
1012
github.com/gosuri/uilive v0.0.4 h1:hUEBpQDj8D8jXgtCdBu7sWsy5sbW/5GhuO8KBwJ2jyY=
@@ -39,20 +41,40 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
3941
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
4042
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 h1:pVgRXcIictcr+lBQIFeiwuwtDIs4eL21OuM9nyAADmo=
4143
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
44+
golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
45+
golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
46+
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
47+
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
4248
golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4349
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4450
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
45-
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
46-
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4751
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
4852
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
53+
golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
54+
golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
4955
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5056
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
57+
modernc.org/cc/v4 v4.24.4 h1:TFkx1s6dCkQpd6dKurBNmpo+G8Zl4Sq/ztJ+2+DEsh0=
58+
modernc.org/cc/v4 v4.24.4/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
59+
modernc.org/ccgo/v4 v4.23.16 h1:Z2N+kk38b7SfySC1ZkpGLN2vthNJP1+ZzGZIlH7uBxo=
60+
modernc.org/ccgo/v4 v4.23.16/go.mod h1:nNma8goMTY7aQZQNTyN9AIoJfxav4nvTnvKThAeMDdo=
61+
modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
62+
modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
63+
modernc.org/gc/v2 v2.6.3 h1:aJVhcqAte49LF+mGveZ5KPlsp4tdGdAOT4sipJXADjw=
64+
modernc.org/gc/v2 v2.6.3/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
5165
modernc.org/libc v1.61.13 h1:3LRd6ZO1ezsFiX1y+bHd1ipyEHIJKvuprv0sLTBwLW8=
5266
modernc.org/libc v1.61.13/go.mod h1:8F/uJWL/3nNil0Lgt1Dpz+GgkApWh04N3el3hxJcA6E=
5367
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
5468
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
5569
modernc.org/memory v1.8.2 h1:cL9L4bcoAObu4NkxOlKWBWtNHIsnnACGF/TbqQ6sbcI=
5670
modernc.org/memory v1.8.2/go.mod h1:ZbjSvMO5NQ1A2i3bWeDiVMxIorXwdClKE/0SZ+BMotU=
71+
modernc.org/opt v0.1.4 h1:2kNGMRiUjrp4LcaPuLY2PzUfqM/w9N23quVwhKt5Qm8=
72+
modernc.org/opt v0.1.4/go.mod h1:03fq9lsNfvkYSfxrfUhZCWPk1lm4cq4N+Bh//bEtgns=
73+
modernc.org/sortutil v1.2.1 h1:+xyoGf15mM3NMlPDnFqrteY07klSFxLElE2PVuWIJ7w=
74+
modernc.org/sortutil v1.2.1/go.mod h1:7ZI3a3REbai7gzCLcotuw9AC4VZVpYMjDzETGsSMqJE=
5775
modernc.org/sqlite v1.36.0 h1:EQXNRn4nIS+gfsKeUTymHIz1waxuv5BzU7558dHSfH8=
5876
modernc.org/sqlite v1.36.0/go.mod h1:7MPwH7Z6bREicF9ZVUR78P1IKuxfZ8mRIDHD0iD+8TU=
77+
modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0=
78+
modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A=
79+
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
80+
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

‎main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package main
22

33
import (
4-
"github.com/boyter/hashit/processor"
5-
"github.com/spf13/cobra"
64
"os"
75
"runtime"
6+
7+
"github.com/boyter/hashit/processor"
8+
"github.com/spf13/cobra"
89
)
910

1011
func main() {

‎processor/formatters.go

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ import (
55
"database/sql"
66
"encoding/json"
77
"fmt"
8-
"github.com/boyter/hashit/assets"
9-
"github.com/boyter/hashit/processor/database"
10-
_ "modernc.org/sqlite"
118
"os"
129
"strings"
1310
"time"
11+
12+
"github.com/boyter/hashit/assets"
13+
"github.com/boyter/hashit/processor/database"
14+
_ "modernc.org/sqlite"
1415
)
1516

1617
// Get the time as standard UTC/Zulu format
@@ -21,14 +22,14 @@ func getFormattedTime() string {
2122
// Prints a message to stdout if flag to enable warning output is set
2223
func printVerbose(msg string) {
2324
if Verbose {
24-
fmt.Println(fmt.Sprintf("VERBOSE %s: %s", getFormattedTime(), msg))
25+
fmt.Printf("VERBOSE %s: %s\n", getFormattedTime(), msg)
2526
}
2627
}
2728

2829
// Prints a message to stdout if flag to enable debug output is set
2930
func printDebug(msg string) {
3031
if Debug {
31-
fmt.Println(fmt.Sprintf("DEBUG %s: %s", getFormattedTime(), msg))
32+
fmt.Printf("DEBUG %s: %s\n", getFormattedTime(), msg)
3233
}
3334
}
3435

@@ -410,20 +411,20 @@ func toSqlite(input chan Result) (string, bool) {
410411
}
411412

412413
func printHashes() {
413-
fmt.Println(fmt.Sprintf(" CRC32 (%s)", HashNames.CRC32))
414-
fmt.Println(fmt.Sprintf(" xxHash64 (%s)", HashNames.XxHash64))
415-
fmt.Println(fmt.Sprintf(" MD4 (%s)", HashNames.MD4))
416-
fmt.Println(fmt.Sprintf(" MD5 (%s)", HashNames.MD5))
417-
fmt.Println(fmt.Sprintf(" SHA1 (%s)", HashNames.SHA1))
418-
fmt.Println(fmt.Sprintf(" SHA256 (%s)", HashNames.SHA256))
419-
fmt.Println(fmt.Sprintf(" SHA512 (%s)", HashNames.SHA512))
420-
fmt.Println(fmt.Sprintf("Blake2b-256 (%s)", HashNames.Blake2b256))
421-
fmt.Println(fmt.Sprintf("Blake2b-512 (%s)", HashNames.Blake2b512))
422-
fmt.Println(fmt.Sprintf(" Blake3 (%s)", HashNames.Blake3))
423-
fmt.Println(fmt.Sprintf(" SHA3-224 (%s)", HashNames.Sha3224))
424-
fmt.Println(fmt.Sprintf(" SHA3-256 (%s)", HashNames.Sha3256))
425-
fmt.Println(fmt.Sprintf(" SHA3-384 (%s)", HashNames.Sha3384))
426-
fmt.Println(fmt.Sprintf(" SHA3-512 (%s)", HashNames.Sha3512))
414+
fmt.Printf(" CRC32 (%s)\n", HashNames.CRC32)
415+
fmt.Printf(" xxHash64 (%s)\n", HashNames.XxHash64)
416+
fmt.Printf(" MD4 (%s)\n", HashNames.MD4)
417+
fmt.Printf(" MD5 (%s)\n", HashNames.MD5)
418+
fmt.Printf(" SHA1 (%s)\n", HashNames.SHA1)
419+
fmt.Printf(" SHA256 (%s)\n", HashNames.SHA256)
420+
fmt.Printf(" SHA512 (%s)\n", HashNames.SHA512)
421+
fmt.Printf("Blake2b-256 (%s)\n", HashNames.Blake2b256)
422+
fmt.Printf("Blake2b-512 (%s)\n", HashNames.Blake2b512)
423+
fmt.Printf(" Blake3 (%s)\n", HashNames.Blake3)
424+
fmt.Printf(" SHA3-224 (%s)\n", HashNames.Sha3224)
425+
fmt.Printf(" SHA3-256 (%s)\n", HashNames.Sha3256)
426+
fmt.Printf(" SHA3-384 (%s)\n", HashNames.Sha3384)
427+
fmt.Printf(" SHA3-512 (%s)\n", HashNames.Sha3512)
427428
}
428429

429430
func contains(list []string, v string) bool {

‎processor/workers.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func processScanner(filename string, fsize int, bar *uiprogress.Bar) (Result, er
196196
wg.Add(1)
197197
go func() {
198198
for b := range xxhash64c {
199-
xxhash64_d.Write(b)
199+
_, _ = xxhash64_d.Write(b)
200200
}
201201
wg.Done()
202202
}()
@@ -276,7 +276,7 @@ func processScanner(filename string, fsize int, bar *uiprogress.Bar) (Result, er
276276
wg.Add(1)
277277
go func() {
278278
for b := range blake3c {
279-
blake3_d.Write(b)
279+
_, _ = blake3_d.Write(b)
280280
}
281281
wg.Done()
282282
}()
@@ -472,7 +472,7 @@ func processStandardInput(output chan Result) {
472472
wg.Add(1)
473473
go func() {
474474
for b := range crc32c {
475-
crc32_d.Write(b)
475+
_, _ = crc32_d.Write(b)
476476
}
477477
wg.Done()
478478
}()
@@ -482,7 +482,7 @@ func processStandardInput(output chan Result) {
482482
wg.Add(1)
483483
go func() {
484484
for b := range xxhash64c {
485-
xxhash64_d.Write(b)
485+
_, _ = xxhash64_d.Write(b)
486486
}
487487
wg.Done()
488488
}()
@@ -562,7 +562,7 @@ func processStandardInput(output chan Result) {
562562
wg.Add(1)
563563
go func() {
564564
for b := range blake3c {
565-
blake3_d.Write(b)
565+
_, _ = blake3_d.Write(b)
566566
}
567567
wg.Done()
568568
}()
@@ -741,7 +741,7 @@ func processReadFileParallel(filename string, content *[]byte) (Result, error) {
741741
go func() {
742742
startTime = makeTimestampNano()
743743
d := xxhash.New()
744-
d.Write(*content)
744+
_, _ = d.Write(*content)
745745
result.XxHash64 = hex.EncodeToString(d.Sum(nil))
746746

747747
if Trace {
@@ -938,7 +938,7 @@ func processReadFile(filename string, content *[]byte) (Result, error) {
938938
if hasHash(HashNames.XxHash64) {
939939
startTime := makeTimestampNano()
940940
d := xxhash.New()
941-
d.Write(*content)
941+
_, _ = d.Write(*content)
942942
result.XxHash64 = hex.EncodeToString(d.Sum(nil))
943943

944944
if Trace {
@@ -1026,7 +1026,7 @@ func processReadFile(filename string, content *[]byte) (Result, error) {
10261026
if hasHash(HashNames.Blake3) {
10271027
startTime := makeTimestampNano()
10281028
d := blake3.New()
1029-
d.Write(*content)
1029+
_, _ = d.Write(*content)
10301030
result.Blake3 = hex.EncodeToString(d.Sum(nil))
10311031

10321032
if Trace {

0 commit comments

Comments
 (0)