jacob1123/dupe-finder
1
0
Fork 0
mirror of https://github.com/JaCoB1123/dupe-finder.git synced 2026-04-23 20:12:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

use pointer for entries

Browse Source 
hash was not passed on from FileHashingWorker
This commit is contained in:
Jan Bader
2026-04-13 21:47:16 +02:00
parent 3c6ae055a6
commit 683ebf0858
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
filesmap.go
+13 -14
View File
@@ -14,13 +14,13 @@ import (
// FilesMap is a struct for listing files by Size and Hash to search for duplicates // FilesMap is a struct for listing files by Size and Hash to search for duplicates
type FilesMap struct { type FilesMap struct {
Images []imageEntry Images []*imageEntry
FilesBySize map[int64]string FilesBySize map[int64]string
FilesByHash map[string][]string FilesByHash map[string][]string
FilesHashing chan fileEntry FilesHashing chan *fileEntry
FilesHashed chan fileEntry FilesHashed chan *fileEntry
ImagesHashing chan imageEntry ImagesHashing chan *imageEntry
ImagesHashed chan imageEntry ImagesHashed chan *imageEntry
progress *mpb.Progress progress *mpb.Progress
incomingBar *mpb.Bar incomingBar *mpb.Bar
fileHashingBar *mpb.Bar fileHashingBar *mpb.Bar
@@ -32,10 +32,10 @@ func newFilesMap() *FilesMap {
return &FilesMap{ return &FilesMap{
FilesBySize: map[int64]string{}, FilesBySize: map[int64]string{},
FilesByHash: map[string][]string{}, FilesByHash: map[string][]string{},
FilesHashed: make(chan fileEntry, 100000), FilesHashed: make(chan *fileEntry, 100000),
FilesHashing: make(chan fileEntry), FilesHashing: make(chan *fileEntry),
ImagesHashed: make(chan imageEntry, 100000), ImagesHashed: make(chan *imageEntry, 100000),
ImagesHashing: make(chan imageEntry), ImagesHashing: make(chan *imageEntry),
progress: mpb.New(mpb.WithWidth(64)), progress: mpb.New(mpb.WithWidth(64)),
} }
} }
@@ -49,7 +49,6 @@ func (fm *FilesMap) FileHashingWorker(wg *sync.WaitGroup) {
hash, err := calculateFileHash(file.path) hash, err := calculateFileHash(file.path)
fm.fileHashingBar.IncrInt64(file.size) fm.fileHashingBar.IncrInt64(file.size)
fm.FilesHashed <- file fm.FilesHashed <- file
if err != nil { if err != nil {
fmt.Fprintf(fm.progress, "Error calculating Hash for file %s: %v\n", file.path, err) fmt.Fprintf(fm.progress, "Error calculating Hash for file %s: %v\n", file.path, err)
continue continue
@@ -85,7 +84,7 @@ func (fm *FilesMap) ImageHashingWorker(wg *sync.WaitGroup) {
func (fm *FilesMap) HashedWorker(done chan bool) { func (fm *FilesMap) HashedWorker(done chan bool) {
for file := range fm.FilesHashed { for file := range fm.FilesHashed {
if *verbose { if *verbose {
fmt.Println("Finishing", file.path) fmt.Printf("Finishing '%s' with hash '%s'\n", file.path, file.hash)
} }
fm.lock.Lock() fm.lock.Lock()
@@ -152,9 +151,9 @@ func (fm *FilesMap) hashFile(path string, size int64) int64 {
fmt.Println("Incoming", path) fmt.Println("Incoming", path)
} }
fm.FilesHashing <- fileEntry{path, size, ""} fm.FilesHashing <- &fileEntry{path, size, ""}
if prevFile != "" { if prevFile != "" {
fm.FilesHashing <- fileEntry{prevFile, size, ""} fm.FilesHashing <- &fileEntry{prevFile, size, ""}
return 2 return 2
} }
@@ -162,7 +161,7 @@ func (fm *FilesMap) hashFile(path string, size int64) int64 {
} }
func (fm *FilesMap) hashImage(path string, size int64) { func (fm *FilesMap) hashImage(path string, size int64) {
fm.ImagesHashing <- imageEntry{path, size, 0} fm.ImagesHashing <- &imageEntry{path, size, 0}
} }
type imageEntry struct { type imageEntry struct {