Use go module as dependency tool instead of glide

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

diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 70ac70a..ca001a3 100644 (file)
--- 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,13 +23,13 @@ import (
        "path/filepath"
        "strings"
 
-       "github.com/iotbzh/xds-server/lib/folder"
-       "github.com/syncthing/syncthing/lib/config"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
+       stconfig "github.com/syncthing/syncthing/lib/config"
        "github.com/syncthing/syncthing/lib/protocol"
 )
 
 // FolderLoadFromStConfig Load/Retrieve folder config from syncthing database
-func (s *SyncThing) FolderLoadFromStConfig(f *[]folder.FolderConfig) error {
+func (s *SyncThing) FolderLoadFromStConfig(f *[]xsapiv1.FolderConfig) error {
 
        defaultSdk := "" // cannot know which was the default sdk
 
@@ -32,19 +49,19 @@ func (s *SyncThing) FolderLoadFromStConfig(f *[]folder.FolderConfig) error {
        }
 
        for _, stFld := range stCfg.Folders {
-               cliPath := strings.TrimPrefix(stFld.RawPath, s.conf.FileConf.ShareRootDir)
+               cliPath := strings.TrimPrefix(stFld.Path, s.conf.FileConf.ShareRootDir)
                if cliPath == "" {
-                       cliPath = stFld.RawPath
+                       cliPath = stFld.Path
                }
-               *f = append(*f, folder.FolderConfig{
+               *f = append(*f, xsapiv1.FolderConfig{
                        ID:            stFld.ID,
                        Label:         stFld.Label,
                        ClientPath:    strings.TrimRight(cliPath, "/"),
-                       Type:          folder.TypeCloudSync,
-                       Status:        folder.StatusDisable,
+                       Type:          xsapiv1.TypeCloudSync,
+                       Status:        xsapiv1.StatusDisable,
                        DefaultSdk:    defaultSdk,
                        RootPath:      s.conf.FileConf.ShareRootDir,
-                       DataCloudSync: folder.CloudSyncConfig{SyncThingID: devID},
+                       DataCloudSync: xsapiv1.CloudSyncConfig{SyncThingID: devID},
                })
        }
 
@@ -52,7 +69,13 @@ func (s *SyncThing) FolderLoadFromStConfig(f *[]folder.FolderConfig) error {
 }
 
 // FolderChange is called when configuration has changed
-func (s *SyncThing) FolderChange(f folder.FolderConfig) (string, error) {
+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()
@@ -69,7 +92,7 @@ func (s *SyncThing) FolderChange(f folder.FolderConfig) (string, error) {
                return "", err
        }
 
-       newDevice := config.DeviceConfiguration{
+       newDevice := stconfig.DeviceConfiguration{
                DeviceID:  devID,
                Name:      stClientID,
                Addresses: []string{"dynamic"},
@@ -87,30 +110,26 @@ func (s *SyncThing) FolderChange(f folder.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 := config.FolderConfiguration{
-               ID:      id,
-               Label:   label,
-               RawPath: filepath.Join(s.conf.FileConf.ShareRootDir, f.ClientPath),
+       folder := stconfig.FolderConfiguration{
+               ID:    id,
+               Label: label,
+               Path:  filepath.Join(s.conf.FileConf.ShareRootDir, f.ClientPath),
        }
 
        if s.conf.FileConf.SThgConf.RescanIntervalS > 0 {
                folder.RescanIntervalS = s.conf.FileConf.SThgConf.RescanIntervalS
        }
 
-       folder.Devices = append(folder.Devices, config.FolderDeviceConfiguration{
+       folder.Devices = append(folder.Devices, stconfig.FolderDeviceConfiguration{
                DeviceID: newDevice.DeviceID,
        })
 
        found = false
-       var fld config.FolderConfiguration
+       var fld stconfig.FolderConfiguration
        for _, fld = range stCfg.Folders {
                if folder.ID == fld.ID {
                        fld = folder
@@ -155,8 +174,8 @@ func (s *SyncThing) FolderDelete(id string) error {
 }
 
 // FolderConfigGet Returns the configuration of a specific folder
-func (s *SyncThing) FolderConfigGet(folderID string) (config.FolderConfiguration, error) {
-       fc := config.FolderConfiguration{}
+func (s *SyncThing) FolderConfigGet(folderID string) (stconfig.FolderConfiguration, error) {
+       fc := stconfig.FolderConfiguration{}
        if folderID == "" {
                return fc, fmt.Errorf("folderID not set")
        }