deranjer/gvc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moving a function and struct over to a common library, starting on lockfile for server

Browse Source
This commit is contained in:
deranjer
2020-06-07 23:26:13 -04:00
parent 6d738b138d
commit b2238657c8
12 changed files with 123 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/clientcmd/add.go
View File

@@ -6,10 +6,11 @@ import (
"path/filepath"
clientconfig "github.com/deranjer/gvc/client/clientconfig"
"github.com/deranjer/gvc/common"
)
//AddFiles adds files to the repo, inputType specifies file, folder, wildcard or all
func AddFiles(input string, inputType string, ignore clientconfig.FileTypes) error {
func AddFiles(input string, inputType string, ignore common.FileTypes) error {
err := validateFileType(input, inputType) // Making sure that if the file flag was used a folder was not supplied and vice versa
if err != nil {
return err
@@ -25,7 +26,7 @@ func AddFiles(input string, inputType string, ignore clientconfig.FileTypes) err
if err != nil {
return fmt.Errorf("unable to add file %s", err)
}
err = checkFileTypes(input, "file", ignore)
err = common.CheckFileTypes(input, "file", ignore)
if err != nil {
return fmt.Errorf("unable to add file as it (or ext) is on the ignores list %s", input)
}
@@ -49,9 +50,9 @@ func AddFiles(input string, inputType string, ignore clientconfig.FileTypes) err
return fmt.Errorf("failure accessing path %s", err)
}
if info.IsDir() {
err = checkFileTypes(currentFile, "folder", ignore)
err = common.CheckFileTypes(currentFile, "folder", ignore)
} else {
err = checkFileTypes(currentFile, "file", ignore)
err = common.CheckFileTypes(currentFile, "file", ignore)
}
if err != nil {
fmt.Printf("Not adding file %s as it is on the ingores list \n", currentFile)
@@ -72,7 +73,7 @@ func AddFiles(input string, inputType string, ignore clientconfig.FileTypes) err
} else {
wildcard = input
}
err := checkFileTypes(wildcard, "wildcard", ignore)
err := common.CheckFileTypes(wildcard, "wildcard", ignore)
if err != nil {
return err
}
@@ -82,9 +83,9 @@ func AddFiles(input string, inputType string, ignore clientconfig.FileTypes) err
return fmt.Errorf("failure accessing path %s", err)
}
if info.IsDir() {
err = checkFileTypes(currentFile, "folder", ignore)
err = common.CheckFileTypes(currentFile, "folder", ignore)
} else {
err = checkFileTypes(currentFile, "file", ignore)
err = common.CheckFileTypes(currentFile, "file", ignore)
}
if err != nil {
fmt.Printf("Not adding file %s as it is on the ingores list \n", currentFile)
@@ -108,9 +109,9 @@ func AddFiles(input string, inputType string, ignore clientconfig.FileTypes) err
return fmt.Errorf("failure accessing path %s", err)
}
if info.IsDir() {
err = checkFileTypes(currentFile, "folder", ignore)
err = common.CheckFileTypes(currentFile, "folder", ignore)
} else {
err = checkFileTypes(currentFile, "file", ignore)
err = common.CheckFileTypes(currentFile, "file", ignore)
}
if err != nil {
fmt.Printf("Not adding file %s as it is on the ingores list \n", currentFile)