mirror of
https://github.com/ManyakRus/starter.git
synced 2025-02-14 15:00:08 +02:00
сделал FindFiles_FromDirectory()
This commit is contained in:
parent
2d7670e4f6
commit
32875646d5
@ -2,6 +2,7 @@ package folders
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"path"
|
||||
@ -120,3 +121,32 @@ func FindFoldersTree(dir string, NeedFolders, NeedFiles, NeedDot bool, MassExclu
|
||||
|
||||
return tree
|
||||
}
|
||||
|
||||
// FindFiles_FromDirectory - возвращает список файлов, начиная в директории dir, с суффиксом(расширение файла) Suffix
|
||||
func FindFiles_FromDirectory(dir string, Suffix string) ([]string, error) {
|
||||
var Otvet []string
|
||||
var err error
|
||||
|
||||
files, err := os.ReadDir(dir)
|
||||
if err != nil {
|
||||
err = fmt.Errorf("ReadDir() error: %w", err)
|
||||
return Otvet, err
|
||||
}
|
||||
|
||||
for _, file := range files {
|
||||
if file.IsDir() {
|
||||
continue
|
||||
}
|
||||
Filename := file.Name()
|
||||
|
||||
if Suffix != "" {
|
||||
if strings.HasSuffix(Filename, Suffix) == false {
|
||||
continue
|
||||
}
|
||||
}
|
||||
FilenameFull := path.Join(dir, Filename)
|
||||
Otvet = append(Otvet, FilenameFull)
|
||||
}
|
||||
|
||||
return Otvet, err
|
||||
}
|
||||
|
@ -13,3 +13,12 @@ func TestFindFolders(t *testing.T) {
|
||||
t.Log("TestFindFolders() error: Otvet = nil")
|
||||
}
|
||||
}
|
||||
|
||||
func TestFindFiles_FromDirectory(t *testing.T) {
|
||||
|
||||
_, err := FindFiles_FromDirectory(micro.ProgramDir(), "")
|
||||
if err != nil {
|
||||
t.Log("TestFindFiles_FromDirectory() error: ", err)
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user