Adds option to set output folder, implements #29

Author: Te-k

acquisition/acquisition.go

@@ -36,18 +36,30 @@ type Acquisition struct {
 }
 
 // New returns a new Acquisition instance.
-func New() (*Acquisition, error) {
+func New(path string) (*Acquisition, error) {
 	acq := Acquisition{
 		UUID:    uuid.New().String(),
 		Started: time.Now().UTC(),
 		AndroidQFVersion: utils.Version,
 	}
 
-	acq.StoragePath = filepath.Join(rt.GetExecutableDirectory(), acq.UUID)
-	err := os.Mkdir(acq.StoragePath, 0o755)
-	if err != nil {
-		return nil, fmt.Errorf("failed to create acquisition folder: %v", err)
-	}
+    if path == "" {
+        acq.StoragePath = filepath.Join(rt.GetExecutableDirectory(), acq.UUID)
+    } else {
+        acq.StoragePath = path
+    }
+    // Check if the path exist
+    stat, err := os.Stat(acq.StoragePath)
+    if os.IsNotExist(err) {
+        err := os.Mkdir(acq.StoragePath, 0o755)
+        if err != nil {
+            return nil, fmt.Errorf("failed to create acquisition folder: %v", err)
+        }
+    } else {
+        if !stat.IsDir() {
+            return nil, fmt.Errorf("path exist and is not a folder")
+        }
+    }
 
 	// Get system information first to get tmp folder
 	err = acq.GetSystemInformation()

main.go

@@ -44,6 +44,7 @@ func main() {
 	var list_modules bool
 	var fast bool
 	var module string
+    var output_folder string
 
 	// Command line options
 	flag.BoolVar(&verbose, "verbose", false, "Verbose mode")
@@ -54,6 +55,8 @@ func main() {
 	flag.BoolVar(&list_modules, "l", false, "List modules and exit")
 	flag.StringVar(&module, "module", "", "Only execute a specific module")
 	flag.StringVar(&module, "m", "", "Only execute a specific module")
+    flag.StringVar(&output_folder, "output", "", "Output folder")
+    flag.StringVar(&output_folder, "o", "", "Output folder")
 	flag.BoolVar(&version_flag, "version", false, "Show version")
 
 	flag.Parse()
@@ -92,14 +95,14 @@ func main() {
 		time.Sleep(5 * time.Second)
 	}
 
-	acq, err := acquisition.New()
+	acq, err := acquisition.New(output_folder)
 	if err != nil {
 		log.Debug(err)
 		log.FatalExc("Impossible to initialise the acquisition", err)
 	}
 
 	// Start acquisitions
-	log.Info(fmt.Sprintf("Started new acquisition %s", acq.UUID))
+	log.Info(fmt.Sprintf("Started new acquisition in %s", acq.StoragePath))
 
 	mods := modules.List()
 	for _, mod := range mods {