1- // SPDX-FileCopyrightText: 2018-2020 Michael Picht <[email protected] > 2- //
3- // SPDX-License-Identifier: GPL-3.0-or-later
4-
51package smsync
62
73import (
@@ -11,8 +7,9 @@ import (
117 "time"
128
139 log "github.com/sirupsen/logrus"
14- "gitlab.com/mipimipi/go-utils"
15- "gitlab.com/mipimipi/go-utils/file"
10+ "gitlab.com/go-utilities/file"
11+ fp "gitlab.com/go-utilities/filepath"
12+ "gitlab.com/go-utilities/reflect"
1613)
1714
1815// errDir is the directory that stores error logs from conversion
@@ -32,14 +29,14 @@ func assembleTrgFile(cfg *Config, srcFile string) string {
3229 // if corresponding conversion rule is for '*' ...
3330 if cvm .TrgSuffix == suffixStar {
3431 // ... target suffix is same as source suffix
35- trgSuffix = file .Suffix (srcFile )
32+ trgSuffix = fp .Suffix (srcFile )
3633 } else {
3734 // ... otherwise take target suffix from conversion rule
3835 trgSuffix = cvm .TrgSuffix
3936 }
4037
41- trgFile , err := file .PathRelCopy (cfg .SrcDir .Path (),
42- file .PathTrunk (srcFile )+ "." + trgSuffix ,
38+ trgFile , err := fp .PathRelCopy (cfg .SrcDir .Path (),
39+ fp .PathTrunk (srcFile )+ "." + trgSuffix ,
4340 cfg .TrgDir .Path ())
4441 if err != nil {
4542 log .Errorf ("Target path cannot be assembled: %v" , err )
@@ -72,7 +69,7 @@ func deleteObsoleteFiles(cfg *Config, srcDir file.Info) {
7269 )
7370
7471 // assemble target directory path
75- trgDir , err = file .PathRelCopy (cfg .SrcDir .Path (),
72+ trgDir , err = fp .PathRelCopy (cfg .SrcDir .Path (),
7673 srcDir .Path (),
7774 cfg .TrgDir .Path ())
7875 if err != nil {
@@ -125,8 +122,8 @@ func deleteObsoleteFiles(cfg *Config, srcDir file.Info) {
125122 continue
126123 }
127124 // check if counterpart file on source side exists
128- tr := file .PathTrunk (trgEntr .Name ())
129- fs , err := filepath .Glob (file .EscapePattern (filepath .Join (srcDir .Path (), tr )) + ".*" )
125+ tr := fp .PathTrunk (trgEntr .Name ())
126+ fs , err := filepath .Glob (fp .EscapePattern (filepath .Join (srcDir .Path (), tr )) + ".*" )
130127 if err != nil {
131128 log .Errorf ("deleteObsoleteFiles: %v" , err )
132129 return
@@ -202,7 +199,7 @@ func GetSyncFiles(cfg *Config, init bool) (files *[]*file.Info) {
202199
203200 // if a directory is excluded, itself and all sub directories and
204201 // files are not relevant
205- if utils .Contains (cfg .Excludes , srcFile .Path ()) {
202+ if reflect .Contains (cfg .Excludes , srcFile .Path ()) {
206203 return false , file .InvalidFromSuper
207204 }
208205 // if relevance is propagated from the parent, this directory is not
@@ -238,7 +235,7 @@ func GetSyncFiles(cfg *Config, init bool) (files *[]*file.Info) {
238235 log .Debug ("Parent dir changed" )
239236
240237 // assemble target directory
241- trgDir , _ := file .PathRelCopy (cfg .SrcDir .Path (), srcFile .Path (), cfg .TrgDir .Path ())
238+ trgDir , _ := fp .PathRelCopy (cfg .SrcDir .Path (), srcFile .Path (), cfg .TrgDir .Path ())
242239 // check if target directory exists
243240 if exists , err := file .Exists (trgDir ); err == nil && ! exists {
244241 log .Debug ("Trg doesn't exist -> FALSE, NONE FROM SUPER" )
0 commit comments