Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions internal/file/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ func CopyDirToDir(src, dst string) error {
if !fi.Mode().IsDir() {
return ErrNotDirectory
}
return filepath.WalkDir(src, func(path string, d fs.DirEntry, err error) error {
return filepath.WalkDir(src, func(filePath string, d fs.DirEntry, err error) error {
if err != nil {
return err
}
// skip sub-directories
if d.IsDir() && d.Name() != filepath.Base(path) {
if d.IsDir() && filePath != src {
return fs.SkipDir
}
info, err := d.Info()
Expand All @@ -100,7 +100,7 @@ func CopyDirToDir(src, dst string) error {
}
// only copy regular files
if info.Mode().IsRegular() {
return CopyToDir(path, dst)
return CopyToDir(filePath, dst)
}
return nil
})
Expand Down
43 changes: 43 additions & 0 deletions internal/file/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,49 @@ func TestCopyToDir(t *testing.T) {
})
}

func TestCopyDirToDir(t *testing.T) {
t.Run("only top-level regular files are copied", func(t *testing.T) {
srcDir := t.TempDir()
destDir := t.TempDir()

// top-level regular file
if err := os.WriteFile(filepath.Join(srcDir, "top.txt"), []byte("top"), 0600); err != nil {
t.Fatal(err)
}
// a file nested in a sub-directory that must NOT be copied
subDir := filepath.Join(srcDir, "sub")
if err := os.MkdirAll(subDir, 0700); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(subDir, "nested.txt"), []byte("nested"), 0600); err != nil {
t.Fatal(err)
}

if err := CopyDirToDir(srcDir, destDir); err != nil {
t.Fatal(err)
}

if _, err := os.Stat(filepath.Join(destDir, "top.txt")); err != nil {
t.Fatalf("expected top-level file to be copied, but got %v", err)
}
if _, err := os.Stat(filepath.Join(destDir, "nested.txt")); !os.IsNotExist(err) {
t.Fatal("expected sub-directory file to be skipped, but it was copied")
}
})

t.Run("source is not a directory", func(t *testing.T) {
srcDir := t.TempDir()
destDir := t.TempDir()
filename := filepath.Join(srcDir, "file.txt")
if err := os.WriteFile(filename, []byte("data"), 0600); err != nil {
t.Fatal(err)
}
if err := CopyDirToDir(filename, destDir); err != ErrNotDirectory {
t.Fatalf("expected ErrNotDirectory, but got %v", err)
}
})
}

func TestFileNameWithoutExtension(t *testing.T) {
input := "testfile.tar.gz"
expectedOutput := "testfile.tar"
Expand Down