Use AddFS instead of manual ZIP file creation

Author: besendorf

acquisition/secure.go

@@ -28,55 +28,14 @@ func createZipFile(sourceDir, zipPath string) error {
 	zipWriter := zip.NewWriter(zipFile)
 	defer zipWriter.Close()
 
-	return filepath.Walk(sourceDir, func(filePath string, info os.FileInfo, err error) error {
-		if err != nil {
-			return fmt.Errorf("error walking path %s: %v", filePath, err)
-		}
-
-		// Skip the root directory itself
-		if filePath == sourceDir {
-			return nil
-		}
-
-		// Get the relative path from the source directory
-		relPath, err := filepath.Rel(sourceDir, filePath)
-		if err != nil {
-			return fmt.Errorf("failed to get relative path for %s: %v", filePath, err)
-		}
-
-		// Convert Windows backslashes to forward slashes
-		zipEntryPath := strings.ReplaceAll(relPath, "\\", "/")
-
-		// Create directory entries for directories
-		if info.IsDir() {
-			zipEntryPath += "/"
-			_, err := zipWriter.Create(zipEntryPath)
-			if err != nil {
-				return fmt.Errorf("failed to create directory entry %s: %v", zipEntryPath, err)
-			}
-			return nil
-		}
-
-		// Create file entry
-		fileWriter, err := zipWriter.Create(zipEntryPath)
-		if err != nil {
-			return fmt.Errorf("failed to create file entry %s: %v", zipEntryPath, err)
-		}
-
-		// Copy file content
-		file, err := os.Open(filePath)
-		if err != nil {
-			return fmt.Errorf("failed to open file %s: %v", filePath, err)
-		}
-		defer file.Close()
-
-		_, err = io.Copy(fileWriter, file)
-		if err != nil {
-			return fmt.Errorf("failed to copy file content for %s: %v", filePath, err)
-		}
+	// Use AddFS to add the entire directory
+	fsys := os.DirFS(sourceDir)
+	err = zipWriter.AddFS(fsys)
+	if err != nil {
+		return fmt.Errorf("failed to add directory to ZIP: %v", err)
+	}
 
-		return nil
-	})
+	return nil
 }
 
 func (a *Acquisition) StoreSecurely() error {

go.mod

@@ -1,6 +1,6 @@
 module github.com/mvt-project/androidqf
 
-go 1.20
+go 1.22
 
 require (
 	filippo.io/age v1.1.1