From 387641b4352d9f9da0d036db68a79e1fadbd4b5d Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Thu, 18 May 2017 23:18:04 +0200 Subject: Normalize relativePath projects to support Windows path. --- lib/model/folder.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/model/folder.go') diff --git a/lib/model/folder.go b/lib/model/folder.go index be1bc33..e461f9c 100644 --- a/lib/model/folder.go +++ b/lib/model/folder.go @@ -3,6 +3,7 @@ package model import ( "fmt" + "github.com/iotbzh/xds-server/lib/common" "github.com/iotbzh/xds-server/lib/syncthing" "github.com/iotbzh/xds-server/lib/xdsconfig" ) @@ -69,8 +70,13 @@ func (c *Folder) UpdateFolder(newFolder xdsconfig.FolderConfig) (xdsconfig.Folde return xdsconfig.FolderConfig{}, err } + // Normalize path (needed for Windows path including bashlashes) + newFolder.RelativePath = common.PathNormalize(newFolder.RelativePath) + + // Update config folder c.Conf.Folders = c.Conf.Folders.Update(xdsconfig.FoldersConfig{newFolder}) + // Update Syncthing folder err := c.SThg.FolderChange(newFolder) newFolder.BuilderSThgID = c.Conf.Builder.SyncThingID // FIXME - should be removed after local ST config rework -- cgit 1.2.3-korg