octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2025-01-03 15:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/fs: Consider win83 for root path as well when watching (ref #5706) (#5709)

Browse Source
This commit is contained in:
Simon Frei 2019-05-11 10:06:04 +02:00 committed by Jakob Borg
parent fbd445fe0a
commit dfbbb286fc
4 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/fs/basicfs_unix.go
View File

@ -76,3 +76,19 @@ func rel(path, prefix string) string {
}
var evalSymlinks = filepath.EvalSymlinks
// watchPaths adjust the folder root for use with the notify backend and the
// corresponding absolute path to be passed to notify to watch name.
func (f *BasicFilesystem) watchPaths(name string) (string, string, error) {
root, err := evalSymlinks(f.root)
if err != nil {
return "", "", err
}
absName, err := rooted(name, root)
if err != nil {
return "", "", err
}
return filepath.Join(absName, "..."), root, nil
}

24
lib/fs/basicfs_watch.go
View File

@ -11,8 +11,6 @@ package fs
import (
"context"
"errors"
"path/filepath"
"runtime"
"github.com/syncthing/notify"
)
@ -57,28 +55,6 @@ func (f *BasicFilesystem) Watch(name string, ignore Matcher, ctx context.Context
return outChan, nil
}
// watchPaths adjust the folder root for use with the notify backend and the
// corresponding absolute path to be passed to notify to watch name.
func (f *BasicFilesystem) watchPaths(name string) (string, string, error) {
root, err := evalSymlinks(f.root)
if err != nil {
return "", "", err
}
// Remove `\\?\` prefix if the path is just a drive letter as a dirty
// fix for https://github.com/syncthing/syncthing/issues/5578
if runtime.GOOS == "windows" && filepath.Clean(name) == "." && len(root) <= 7 && len(root) > 4 && root[:4] == `\\?\` {
root = root[4:]
}
absName, err := rooted(name, root)
if err != nil {
return "", "", err
}
return filepath.Join(absName, "..."), root, nil
}
func (f *BasicFilesystem) watchLoop(name, evalRoot string, backendChan chan notify.EventInfo, outChan chan<- Event, ignore Matcher, ctx context.Context) {
for {
// Detect channel overflow

25
lib/fs/basicfs_windows.go
View File

@ -222,3 +222,28 @@ func evalSymlinks(in string) (string, error) {
}
return longFilenameSupport(out), nil
}
// watchPaths adjust the folder root for use with the notify backend and the
// corresponding absolute path to be passed to notify to watch name.
func (f *BasicFilesystem) watchPaths(name string) (string, string, error) {
root, err := evalSymlinks(f.root)
if err != nil {
return "", "", err
}
// Remove `\\?\` prefix if the path is just a drive letter as a dirty
// fix for https://github.com/syncthing/syncthing/issues/5578
if filepath.Clean(name) == "." && len(root) <= 7 && len(root) > 4 && root[:4] == `\\?\` {
root = root[4:]
}
absName, err := rooted(name, root)
if err != nil {
return "", "", err
}
root = f.resolveWin83(root)
absName = f.resolveWin83(absName)
return filepath.Join(absName, "..."), root, nil
}

8
lib/fs/basicfs_windows_test.go
View File

@ -44,6 +44,10 @@ func TestWindowsPaths(t *testing.T) {
func TestResolveWindows83(t *testing.T) {
fs, dir := setup(t)
if isMaybeWin83(dir) {
dir = fs.resolveWin83(dir)
fs = newBasicFilesystem(dir)
}
defer os.RemoveAll(dir)
shortAbs, _ := fs.rooted("LFDATA~1")
@ -71,6 +75,10 @@ func TestResolveWindows83(t *testing.T) {
func TestIsWindows83(t *testing.T) {
fs, dir := setup(t)
if isMaybeWin83(dir) {
dir = fs.resolveWin83(dir)
fs = newBasicFilesystem(dir)
}
defer os.RemoveAll(dir)
tempTop, _ := fs.rooted(TempName("baz"))