Skip to content

pkg/files: use relative paths in listed files #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
artmoskvin merged 1 commit into from
Sep 25, 2024
Merged

pkg/files: use relative paths in listed files #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/files/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ func (fm *FileManagerImpl) ListFiles(ctx context.Context, fs afero.Fs, opts ...L

if !info.IsDir() {
if !opt.WithContent {
path, err = filepath.Rel("/", path)
if err != nil {
return err
}

files = append(files, model.EmptyFile(path))
return nil
}
Expand All @@ -168,6 +173,11 @@ func (fm *FileManagerImpl) ListFiles(ctx context.Context, fs afero.Fs, opts ...L
return fmt.Errorf("Error reading file %s: %w", path, err)
}

file.Path, err = filepath.Rel("/", file.Path)
if err != nil {
return err
}

files = append(files, file)
return nil
}
Expand Down
108 changes: 47 additions & 61 deletions pkg/files/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/artmoskvin/hide/pkg/files"
"github.com/artmoskvin/hide/pkg/model"
"github.com/google/go-cmp/cmp"
"github.com/spf13/afero"
)

Expand Down Expand Up @@ -366,11 +367,11 @@ func TestListFile(t *testing.T) {
return fs
}(),
wantFile: []*model.File{
model.EmptyFile("/hello.txt"),
model.EmptyFile("/something/something.txt"),
model.EmptyFile("/something/items.json"),
model.EmptyFile("/node_modules/module1/file.js"),
model.EmptyFile("/node_modules/module2/file.js"),
model.EmptyFile("hello.txt"),
model.EmptyFile("node_modules/module1/file.js"),
model.EmptyFile("node_modules/module2/file.js"),
model.EmptyFile("something/items.json"),
model.EmptyFile("something/something.txt"),
},
},
{
Expand Down Expand Up @@ -415,7 +416,7 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/something/something.txt"),
model.EmptyFile("something/something.txt"),
},
},
{
Expand Down Expand Up @@ -459,9 +460,9 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs/debug.log"),
model.EmptyFile("/logs/monday/foo.bar"),
model.EmptyFile("/build/logs/debug.log"),
model.EmptyFile("build/logs/debug.log"),
model.EmptyFile("logs/debug.log"),
model.EmptyFile("logs/monday/foo.bar"),
},
},
{
Expand Down Expand Up @@ -497,8 +498,8 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs/debug.log"),
model.EmptyFile("/build/logs/debug.log"),
model.EmptyFile("build/logs/debug.log"),
model.EmptyFile("logs/debug.log"),
},
},
{
Expand Down Expand Up @@ -542,9 +543,9 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs/debug.log"),
model.EmptyFile("/logs/build/debug.log"),
model.EmptyFile("/build/logs/debug.log"),
model.EmptyFile("build/logs/debug.log"),
model.EmptyFile("logs/build/debug.log"),
model.EmptyFile("logs/debug.log"),
},
},
{
Expand Down Expand Up @@ -581,7 +582,7 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs/debug.log"),
model.EmptyFile("logs/debug.log"),
},
},
{
Expand Down Expand Up @@ -613,7 +614,7 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/debug.log"),
model.EmptyFile("debug.log"),
},
},
{
Expand Down Expand Up @@ -645,8 +646,8 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/debug.log"),
model.EmptyFile("/build/debug.log"),
model.EmptyFile("build/debug.log"),
model.EmptyFile("debug.log"),
},
},
{
Expand Down Expand Up @@ -682,8 +683,8 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/debug0.log"),
model.EmptyFile("/debug1.log"),
model.EmptyFile("debug0.log"),
model.EmptyFile("debug1.log"),
},
},
{
Expand Down Expand Up @@ -719,8 +720,8 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/debug0.log"),
model.EmptyFile("/debug1.log"),
model.EmptyFile("debug0.log"),
model.EmptyFile("debug1.log"),
},
},
{
Expand Down Expand Up @@ -760,8 +761,8 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/debug0.log"),
model.EmptyFile("/debug1.log"),
model.EmptyFile("debug0.log"),
model.EmptyFile("debug1.log"),
},
},
{
Expand Down Expand Up @@ -801,8 +802,8 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/debug2.log"),
model.EmptyFile("/debug3.log"),
model.EmptyFile("debug2.log"),
model.EmptyFile("debug3.log"),
},
},
{
Expand Down Expand Up @@ -838,7 +839,7 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/debuga.log"),
model.EmptyFile("debuga.log"),
},
},
{
Expand Down Expand Up @@ -882,11 +883,11 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs.txt"),
model.EmptyFile("/logs/debug.log"),
model.EmptyFile("/logs/latest/foo.bar"),
model.EmptyFile("/build/logs.txt"),
model.EmptyFile("/build/logs/debug.log"),
model.EmptyFile("build/logs/debug.log"),
model.EmptyFile("build/logs.txt"),
model.EmptyFile("logs/debug.log"),
model.EmptyFile("logs/latest/foo.bar"),
model.EmptyFile("logs.txt"),
},
},
{
Expand Down Expand Up @@ -930,9 +931,9 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs/debug.log"),
model.EmptyFile("/logs/latest/foo.bar"),
model.EmptyFile("/build/logs/debug.log"),
model.EmptyFile("build/logs/debug.log"),
model.EmptyFile("logs/debug.log"),
model.EmptyFile("logs/latest/foo.bar"),
},
},
{
Expand Down Expand Up @@ -968,9 +969,9 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs/debug.log"),
model.EmptyFile("/logs/monday/debug.log"),
model.EmptyFile("/logs/monday/pm/debug.log"),
model.EmptyFile("logs/debug.log"),
model.EmptyFile("logs/monday/debug.log"),
model.EmptyFile("logs/monday/pm/debug.log"),
},
},
{
Expand Down Expand Up @@ -1006,7 +1007,7 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs/monday/debug.log"),
model.EmptyFile("logs/monday/debug.log"),
},
},
{
Expand Down Expand Up @@ -1042,7 +1043,7 @@ func TestListFile(t *testing.T) {
}),
},
wantFile: []*model.File{
model.EmptyFile("/logs/debug.log"),
model.EmptyFile("logs/debug.log"),
},
},
{
Expand Down Expand Up @@ -1072,8 +1073,8 @@ func TestListFile(t *testing.T) {
files.ListFilesWithContent(),
},
wantFile: []*model.File{
model.NewFile("/test1.txt", "content-1"),
model.NewFile("/test2.txt", "content-2"),
model.NewFile("test1.txt", "content-1"),
model.NewFile("test2.txt", "content-2"),
},
},
{
Expand Down Expand Up @@ -1103,8 +1104,8 @@ func TestListFile(t *testing.T) {
files.ListFilesWithShowHidden(),
},
wantFile: []*model.File{
model.EmptyFile("/.hidden.txt"),
model.EmptyFile("/file.txt"),
model.EmptyFile(".hidden.txt"),
model.EmptyFile("file.txt"),
},
},
} {
Expand All @@ -1116,24 +1117,9 @@ func TestListFile(t *testing.T) {
t.Fatal(err)
}

if len(tt.wantFile) != len(files) {
t.Fatalf("got %d path, want %d path", len(files), len(tt.wantFile))
}

for _, f := range files {
if !ContainsFile(tt.wantFile, f) {
t.Fatalf("%s is missing", f.Path)
}
if diff := cmp.Diff(files, tt.wantFile); diff != "" {
t.Fatalf("got diff %s", diff)
}
})
}
}

func ContainsFile(files []*model.File, target *model.File) bool {
for _, file := range files {
if file.Equals(target) {
return true
}
}
return false
}