also update modified files with -a #19

README.md

@@ -88,7 +88,7 @@ Flags:
   -H, --tips                           Show tips.
   -c, --check                          check mode: chkbit will verify files in readonly mode (default mode)
   -u, --update                         update mode: add and update indices
-  -a, --add-only                       add mode: only add new files, do not check existing (quicker)
+  -a, --add-only                       add mode: only add new and modified files, do not check existing (quicker)
   -i, --show-ignored-only              show-ignored mode: only show ignored files
   -m, --show-missing                   show missing files/directories
   -d, --include-dot                    include dot files

cmd/chkbit/main.go

@@ -46,7 +46,7 @@ var cli struct {
 	Tips            bool     `short:"H" help:"Show tips."`
 	Check           bool     `short:"c" help:"check mode: chkbit will verify files in readonly mode (default mode)"`
 	Update          bool     `short:"u" help:"update mode: add and update indices"`
-	AddOnly         bool     `short:"a" help:"add mode: only add new files, do not check existing (quicker)"`
+	AddOnly         bool     `short:"a" help:"add mode: only add new and modified files, do not check existing (quicker)"`
 	ShowIgnoredOnly bool     `short:"i" help:"show-ignored mode: only show ignored files"`
 	ShowMissing     bool     `short:"m" help:"show missing files/directories"`
 	IncludeDot      bool     `short:"d" help:"include dot files"`

index.go

@@ -64,6 +64,11 @@ func newIndex(context *Context, path string, files []string, dirList []string, r
 	}
 }
 
+func getMtime(path string) int64 {
+	info, _ := os.Stat(path)
+	return int64(info.ModTime().UnixNano() / 1e6)
+}
+
 func (i *Index) getIndexFilepath() string {
 	return filepath.Join(i.path, i.context.IndexFilename)
 }
@@ -106,7 +111,7 @@ func (i *Index) calcHashes(ignore *Ignore) {
 			if val.Algo != nil {
 				algo = *val.Algo
 			}
-			if i.context.AddOnly {
+			if i.context.AddOnly && !i.mtimeChanged(name, val) {
 				info = &val
 			} else {
 				info, err = i.calcFile(name, algo)
@@ -195,13 +200,16 @@ func (i *Index) checkFix(forceUpdateDmg bool) {
 		// added
 		i.modified = true
 	}
+}
 
+func (i *Index) mtimeChanged(name string, ii idxInfo) bool {
+	mtime := getMtime(filepath.Join(i.path, name))
+	return ii.ModTime != mtime
 }
 
 func (i *Index) calcFile(name string, a string) (*idxInfo, error) {
 	path := filepath.Join(i.path, name)
-	info, _ := os.Stat(path)
-	mtime := int64(info.ModTime().UnixNano() / 1e6)
+	mtime := getMtime(path)
 	h, err := Hashfile(path, a, i.context.perfMonBytes)
 	if err != nil {
 		return nil, err

scripts/run_test.go

@@ -232,8 +232,6 @@ func TestRoot(t *testing.T) {
 
 		genFiles(filepath.Join(root, "way/add"), 99)
 		genFile(filepath.Join(root, "time/add-file.txt"), 500)
-		// modify existing, will not be reported:
-		genFile(filepath.Join(root, "way/job/word-business.mp3"), 500)
 
 		cmd := exec.Command(tool, "-a", root)
 		out, err := cmd.Output()
@@ -247,6 +245,25 @@ func TestRoot(t *testing.T) {
 		checkOut(t, sout, "- 0 file hashes were updated")
 	})
 
+	// add modified files only
+	t.Run("add-only-mod", func(t *testing.T) {
+
+		// modify existing
+		genFile(filepath.Join(root, "way/job/word-business.mp3"), 500)
+
+		cmd := exec.Command(tool, "-a", root)
+		out, err := cmd.Output()
+		if err != nil {
+			t.Fatalf("failed with '%s'\n", err)
+		}
+		sout := string(out)
+		checkOut(t, sout, "old /tmp/chkbit/root/way/job/word-business.mp3")
+		checkOut(t, sout, "Processed 1 file")
+		checkOut(t, sout, "- 1 directory was updated")
+		checkOut(t, sout, "- 0 file hashes were added")
+		checkOut(t, sout, "- 1 file hash was updated")
+	})
+
 	// update remaining
 	t.Run("update-remaining-add", func(t *testing.T) {
 		cmd := exec.Command(tool, "-u", root)
@@ -256,9 +273,6 @@ func TestRoot(t *testing.T) {
 		}
 		sout := string(out)
 		checkOut(t, sout, "Processed 295 files")
-		checkOut(t, sout, "- 1 directory was updated")
-		checkOut(t, sout, "- 0 file hashes were added")
-		checkOut(t, sout, "- 1 file hash was updated")
 	})
 
 	// ignore dot