Bump version: 0.1.1 → 0.1.2

fix: Directories were not being cleaned up when syncing

.git-utils-bump.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.1
+current_version = 0.1.2
 commit          = True
 tag             = False
 tag_format      = v{tag}

cmd/pull.go

@@ -102,8 +102,7 @@ func pull(sourcePath string, destinationPath string, dryRun bool, checksum bool,
 		}
 
 		// Remove the destination file & its parent from the map if it exists
-		delete(destinationFileMap, destFile)
-		delete(destinationFileMap, filepath.Dir(destFile))
+		destinationFileMap = utils.DeleteAllParentDirectories(destinationFileMap, destFile)
 	}
 
 	// Remove any remaining files in the destination directory that were not in the source

cmd/push.go

@@ -93,16 +93,15 @@ func push(sourcePath string, destinationPath string, dryRun bool, checksum bool,
 			fmt.Printf("Skipped: %s -> %s (File already exists and is up to date)\n\n", color.RedString(file), color.RedString(sanitizedDestFile))
 		}
 		// Remove the destination file & its parent from the map if it exists
-		delete(destinationFileMap, destFile)
-		delete(destinationFileMap, filepath.Dir(destFile))
+		destinationFileMap = utils.DeleteAllParentDirectories(destinationFileMap, destFile)
 	}
 
 	// Remove any remaining files in the destination directory that were not in the source
 	for destFile := range destinationFileMap {
 		sanitizedDestFile := utils.SanitizeAndroidPath(destFile)
 		fmt.Printf("Removing: %s\n", color.YellowString(sanitizedDestFile))
 		if !dryRun {
-			output, err := exec.Command("adb", "shell", "rm", fmt.Sprintf(`"%s"`, sanitizedDestFile)).CombinedOutput()
+			output, err := exec.Command("adb", "shell", "rm -r", fmt.Sprintf(`"%s"`, sanitizedDestFile)).CombinedOutput()
 			if err != nil {
 				errorMessage := strings.TrimSpace(string(output))
 				fmt.Printf("Failed to remove file: %s\nError: %s\n", color.RedString(sanitizedDestFile), color.RedString(errorMessage))

cmd/root.go

@@ -24,7 +24,7 @@ import (
 var rootCmd = &cobra.Command{
 	Use:   "adb-sync",
 	Short: "A CLI to sync between android & local system using adb",
-	Long: `adb-sync v0.1.1
+	Long: `adb-sync v0.1.2
 Copyright (c) Arbaaz Laskar <[email protected]>
 
 A CLI to sync between android & local system using adb

utils/utils.go

@@ -283,3 +283,14 @@ func parseAdbLsOutput(output string) []string {
 
 	return filePaths
 }
+
+// Remove the destination file & its parent from the map if it exists
+func DeleteAllParentDirectories(destinationFileMap map[string]bool, path string) map[string]bool {
+	for path != "\\" { // Stop when you reach the root directory
+		delete(destinationFileMap, path)
+		// Move to the parent directory
+		path = filepath.Dir(path)
+	}
+
+	return destinationFileMap
+}