diff --git a/.gitignore b/.gitignore index 1165144..4ad55a9 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ /.idea/ /git/testdata/repo-01/ /git/tmp/ -/path/tmp/ +/fsio/tmp/ # Files # ----- diff --git a/path/directory.go b/fsio/directory.go similarity index 99% rename from path/directory.go rename to fsio/directory.go index 885eaae..dd4b453 100644 --- a/path/directory.go +++ b/fsio/directory.go @@ -1,4 +1,4 @@ -package path +package fsio import ( "fmt" diff --git a/path/directory_test.go b/fsio/directory_test.go similarity index 99% rename from path/directory_test.go rename to fsio/directory_test.go index 10bde71..71fff28 100644 --- a/path/directory_test.go +++ b/fsio/directory_test.go @@ -1,4 +1,4 @@ -package path +package fsio import ( "fmt" diff --git a/io/io.go b/fsio/io.go similarity index 97% rename from io/io.go rename to fsio/io.go index 265eff0..4a70180 100644 --- a/io/io.go +++ b/fsio/io.go @@ -1,4 +1,4 @@ -package io +package fsio import ( "bytes" diff --git a/io/io_test.go b/fsio/io_test.go similarity index 98% rename from io/io_test.go rename to fsio/io_test.go index 7c1db0b..b9c92fb 100644 --- a/io/io_test.go +++ b/fsio/io_test.go @@ -1,4 +1,4 @@ -package io +package fsio import ( "io" diff --git a/path/path.go b/fsio/path.go similarity index 96% rename from path/path.go rename to fsio/path.go index 3b0026b..610b997 100644 --- a/path/path.go +++ b/fsio/path.go @@ -1,4 +1,4 @@ -package path +package fsio import ( "os" diff --git a/path/path_test.go b/fsio/path_test.go similarity index 99% rename from path/path_test.go rename to fsio/path_test.go index 933dd39..365078f 100644 --- a/path/path_test.go +++ b/fsio/path_test.go @@ -1,4 +1,4 @@ -package path +package fsio import ( "github.com/kohirens/stdlib" diff --git a/path/testdata/copy-file-01.txt b/fsio/testdata/copy-file-01.txt similarity index 100% rename from path/testdata/copy-file-01.txt rename to fsio/testdata/copy-file-01.txt diff --git a/path/testdata/dir-to-dir-01/README.md b/fsio/testdata/dir-to-dir-01/README.md similarity index 100% rename from path/testdata/dir-to-dir-01/README.md rename to fsio/testdata/dir-to-dir-01/README.md diff --git a/path/testdata/dir-to-dir-02/README.md b/fsio/testdata/dir-to-dir-02/README.md similarity index 100% rename from path/testdata/dir-to-dir-02/README.md rename to fsio/testdata/dir-to-dir-02/README.md diff --git a/path/testdata/dir-to-dir-02/sub-01/README.md b/fsio/testdata/dir-to-dir-02/sub-01/README.md similarity index 100% rename from path/testdata/dir-to-dir-02/sub-01/README.md rename to fsio/testdata/dir-to-dir-02/sub-01/README.md diff --git a/path/testdata/dir-to-dir-02/sub-02/file-01.txt b/fsio/testdata/dir-to-dir-02/sub-02/file-01.txt similarity index 100% rename from path/testdata/dir-to-dir-02/sub-02/file-01.txt rename to fsio/testdata/dir-to-dir-02/sub-02/file-01.txt diff --git a/path/testdata/dir-to-dir-02/sub-02/file-02.txt b/fsio/testdata/dir-to-dir-02/sub-02/file-02.txt similarity index 100% rename from path/testdata/dir-to-dir-02/sub-02/file-02.txt rename to fsio/testdata/dir-to-dir-02/sub-02/file-02.txt diff --git a/path/testdata/dir-to-dir-02/sub-03/README.md b/fsio/testdata/dir-to-dir-02/sub-03/README.md similarity index 100% rename from path/testdata/dir-to-dir-02/sub-03/README.md rename to fsio/testdata/dir-to-dir-02/sub-03/README.md diff --git a/path/testdata/dir-to-dir-02/sub-03/sub-sub-04/README-04.md b/fsio/testdata/dir-to-dir-02/sub-03/sub-sub-04/README-04.md similarity index 100% rename from path/testdata/dir-to-dir-02/sub-03/sub-sub-04/README-04.md rename to fsio/testdata/dir-to-dir-02/sub-03/sub-sub-04/README-04.md diff --git a/path/testdata/dir-to-dir-03.bundle b/fsio/testdata/dir-to-dir-03.bundle similarity index 100% rename from path/testdata/dir-to-dir-03.bundle rename to fsio/testdata/dir-to-dir-03.bundle diff --git a/path/testdata/dir-to-dir-03/.config/config.yml b/fsio/testdata/dir-to-dir-03/.config/config.yml similarity index 100% rename from path/testdata/dir-to-dir-03/.config/config.yml rename to fsio/testdata/dir-to-dir-03/.config/config.yml diff --git a/path/testdata/dir-to-dir-03/README.md b/fsio/testdata/dir-to-dir-03/README.md similarity index 100% rename from path/testdata/dir-to-dir-03/README.md rename to fsio/testdata/dir-to-dir-03/README.md diff --git a/path/testdata/dir-to-dir-03/TODO.md b/fsio/testdata/dir-to-dir-03/TODO.md similarity index 100% rename from path/testdata/dir-to-dir-03/TODO.md rename to fsio/testdata/dir-to-dir-03/TODO.md diff --git a/path/testdata/dir_that_exist/file_that_exists.md b/fsio/testdata/dir_that_exist/file_that_exists.md similarity index 100% rename from path/testdata/dir_that_exist/file_that_exists.md rename to fsio/testdata/dir_that_exist/file_that_exists.md diff --git a/path/testdata/file-exist-01.md b/fsio/testdata/file-exist-01.md similarity index 100% rename from path/testdata/file-exist-01.md rename to fsio/testdata/file-exist-01.md diff --git a/io/testdata/salam.txt b/fsio/testdata/salam.txt similarity index 100% rename from io/testdata/salam.txt rename to fsio/testdata/salam.txt diff --git a/git/git_test.go b/git/git_test.go index e02a1a8..4cb773a 100644 --- a/git/git_test.go +++ b/git/git_test.go @@ -2,7 +2,7 @@ package git import ( "fmt" - "github.com/kohirens/stdlib/path" + "github.com/kohirens/stdlib/fsio" "github.com/kohirens/stdlib/test" "os" "path/filepath" @@ -43,7 +43,7 @@ func TestCloneFromBundle(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { got := CloneFromBundle(tt.args.bundleName, TmpDir, tt.args.bundleDir, tt.args.ps) - if path.Exist(got) != tt.want { + if fsio.Exist(got) != tt.want { t.Errorf("CloneFromBundle() = %v, want %v", got, tt.want) } }) diff --git a/web/form_test.go b/web/form_test.go index 9eee148..42c04a1 100644 --- a/web/form_test.go +++ b/web/form_test.go @@ -1,7 +1,7 @@ package web import ( - "github.com/kohirens/stdlib/path" + "github.com/kohirens/stdlib/fsio" "net/url" "testing" ) @@ -61,7 +61,7 @@ func TestParseForm2(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { event := loadEvent("testdata/" + tt.form) - _, _ = path.CopyToDir(tt.upload, "./", "/") + _, _ = fsio.CopyToDir(tt.upload, "./", "/") got, err := ParseFormWithFiles(event.Body, tt.contentType) if (err != nil) != tt.wantErr { diff --git a/web/storage.go b/web/storage.go index 0e25879..23114eb 100644 --- a/web/storage.go +++ b/web/storage.go @@ -2,8 +2,8 @@ package web import ( "fmt" + "github.com/kohirens/stdlib/fsio" "github.com/kohirens/stdlib/log" - "github.com/kohirens/stdlib/path" "os" ) @@ -35,7 +35,7 @@ func (ls *LocalStorage) Save(content []byte, filename string) (int, error) { func (ls *LocalStorage) Load(pagePath string) ([]byte, error) { Log.Infof(Stdout.LoadPage, pagePath) - if !path.Exist(pagePath) { + if !fsio.Exist(pagePath) { return nil, fmt.Errorf("file %v not found", pagePath) } diff --git a/web/web_test.go b/web/web_test.go index e670fa4..1cafc10 100644 --- a/web/web_test.go +++ b/web/web_test.go @@ -4,12 +4,12 @@ import ( "encoding/json" "fmt" "github.com/aws/aws-lambda-go/events" - "github.com/kohirens/stdlib/path" + "github.com/kohirens/stdlib/fsio" "os" ) func loadEvent(s string) events.LambdaFunctionURLRequest { - if !path.Exist(s) { + if !fsio.Exist(s) { panic(fmt.Sprintf("file %s not found", s)) }