Browse Source

minor clean up

pull/3519/head
chrislu 2 years ago
parent
commit
dbf0de4ce1
  1. 6
      weed/command/fix.go
  2. 10
      weed/util/file_util.go

6
weed/command/fix.go

@ -62,6 +62,10 @@ func (scanner *VolumeFileScanner4Fix) VisitNeedle(n *needle.Needle, offset int64
func runFix(cmd *Command, args []string) bool { func runFix(cmd *Command, args []string) bool {
for _, arg := range args { for _, arg := range args {
basePath, f := path.Split(util.ResolvePath(arg)) basePath, f := path.Split(util.ResolvePath(arg))
if util.FolderExists(arg) {
basePath = arg
f = ""
}
files := []fs.DirEntry{} files := []fs.DirEntry{}
if f == "" { if f == "" {
@ -72,7 +76,7 @@ func runFix(cmd *Command, args []string) bool {
} }
files = fileInfo files = fileInfo
} else { } else {
fileInfo, err := os.Stat(basePath + f)
fileInfo, err := os.Stat(arg)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)
return false return false

10
weed/util/file_util.go

@ -45,6 +45,16 @@ func FileExists(filename string) bool {
} }
func FolderExists(folder string) bool {
fileInfo, err := os.Stat(folder)
if err != nil {
return false
}
return fileInfo.IsDir()
}
func CheckFile(filename string) (exists, canRead, canWrite bool, modTime time.Time, fileSize int64) { func CheckFile(filename string) (exists, canRead, canWrite bool, modTime time.Time, fileSize int64) {
exists = true exists = true
fi, err := os.Stat(filename) fi, err := os.Stat(filename)

Loading…
Cancel
Save