Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bump Syncthing 0.14.38
[src/xds/xds-server.git]
/
lib
/
syncthing
/
stfolder.go
diff --git
a/lib/syncthing/stfolder.go
b/lib/syncthing/stfolder.go
index
70ac70a
..
5c570a5
100644
(file)
--- a/
lib/syncthing/stfolder.go
+++ b/
lib/syncthing/stfolder.go
@@
-32,9
+32,9
@@
func (s *SyncThing) FolderLoadFromStConfig(f *[]folder.FolderConfig) error {
}
for _, stFld := range stCfg.Folders {
}
for _, stFld := range stCfg.Folders {
- cliPath := strings.TrimPrefix(stFld.
Raw
Path, s.conf.FileConf.ShareRootDir)
+ cliPath := strings.TrimPrefix(stFld.Path, s.conf.FileConf.ShareRootDir)
if cliPath == "" {
if cliPath == "" {
- cliPath = stFld.
Raw
Path
+ cliPath = stFld.Path
}
*f = append(*f, folder.FolderConfig{
ID: stFld.ID,
}
*f = append(*f, folder.FolderConfig{
ID: stFld.ID,
@@
-96,9
+96,9
@@
func (s *SyncThing) FolderChange(f folder.FolderConfig) (string, error) {
}
folder := config.FolderConfiguration{
}
folder := config.FolderConfiguration{
- ID:
id,
- Label:
label,
-
RawPath:
filepath.Join(s.conf.FileConf.ShareRootDir, f.ClientPath),
+ ID: id,
+ Label: label,
+
Path:
filepath.Join(s.conf.FileConf.ShareRootDir, f.ClientPath),
}
if s.conf.FileConf.SThgConf.RescanIntervalS > 0 {
}
if s.conf.FileConf.SThgConf.RescanIntervalS > 0 {