X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fstfolder.go;h=94d278cd4fb4077c618eb27f06009bce1b980f70;hb=247bb7c2db5f0d48178398599348249bf886ebbc;hp=196e3c7ec1e702d9d3f8990fc35678740c5296c9;hpb=2d90eac319979dba64371258b30e61e77a15db7d;p=src%2Fxds%2Fxds-agent.git diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go index 196e3c7..94d278c 100644 --- a/lib/syncthing/stfolder.go +++ b/lib/syncthing/stfolder.go @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2017-2018 "IoT.bzh" + * Author Sebastien Douheret + * + * 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 ( @@ -5,7 +22,7 @@ import ( "fmt" "strings" - common "github.com/iotbzh/xds-common/golib" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git" stconfig "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/protocol" ) @@ -20,7 +37,7 @@ type FolderChangeArg struct { // FolderLoadFromStConfig Load/Retrieve folder config from syncthing database /* -func (s *SyncThing) FolderLoadFromStConfig(f *[]XdsFolderConfig) error { +func (s *SyncThing) FolderLoadFromStConfig(f *[]xsapiv1.FolderConfig) error { defaultSdk := "" // cannot know which was the default sdk @@ -40,15 +57,15 @@ func (s *SyncThing) FolderLoadFromStConfig(f *[]XdsFolderConfig) error { } for _, stFld := range stCfg.Folders { - *f = append(*f, XdsFolderConfig{ + *f = append(*f, xsapiv1.FolderConfig{ ID: stFld.ID, Label: stFld.Label, ClientPath: strings.TrimRight(stFld.Path, "/"), - Type: XdsTypeCloudSync, + Type: xsapiv1.TypeCloudSync, Status: StatusDisable, DefaultSdk: defaultSdk, RootPath: "", - DataCloudSync: XdsCloudSyncConfig{SyncThingID: devID}, + DataCloudSync: xsapiv1.CloudSyncConfig{SyncThingID: devID}, }) }