fixed some minor issue

- Fixed an issue where the clone copy would not always be used
- Fixed an issue where the telemetry could generate a nil pointer issue
- Fixed an issue where the pull file would still need the provider even if not needed
- Fixed an issue where the db was being saved more often that needed

src/config/main.go

@@ -298,7 +298,7 @@ func (c *Config) DbBackupInterval() time.Duration {
 func (c *Config) DbSaveInterval() time.Duration {
 	interval := c.GetIntKey(constants.DATABASE_SAVE_INTERVAL_ENV_VAR)
 	if interval == 0 {
-		return 30 * time.Second
+		return 2 * time.Minute
 	}
 
 	return time.Duration(interval) * time.Minute

src/helpers/os.go

@@ -9,12 +9,12 @@ import (
 	"encoding/hex"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
+	"syscall"
 	"time"
 
 	"github.com/briandowns/spinner"
@@ -331,6 +331,34 @@ func FileExists(path string) bool {
 	return true
 }
 
+func extractVolumeName(path string) (string, error) {
+	if runtime.GOOS == "windows" {
+		return "", fmt.Errorf("not supported on windows")
+	}
+	if runtime.GOOS == "linux" {
+		return "", fmt.Errorf("not supported on linux")
+	}
+
+	if !strings.HasPrefix(path, "/Volumes/") {
+		volume := filepath.Dir(path)
+		return volume, nil
+	}
+
+	// Clean up the path to remove any redundant separators
+	cleanedPath := filepath.Clean(path)
+
+	// Split the path into parts based on the separator
+	parts := strings.Split(cleanedPath, string(filepath.Separator))
+
+	// Check if the path has enough parts to contain a volume name
+	if len(parts) < 3 || parts[1] != "Volumes" {
+		return "", fmt.Errorf("invalid path or volume not found in path: %s", path)
+	}
+
+	// Return the volume name (third part in the split path)
+	return fmt.Sprintf("/%s/%s", parts[1], parts[2]), nil
+}
+
 // CopyDir recursively copies a directory tree, attempting to preserve permissions.
 // Source directory must exist, destination directory must *not* exist.
 // Symlinks are ignored and skipped.
@@ -365,16 +393,36 @@ func CopyDir(src string, dst string) (err error) {
 		}
 
 		// fmt.Printf("Copying folder with macos clone %s, %s\n", src, dst)
-		cmd := Command{
-			Command: "cp",
-			Args:    []string{"-c", "-r", src, dst},
-		}
+		var cmd Command
 		// if the destination is a mounted volume, we cannot use the clone command
-		if strings.HasPrefix(dst, "/Volumes") && !strings.HasPrefix(src, "/Volumes") {
+		srcVolumeName, err := extractVolumeName(src)
+		if err != nil {
+			return err
+		}
+		dstVolumeName, err := extractVolumeName(dst)
+		if err != nil {
+			return err
+		}
+
+		srcInfo, err := os.Stat(srcVolumeName)
+		if err != nil {
+			return err
+		}
+		dstInfo, err := os.Stat(dstVolumeName)
+		if err != nil && !os.IsNotExist(err) {
+			return err
+		}
+
+		if os.IsNotExist(err) || srcInfo.Sys().(*syscall.Stat_t).Dev != dstInfo.Sys().(*syscall.Stat_t).Dev {
 			cmd = Command{
 				Command: "cp",
 				Args:    []string{"-r", src, dst},
 			}
+		} else {
+			cmd = Command{
+				Command: "cp",
+				Args:    []string{"-c", "-r", src, dst},
+			}
 		}
 
 		if _, err := ExecuteWithNoOutput(context.TODO(), cmd, 2*time.Hour); err != nil {
@@ -384,15 +432,14 @@ func CopyDir(src string, dst string) (err error) {
 		return nil
 	}
 
-	println("passed")
 	if FileExists(src) {
 		err = os.MkdirAll(dst, si.Mode())
 		if err != nil {
 			return err
 		}
 	}
 
-	entries, err := ioutil.ReadDir(src)
+	entries, err := os.ReadDir(src)
 	if err != nil {
 		return err
 	}
@@ -408,7 +455,7 @@ func CopyDir(src string, dst string) (err error) {
 			}
 		} else {
 			// Skip symlinks.
-			if entry.Mode()&os.ModeSymlink != 0 {
+			if entry.Type()&os.ModeSymlink != 0 {
 				continue
 			}
 

src/pdfile/validation.go

@@ -126,8 +126,6 @@ func (p *PDFileService) Validate() *diagnostics.PDFileDiagnostics {
 		}
 	} else {
 		if runCMD == "push" ||
-			runCMD == "pull" ||
-			runCMD == "delete" ||
 			runCMD == "import" ||
 			runCMD == "list" {
 			diag.AddError(fmt.Errorf("provider command not found"))

src/telemetry/telemetry_service.go

@@ -70,9 +70,15 @@ func (t *TelemetryService) Callback(result types.ExecuteResult) {
 }
 
 func (t *TelemetryService) Flush() {
+	if t.client == nil {
+		return
+	}
 	t.client.Flush()
 }
 
 func (t *TelemetryService) Close() {
+	if t.client == nil {
+		return
+	}
 	t.client.Shutdown()
 }