From eba6f5c1883014558baffbe97be9e24ee9453c44 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 27 Oct 2024 07:20:47 -0500 Subject: [PATCH] filepath.Walk is overkill here Signed-off-by: Jeff Carr --- backup.go | 41 ++++++++++++++++++----------------------- backupDir.go | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 backupDir.go diff --git a/backup.go b/backup.go index df2e098..37ffee1 100644 --- a/backup.go +++ b/backup.go @@ -4,8 +4,9 @@ package virtbuf // kick this out in 30 seconds import ( + "errors" + "fmt" "io" - "log" "os" "path/filepath" ) @@ -14,35 +15,29 @@ func backupFiles(srcDir string, destDir string) error { // Create the destination directory err := os.MkdirAll(destDir, os.ModePerm) if err != nil { - log.Println("Failed to create directory: %v", err) - return err + return errors.New(fmt.Sprintf("Failed to create directory: %v", err)) } - // Walk through the source directory - err = filepath.Walk(srcDir, func(path string, info os.FileInfo, err error) error { - if err != nil { - return err + // Read the contents of the source directory + entries, err := os.ReadDir(srcDir) + if err != nil { + return errors.New(fmt.Sprintf("Failed to read directory: %v", err)) + } + + // Iterate over the entries in the source directory + for _, entry := range entries { + // Skip directories and files that do not have the .test extension + if entry.IsDir() || filepath.Ext(entry.Name()) != ".test" { + continue } - // Skip if it's not a .test file or if it's a directory - // if filepath.Ext(path) != ".json" || info.IsDir() { - if info.IsDir() { - return nil - } - - // Destination file path - destPath := filepath.Join(destDir, info.Name()) + srcPath := filepath.Join(srcDir, entry.Name()) + destPath := filepath.Join(destDir, entry.Name()) // Copy the file - if err := copyFile(path, destPath); err != nil { - return err + if err := copyFile(srcPath, destPath); err != nil { + return errors.New(fmt.Sprintf("Failed to copy file %s: %v", entry.Name(), err)) } - return nil - }) - - if err != nil { - log.Println("Failed to copy files: %v", err) - return err } return nil } diff --git a/backupDir.go b/backupDir.go new file mode 100644 index 0000000..1c633af --- /dev/null +++ b/backupDir.go @@ -0,0 +1,47 @@ +package virtbuf + +// thank chatgpt for this because why. why write this if you can have it +// kick this out in 30 seconds + +import ( + "log" + "os" + "path/filepath" +) + +func backupDir(srcDir string, destDir string) error { + // Create the destination directory + err := os.MkdirAll(destDir, os.ModePerm) + if err != nil { + log.Println("Failed to create directory: %v", err) + return err + } + + // Walk through the source directory + err = filepath.Walk(srcDir, func(path string, info os.FileInfo, err error) error { + if err != nil { + return err + } + + // Skip if it's not a .test file or if it's a directory + // if filepath.Ext(path) != ".json" || info.IsDir() { + if info.IsDir() { + return nil + } + + // Destination file path + destPath := filepath.Join(destDir, info.Name()) + + // Copy the file + if err := copyFile(path, destPath); err != nil { + return err + } + return nil + }) + + if err != nil { + log.Println("Failed to copy files: %v", err) + return err + } + return nil +}