Merge pull request #21 from boyter/ed2k

Ed2k hash support

Author: boyter

assets/db/migrations.sql

@@ -16,5 +16,6 @@ create table if not exists file_hashes (
      sha3_256 text,
      sha3_384 text,
      sha3_512 text,
+     ed2k text,
      size integer not null
 );

assets/db/queries.sql

@@ -3,9 +3,9 @@
 -- name: FileHashInsertReplace :one
 insert or replace into file_hashes (
     filepath, crc32, xxhash64, md4, md5, sha1, sha256, sha512,
-    blake2b_256, blake2b_512, blake3, sha3_224, sha3_256, sha3_384, sha3_512,
+    blake2b_256, blake2b_512, blake3, sha3_224, sha3_256, sha3_384, sha3_512, ed2k,
     size
-) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
 returning *;
 
 -- name: FileHashByFilePath :one

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1
 	github.com/spf13/cobra v1.8.1
 	github.com/zeebo/blake3 v0.2.3
+	go.felesatra.moe/hash/ed2k v1.0.2
 	golang.org/x/crypto v0.31.0
 	modernc.org/sqlite v1.40.1
 )

go.sum

@@ -37,6 +37,8 @@ github.com/zeebo/blake3 v0.2.3 h1:TFoLXsjeXqRNFxSbk35Dk4YtszE/MQQGK10BH4ptoTg=
 github.com/zeebo/blake3 v0.2.3/go.mod h1:mjJjZpnsyIVtVgTOSpJ9vmRE4wgDeyt2HU3qXvvKCaQ=
 github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
+go.felesatra.moe/hash/ed2k v1.0.2 h1:veuWruebB5r8WCsQUyTbTFhVqlrGI58LlwH0G+JCBp0=
+go.felesatra.moe/hash/ed2k v1.0.2/go.mod h1:iJcvQPdpma+fJfAHbrIFPjT6UYEN6GFsgkm+SB+QHdY=
 golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
 golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o=

processor/database/db.go

@@ -130,6 +130,9 @@ func toSum(input chan Result) string {
 		if hasHash(HashNames.Sha3512) {
 			str.WriteString(res.Sha3512 + "  " + res.File + "\n")
 		}
+		if hasHash(HashNames.Ed2k) {
+			str.WriteString(res.Ed2k + "  " + res.File + "\n")
+		}
 
 		if !NoStream && FileOutput == "" {
 			fmt.Print(str.String())
@@ -187,6 +190,9 @@ func toHashOnly(input chan Result) (string, bool) {
 		if hasHash(HashNames.Sha3512) {
 			str.WriteString(res.Sha3512 + "\n")
 		}
+		if hasHash(HashNames.Ed2k) {
+			str.WriteString(res.Ed2k + "\n")
+		}
 
 		if !NoStream && FileOutput == "" {
 			fmt.Print(str.String())
@@ -253,6 +259,9 @@ func toText(input chan Result) (string, bool) {
 		if hasHash(HashNames.Sha3512) {
 			str.WriteString("   SHA3-512 " + res.Sha3512 + "\n")
 		}
+		if hasHash(HashNames.Ed2k) {
+			str.WriteString("       ed2k " + res.Ed2k + "\n")
+		}
 
 		if !NoStream && FileOutput == "" {
 			fmt.Print(str.String())
@@ -371,6 +380,7 @@ func toSqlite(input chan Result) (string, bool) {
 			Sha3256:    toSqlNull(res.Sha3256),
 			Sha3384:    toSqlNull(res.Sha3384),
 			Sha3512:    toSqlNull(res.Sha3512),
+			Ed2k:       toSqlNull(res.Ed2k),
 			Size:       res.Bytes,
 		})
 		if err != nil {
@@ -427,6 +437,7 @@ func printHashes() {
 	fmt.Printf("   SHA3-256 (%s)\n", HashNames.Sha3256)
 	fmt.Printf("   SHA3-384 (%s)\n", HashNames.Sha3384)
 	fmt.Printf("   SHA3-512 (%s)\n", HashNames.Sha3512)
+	fmt.Printf("       ed2k (%s)\n", HashNames.Ed2k)
 }
 
 func contains(list []string, v string) bool {

processor/database/models.go

@@ -89,6 +89,7 @@ var HashNames = Result{
 	Sha3256:    "sha3256",
 	Sha3384:    "sha3384",
 	Sha3512:    "sha3512",
+	Ed2k:       "ed2k",
 }
 
 // Process is the main entry point of the command line it sets everything up and starts running
@@ -107,13 +108,13 @@ func Process() {
 		}
 	}
 
-	// If nothing was supplied as an argument to run against assume run against everything in the
+	// If nothing was supplied as an argument to run against, assume run against everything in the
 	// current directory recursively
 	if len(DirFilePaths) == 0 {
 		DirFilePaths = append(DirFilePaths, ".")
 	}
 
-	// If a single argument is supplied enable recursive as if its a file no problem
+	// If a single argument is supplied, enable recursive as if it's a file no problem
 	// but if its a directory the user probably wants to hash everything in that directory
 	if len(DirFilePaths) == 1 {
 		Recursive = true

processor/database/queries.sql.go

@@ -21,6 +21,7 @@ type Result struct {
 	Sha3256    string `json:",omitempty"`
 	Sha3384    string `json:",omitempty"`
 	Sha3512    string `json:",omitempty"`
+	Ed2k       string `json:"ed2k,omitempty"`
 	Bytes      int64
 	MTime      *time.Time `json:",omitzero"`
 }