Commit 0087687a authored by Ajit Jagtap's avatar Ajit Jagtap
Browse files

Merge branch 'fileHelperObject_SSS' into 'master'

file helper object

See merge request !47
parents ffad25f6 152fda03
Branches
1 merge request!47file helper object
Showing with 18 additions and 15 deletions
......@@ -13,8 +13,11 @@ import (
// "github.com/klauspost/compress/zip" because this do not work from windows to linux
)
var searchResult []string
var searchFileName string
//FileHelperServiceObject FileHelperServiceObject must be created while calling FileSearh function
type FileHelperServiceObject struct {
searchResult []string
searchFileName string
}
// ReadFile reads contents from provided file path
func ReadFile(filePath string) ([]byte, error) {
......@@ -374,14 +377,14 @@ func MoveFileToOtherHost(source, destination string) error {
// Copy source file to destination
copyError := CopyFile(source, destination)
if copyError != nil {
logginghelper.LogError("error occured while copying file : ",copyError)
logginghelper.LogError("error occured while copying file : ", copyError)
return copyError
}
// Delete source file
deleteError := DeleteFile(source)
if deleteError != nil {
logginghelper.LogError("error occured while deleting file : ",deleteError)
logginghelper.LogError("error occured while deleting file : ", deleteError)
return deleteError
}
return nil
......@@ -479,30 +482,30 @@ func FileInfo(path string) (os.FileInfo, error) {
}
//FileSearch FileSearch
func FileSearch(fileName, path string) ([]string, error) {
searchResult = []string{}
searchFileName = fileName
func (fileHelperServiceObject *FileHelperServiceObject) FileSearch(fileName, path string) ([]string, error) {
fileHelperServiceObject.searchResult = []string{}
fileHelperServiceObject.searchFileName = fileName
searchDirectory, err := os.Open(path)
if err != nil {
return searchResult, err
return fileHelperServiceObject.searchResult, err
}
defer searchDirectory.Close()
testFileInfo, _ := searchDirectory.Stat()
if !testFileInfo.IsDir() {
return searchResult, err
return fileHelperServiceObject.searchResult, err
}
err = filepath.Walk(path, findFile)
err = filepath.Walk(path, fileHelperServiceObject.findFile)
if err != nil {
return searchResult, err
return fileHelperServiceObject.searchResult, err
}
return searchResult, nil
return fileHelperServiceObject.searchResult, nil
}
func findFile(path string, fileInfo os.FileInfo, err error) error {
func (fileHelperServiceObject *FileHelperServiceObject) findFile(path string, fileInfo os.FileInfo, err error) error {
if err != nil {
return err
......@@ -523,14 +526,14 @@ func findFile(path string, fileInfo os.FileInfo, err error) error {
return nil
}
matched, err := filepath.Match(searchFileName, fileInfo.Name())
matched, err := filepath.Match(fileHelperServiceObject.searchFileName, fileInfo.Name())
if err != nil {
return err
}
if matched {
add := absolute
searchResult = append(searchResult, add)
fileHelperServiceObject.searchResult = append(fileHelperServiceObject.searchResult, add)
}
return nil
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment