From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Tue, 17 Oct 2017 20:07:33 +0000 (+0200)
Subject: Delete folders on disk (Server side and for Syncthing folder only)
X-Git-Tag: v0.3.2~2
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-server.git;a=commitdiff_plain;h=4feb29ac401c7f8416e55ae51ba16cc6819f6a2c

Delete folders on disk (Server side and for Syncthing folder only)
---

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