X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Ffolder-st.go;h=7e1fe55a406bcd51eecc0f57c20d65f892d21f33;hb=4feb29ac401c7f8416e55ae51ba16cc6819f6a2c;hp=a372b6f74e7f66a9e0f52797f0a8f1b8e2c91074;hpb=8b490b817a83836afd66162e2b507c8d320c73cd;p=src%2Fxds%2Fxds-server.git diff --git a/lib/syncthing/folder-st.go b/lib/syncthing/folder-st.go index a372b6f..7e1fe55 100644 --- a/lib/syncthing/folder-st.go +++ b/lib/syncthing/folder-st.go @@ -2,6 +2,7 @@ package st import ( "fmt" + "os" "path/filepath" "strings" @@ -129,7 +130,15 @@ func (f *STFolder) ConvPathSvr2Cli(s string) string { // Remove a folder func (f *STFolder) Remove() error { - return f.st.FolderDelete(f.stfConfig.ID) + err := f.st.FolderDelete(f.stfConfig.ID) + + // Delete folder on server side + err2 := os.RemoveAll(f.GetFullPath("")) + + if err != nil { + return err + } + return err2 } // RegisterEventChange requests registration for folder event change