Fixed folder ID and label generation.

[src/xds/xds-server.git] / lib / syncthing / folder-st.go

diff --git a/lib/syncthing/folder-st.go b/lib/syncthing/folder-st.go
index ae95b27..f25a505 100644 (file)
--- a/lib/syncthing/folder-st.go
+++ b/lib/syncthing/folder-st.go
@@ -39,7 +39,11 @@ func (f *STFolder) NewUID(suffix string) string {
        if i > 15 {
                i = 15
        }
-       return uuid.NewV1().String()[:14] + f.st.MyID[:i] + "_" + suffix
+       uuid := uuid.NewV1().String()[:14] + f.st.MyID[:i]
+       if len(suffix) > 0 {
+               uuid += "_" + suffix
+       }
+       return uuid
 }
 
 // Add a new folder
@@ -58,7 +62,7 @@ func (f *STFolder) Add(cfg folder.FolderConfig) (*folder.FolderConfig, error) {
        f.fConfig = cfg
 
        // Update Syncthing folder
-       // (expect if status is ErrorConfig)
+       // (except if status is ErrorConfig)
        // TODO: add cache to avoid multiple requests on startup
        if f.fConfig.Status != folder.StatusErrorConfig {
                id, err := f.st.FolderChange(f.fConfig)