fix windows atom mode #31

laktak · laktak · commit 17ed16d84b0c · 2025-06-02T19:44:35.000+02:00
diff --git a/cmd/chkbit/main.go b/cmd/chkbit/main.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"os/signal"
+	slpath "path"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -148,6 +149,27 @@ type CLIDedup struct {
 	} `cmd:"" help:"run deduplication, makes all duplicate file blocks point to the same space; requires supported OS & filesystem (see tips)"`
 }
 
+func toSlash(paths []string) []string {
+	for i, path := range paths {
+		paths[i] = filepath.ToSlash(path)
+	}
+	return paths
+}
+
+func (cli *CLI) toSlash() {
+	cli.Check.Paths = toSlash(cli.Check.Paths)
+	cli.Add.Paths = toSlash(cli.Add.Paths)
+	cli.Update.Paths = toSlash(cli.Update.Paths)
+	cli.Init.Path = filepath.ToSlash(cli.Init.Path)
+	cli.Fuse.Path = filepath.ToSlash(cli.Fuse.Path)
+	cli.Dedup.Detect.Path = filepath.ToSlash(cli.Dedup.Detect.Path)
+	cli.Dedup.Show.Path = filepath.ToSlash(cli.Dedup.Show.Path)
+	cli.Dedup.Run.Path = filepath.ToSlash(cli.Dedup.Run.Path)
+	cli.Util.Fileext.Paths = toSlash(cli.Util.Fileext.Paths)
+	cli.Util.Filededup.Paths = toSlash(cli.Util.Filededup.Paths)
+	cli.ShowIgnored.Paths = toSlash(cli.ShowIgnored.Paths)
+}
+
 type Main struct {
 	context    *chkbit.Context
 	dedup      *chkbit.Dedup
@@ -441,7 +463,7 @@ func (m *Main) run() int {
 	var configPath = "chkbit-config.json"
 	configRoot, err := os.UserConfigDir()
 	if err == nil {
-		configPath = filepath.Join(configRoot, "chkbit/config.json")
+		configPath = slpath.Join(configRoot, "chkbit/config.json")
 	}
 
 	var cli CLI
@@ -460,6 +482,8 @@ func (m *Main) run() int {
 		ctx = kong.Parse(&cli, kongOptions...)
 	}
 
+	cli.toSlash()
+
 	if cli.Quiet {
 		m.progress = Quiet
 	} else if fileInfo, err := os.Stdout.Stat(); err == nil && (fileInfo.Mode()&os.ModeCharDevice) == 0 {
diff --git a/context.go b/context.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	slpath "path"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -193,7 +194,7 @@ func (context *Context) scanDir(root string, parentIgnore *Ignore, depth int) {
 	}
 
 	for _, file := range files {
-		path := filepath.Join(root, file.Name())
+		path := slpath.Join(root, file.Name())
 		if isDir(file, path, context.SkipSymlinks) {
 			if !ignore.shouldIgnore(file.Name()) {
 				dirList = append(dirList, file.Name())
@@ -209,7 +210,7 @@ func (context *Context) scanDir(root string, parentIgnore *Ignore, depth int) {
 
 	if !context.SkipSubdirectories && (context.MaxDepth == 0 || depth < context.MaxDepth) {
 		for _, name := range dirList {
-			context.scanDir(filepath.Join(root, name), ignore, depth+1)
+			context.scanDir(slpath.Join(root, name), ignore, depth+1)
 		}
 	}
 }
@@ -223,14 +224,15 @@ func (context *Context) UseAtomIndexStore(root string, pathList []string) (relat
 		}
 
 		// below root?
-		if !strings.HasPrefix(path, root) {
+		if !strings.HasPrefix(filepath.ToSlash(path), root) {
 			return nil, fmt.Errorf("path %s is not below the atom index in %s", path, root)
 		}
 
 		relativePath, err := filepath.Rel(root, path)
 		if err != nil {
 			return nil, err
 		}
+		relativePath = filepath.ToSlash(relativePath)
 		relativePathList = append(relativePathList, relativePath)
 	}
 
diff --git a/dedup.go b/dedup.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path/filepath"
+	slpath "path"
 	"slices"
 	"time"
 
@@ -116,7 +116,7 @@ func NewDedup(path string, indexName string, createIfNotExists bool) (*Dedup, er
 		LogQueue:  make(chan *LogEvent, 100),
 		PerfQueue: make(chan *DedupPerfEvent, 100),
 	}
-	dedupFile := filepath.Join(path, d.indexName+dedupSuffix)
+	dedupFile := slpath.Join(path, d.indexName+dedupSuffix)
 
 	_, err = os.Stat(dedupFile)
 	if err != nil {
@@ -254,7 +254,7 @@ func (d *Dedup) DetectDupes(minSize uint64, verbose bool) (err error) {
 	for hash, bag := range all {
 		if bag.Size == -1 {
 			for _, p := range bag.ItemList {
-				if s, err := os.Stat(filepath.Join(d.rootPath, p.Path)); err == nil {
+				if s, err := os.Stat(slpath.Join(d.rootPath, p.Path)); err == nil {
 					bag.Size = s.Size()
 					break
 				}
@@ -319,7 +319,7 @@ func (d *Dedup) DetectDupes(minSize uint64, verbose bool) (err error) {
 			var matches []match
 			d.perfMonFiles(len(bag.ItemList), float64(i), len(all))
 			for _, item := range bag.ItemList {
-				if res, err := GetFileExtents(filepath.Join(d.rootPath, item.Path)); err == nil {
+				if res, err := GetFileExtents(slpath.Join(d.rootPath, item.Path)); err == nil {
 					matches = append(matches, match{-1, res, item})
 				} else if IsNotSupported(err) {
 					matches = append(matches, match{-1, nil, item})
@@ -508,8 +508,8 @@ func (d *Dedup) Dedup(hashes []string, verbose bool) error {
 				}
 
 				if !list[i].Merged {
-					a := filepath.Join(d.rootPath, list[0].Path)
-					b := filepath.Join(d.rootPath, list[i].Path)
+					a := slpath.Join(d.rootPath, list[0].Path)
+					b := slpath.Join(d.rootPath, list[i].Path)
 					if verbose {
 						d.logMsg(fmt.Sprintf("dedup %s %s \"%s\" -- \"%s\"", hash, intutil.FormatSize(uint64(bag.Size)), a, b))
 					} else {
diff --git a/fuse.go b/fuse.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path/filepath"
+	slpath "path"
 )
 
 type fuseStore struct {
@@ -69,7 +69,7 @@ func (f *fuseStore) fuseScanDir(root, prefix string) {
 	}
 
 	for _, file := range files {
-		path := filepath.Join(root, file.Name())
+		path := slpath.Join(root, file.Name())
 		if isDir(file, path, f.skipSymlinks) {
 			newPrefix := prefix + file.Name() + "/"
 			if fileName, ok, _ := existsMarkerFile(IndexTypeAtom, path, f.indexName); ok {
diff --git a/ignore.go b/ignore.go
@@ -3,7 +3,7 @@ package chkbit
 import (
 	"bufio"
 	"os"
-	"path/filepath"
+	slpath "path"
 	"strings"
 )
 
@@ -20,7 +20,7 @@ func GetIgnore(context *Context, path string, parentIgnore *Ignore) (*Ignore, er
 		parentIgnore: parentIgnore,
 		context:      context,
 		path:         path,
-		name:         filepath.Base(path) + "/",
+		name:         slpath.Base(path) + "/",
 	}
 	err := ignore.loadIgnore()
 	if err != nil {
@@ -30,7 +30,7 @@ func GetIgnore(context *Context, path string, parentIgnore *Ignore) (*Ignore, er
 }
 
 func (ignore *Ignore) getIgnoreFilepath() string {
-	return filepath.Join(ignore.path, ignore.context.IgnoreFilename)
+	return slpath.Join(ignore.path, ignore.context.IgnoreFilename)
 }
 
 func (ignore *Ignore) loadIgnore() error {
@@ -76,11 +76,11 @@ func (ignore *Ignore) shouldIgnore2(name string, fullname string) bool {
 				item = item[1:]
 			}
 		}
-		if match, _ := filepath.Match(item, name); match {
+		if match, _ := slpath.Match(item, name); match {
 			return true
 		}
 		if fullname != "" {
-			if match, _ := filepath.Match(item, fullname); match {
+			if match, _ := slpath.Match(item, fullname); match {
 				return true
 			}
 		}
diff --git a/index.go b/index.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"os"
-	"path/filepath"
+	slpath "path"
 	"slices"
 )
 
@@ -72,19 +72,19 @@ func getMtS(path string) (mtime, size int64, err error) {
 }
 
 func (i *Index) getIndexFilepath() string {
-	return filepath.Join(i.path, i.context.IndexFilename)
+	return slpath.Join(i.path, i.context.IndexFilename)
 }
 
 func (i *Index) logFilePanic(name string, message string) {
-	i.context.log(StatusPanic, filepath.Join(i.path, name)+": "+message)
+	i.context.log(StatusPanic, slpath.Join(i.path, name)+": "+message)
 }
 
 func (i *Index) logFile(stat Status, name string) {
-	i.context.log(stat, filepath.Join(i.path, name))
+	i.context.log(stat, slpath.Join(i.path, name))
 }
 
 func (i *Index) logDir(stat Status, name string) {
-	i.context.log(stat, filepath.Join(i.path, name)+"/")
+	i.context.log(stat, slpath.Join(i.path, name)+"/")
 }
 
 func (i *Index) calcHashes(ignore *Ignore) {
@@ -196,12 +196,12 @@ func (i *Index) checkFix(forceUpdateDmg bool) {
 }
 
 func (i *Index) mtimeChanged(name string, ii idxInfo) bool {
-	mtime, _, _ := getMtS(filepath.Join(i.path, name))
+	mtime, _, _ := getMtS(slpath.Join(i.path, name))
 	return ii.ModTime != mtime
 }
 
 func (i *Index) calcFile(name string, algo string) (*idxInfo, error) {
-	path := filepath.Join(i.path, name)
+	path := slpath.Join(i.path, name)
 	mtime, size, err := getMtS(path)
 	if err != nil {
 		return nil, err
diff --git a/indexstore.go b/indexstore.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"os"
+	slpath "path"
 	"path/filepath"
 	"slices"
 	"sync"
@@ -209,7 +210,7 @@ func (s *indexStore) Save(indexPath string, value []byte) error {
 		s.storeDbQueue <- &storeDbItem{[]byte(indexPath), value}
 	} else {
 		// try to preserve the directory mod time but ignore if unsupported
-		dirPath := filepath.Dir(indexPath)
+		dirPath := slpath.Dir(indexPath)
 		dirStat, dirErr := os.Stat(dirPath)
 		err = os.WriteFile(indexPath, value, 0644)
 		if dirErr == nil {
@@ -297,7 +298,7 @@ func (s *indexStore) exportCache(dbFile, suffix string) (exportFile string, err
 			}
 
 			// remove index filename
-			key := filepath.Dir(string(k))
+			key := slpath.Dir(string(k))
 			if key == "." {
 				key = ""
 			}
@@ -431,12 +432,12 @@ func verifyAtomJsonHead(decoder *json.Decoder) error {
 }
 
 func getAtomFile(path, indexName, suffix string) string {
-	return filepath.Join(path, indexName+atomSuffix+suffix)
+	return slpath.Join(path, indexName+atomSuffix+suffix)
 }
 
 func getMarkerFile(st IndexType, path, indexName string) string {
 	if st == IndexTypeSplit {
-		return filepath.Join(path, indexName)
+		return slpath.Join(path, indexName)
 	} else {
 		return getAtomFile(path, indexName, "")
 	}
@@ -502,6 +503,7 @@ func LocateIndex(startPath string, filter IndexType, indexName string) (st Index
 	if path, err = filepath.Abs(startPath); err != nil {
 		return
 	}
+	path = filepath.ToSlash(path)
 	for {
 		var ok bool
 		for _, st = range IndexTypeList {
@@ -512,8 +514,8 @@ func LocateIndex(startPath string, filter IndexType, indexName string) (st Index
 			}
 		}
 
-		path = filepath.Dir(path)
-		if len(path) < 1 || path[len(path)-1] == filepath.Separator {
+		path = slpath.Dir(path)
+		if len(path) < 1 || path[len(path)-1] == '/' {
 			// reached root
 			err = errMissingIndex
 			return

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"errors"`
`5`	`5`	`"fmt"`
`6`	`6`	`"os"`
	`7`	`+ slpath "path"`
`7`	`8`	`"path/filepath"`
`8`	`9`	`"strings"`
`9`	`10`	`"sync"`
`@@ -193,7 +194,7 @@ func (context Context) scanDir(root string, parentIgnore Ignore, depth int) {`
`193`	`194`	`}`
`194`	`195`
`195`	`196`	`for _, file := range files {`
`196`		`- path := filepath.Join(root, file.Name())`
	`197`	`+ path := slpath.Join(root, file.Name())`
`197`	`198`	`if isDir(file, path, context.SkipSymlinks) {`
`198`	`199`	`if !ignore.shouldIgnore(file.Name()) {`
`199`	`200`	`dirList = append(dirList, file.Name())`
`@@ -209,7 +210,7 @@ func (context Context) scanDir(root string, parentIgnore Ignore, depth int) {`
`209`	`210`
`210`	`211`	`if !context.SkipSubdirectories && (context.MaxDepth == 0 \|\| depth < context.MaxDepth) {`
`211`	`212`	`for _, name := range dirList {`
`212`		`- context.scanDir(filepath.Join(root, name), ignore, depth+1)`
	`213`	`+ context.scanDir(slpath.Join(root, name), ignore, depth+1)`
`213`	`214`	`}`
`214`	`215`	`}`
`215`	`216`	`}`
`@@ -223,14 +224,15 @@ func (context *Context) UseAtomIndexStore(root string, pathList []string) (relat`
`223`	`224`	`}`
`224`	`225`
`225`	`226`	`// below root?`
`226`		`- if !strings.HasPrefix(path, root) {`
	`227`	`+ if !strings.HasPrefix(filepath.ToSlash(path), root) {`
`227`	`228`	`return nil, fmt.Errorf("path %s is not below the atom index in %s", path, root)`
`228`	`229`	`}`
`229`	`230`
`230`	`231`	`relativePath, err := filepath.Rel(root, path)`
`231`	`232`	`if err != nil {`
`232`	`233`	`return nil, err`
`233`	`234`	`}`
	`235`	`+ relativePath = filepath.ToSlash(relativePath)`
`234`	`236`	`relativePathList = append(relativePathList, relativePath)`
`235`	`237`	`}`
`236`	`238`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package chkbit`
`3`	`3`	`import (`
`4`	`4`	`"bufio"`
`5`	`5`	`"os"`
`6`		`- "path/filepath"`
	`6`	`+ slpath "path"`
`7`	`7`	`"strings"`
`8`	`8`	`)`
`9`	`9`
`@@ -20,7 +20,7 @@ func GetIgnore(context Context, path string, parentIgnore Ignore) (*Ignore, er`
`20`	`20`	`parentIgnore: parentIgnore,`
`21`	`21`	`context: context,`
`22`	`22`	`path: path,`
`23`		`- name: filepath.Base(path) + "/",`
	`23`	`+ name: slpath.Base(path) + "/",`
`24`	`24`	`}`
`25`	`25`	`err := ignore.loadIgnore()`
`26`	`26`	`if err != nil {`
`@@ -30,7 +30,7 @@ func GetIgnore(context Context, path string, parentIgnore Ignore) (*Ignore, er`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`func (ignore *Ignore) getIgnoreFilepath() string {`
`33`		`- return filepath.Join(ignore.path, ignore.context.IgnoreFilename)`
	`33`	`+ return slpath.Join(ignore.path, ignore.context.IgnoreFilename)`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func (ignore *Ignore) loadIgnore() error {`
`@@ -76,11 +76,11 @@ func (ignore *Ignore) shouldIgnore2(name string, fullname string) bool {`
`76`	`76`	`item = item[1:]`
`77`	`77`	`}`
`78`	`78`	`}`
`79`		`- if match, _ := filepath.Match(item, name); match {`
	`79`	`+ if match, _ := slpath.Match(item, name); match {`
`80`	`80`	`return true`
`81`	`81`	`}`
`82`	`82`	`if fullname != "" {`
`83`		`- if match, _ := filepath.Match(item, fullname); match {`
	`83`	`+ if match, _ := slpath.Match(item, fullname); match {`
`84`	`84`	`return true`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"errors"`
`6`	`6`	`"os"`
`7`		`- "path/filepath"`
	`7`	`+ slpath "path"`
`8`	`8`	`"slices"`
`9`	`9`	`)`
`10`	`10`
`@@ -72,19 +72,19 @@ func getMtS(path string) (mtime, size int64, err error) {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func (i *Index) getIndexFilepath() string {`
`75`		`- return filepath.Join(i.path, i.context.IndexFilename)`
	`75`	`+ return slpath.Join(i.path, i.context.IndexFilename)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`func (i *Index) logFilePanic(name string, message string) {`
`79`		`- i.context.log(StatusPanic, filepath.Join(i.path, name)+": "+message)`
	`79`	`+ i.context.log(StatusPanic, slpath.Join(i.path, name)+": "+message)`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`func (i *Index) logFile(stat Status, name string) {`
`83`		`- i.context.log(stat, filepath.Join(i.path, name))`
	`83`	`+ i.context.log(stat, slpath.Join(i.path, name))`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`func (i *Index) logDir(stat Status, name string) {`
`87`		`- i.context.log(stat, filepath.Join(i.path, name)+"/")`
	`87`	`+ i.context.log(stat, slpath.Join(i.path, name)+"/")`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`func (i Index) calcHashes(ignore Ignore) {`
`@@ -196,12 +196,12 @@ func (i *Index) checkFix(forceUpdateDmg bool) {`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`func (i *Index) mtimeChanged(name string, ii idxInfo) bool {`
`199`		`- mtime, _, _ := getMtS(filepath.Join(i.path, name))`
	`199`	`+ mtime, _, _ := getMtS(slpath.Join(i.path, name))`
`200`	`200`	`return ii.ModTime != mtime`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`func (i Index) calcFile(name string, algo string) (idxInfo, error) {`
`204`		`- path := filepath.Join(i.path, name)`
	`204`	`+ path := slpath.Join(i.path, name)`
`205`	`205`	`mtime, size, err := getMtS(path)`
`206`	`206`	`if err != nil {`
`207`	`207`	`return nil, err`