as per wxiaoguang

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

modules/options/base.go

@@ -26,8 +26,11 @@ func walkAssetDir(root string, callback func(path, name string, d fs.DirEntry, e
 			}
 			return err
 		}
-		if d.IsDir() && util.CommonSkipDir(d.Name()) {
-			return fs.SkipDir
+		if util.CommonSkip(d.Name()) {
+			if d.IsDir() {
+				return fs.SkipDir
+			}
+			return nil
 		}
 		return callback(path, name, d, err)
 	}); err != nil && !os.IsNotExist(err) {

modules/templates/base.go

@@ -111,8 +111,11 @@ func walkAssetDir(root string, skipMail bool, callback func(path, name string, d
 		if skipMail && path == mailRoot && d.IsDir() {
 			return fs.SkipDir
 		}
-		if d.IsDir() && util.CommonSkipDir(d.Name()) { // Because Macs...
-			return fs.SkipDir
+		if util.CommonSkip(d.Name()) {
+			if d.IsDir() {
+				return fs.SkipDir
+			}
+			return nil
 		}
 		if strings.HasSuffix(d.Name(), ".tmpl") || d.IsDir() {
 			return callback(path, name, d, err)

modules/util/path.go

@@ -90,7 +90,7 @@ func statDir(dirPath, recPath string, includeDir, isDirOnly, followSymlinks bool
 
 	statList := make([]string, 0)
 	for _, fi := range fis {
-		if fi.IsDir() && CommonSkipDir(fi.Name()) {
+		if CommonSkip(fi.Name()) {
 			continue
 		}
 
@@ -199,8 +199,20 @@ func HomeDir() (home string, err error) {
 	return home, nil
 }
 
-// CommonSkipDir will check a provided name to see if it represents directory that should not be watched
-func CommonSkipDir(name string) bool {
-	// Check for Mac's .DS_Store entries
-	return name == ".DS_Store"
+// CommonSkip will check a provided name to see if it represents file or directory that should not be watched
+func CommonSkip(name string) bool {
+	if name == "" {
+		return true
+	}
+
+	switch name[0] {
+	case '.':
+		return true
+	case 't', 'T':
+		return name[1:] == "humbs.db"
+	case 'd', 'D':
+		return name[1:] == "esktop.ini"
+	}
+
+	return false
 }