X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fstfolder.go;h=ca001a3b8064a0412cd7e164e23b58e976bc7c2e;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=1a5a7ec54bd69bc3ccee41696518b266179c5652;hpb=2f7828d01f4c4ca2909f95f098627cd5475ed225;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 1a5a7ec..ca001a3 100644
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017-2018 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package st
 
 import (
@@ -6,7 +23,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 	stconfig "github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/protocol"
 )
@@ -53,6 +70,12 @@ func (s *SyncThing) FolderLoadFromStConfig(f *[]xsapiv1.FolderConfig) error {
 
 // FolderChange is called when configuration has changed
 func (s *SyncThing) FolderChange(f xsapiv1.FolderConfig) (string, error) {
+	var label, id string
+
+	if id = f.ID; id == "" {
+		s.log.Errorf("Try to create Syncthing folder with null ID: %v", f)
+		return "", fmt.Errorf("Cannot create Syncthing folder (ID must be set")
+	}
 
 	// Get current config
 	stCfg, err := s.ConfigGet()
@@ -87,13 +110,9 @@ func (s *SyncThing) FolderChange(f xsapiv1.FolderConfig) (string, error) {
 	}
 
 	// Add or update Folder settings
-	var label, id string
 	if label = f.Label; label == "" {
 		label = strings.Split(id, "/")[0]
 	}
-	if id = f.ID; id == "" {
-		id = stClientID[0:15] + "_" + label
-	}
 
 	folder := stconfig.FolderConfiguration{
 		ID:    id,