Add: copy_file - Start working on the output feature.

Modify: some output/logging changes.

Author: CorentinB

cmd/deepsort/arguments.go

@@ -14,6 +14,7 @@ func argumentParsing(args []string, arguments *Arguments) {
 	// Create flags
 	URL := parser.String("u", "url", &argparse.Options{Required: true, Help: "URL of your DeepDetect instance (i.e: http://localhost:8080)"})
 	input := parser.String("i", "input", &argparse.Options{Required: true, Help: "Your input folder."})
+	//output := parser.String("o", "output", &argparse.Options{Required: false, Help: "Your output folder, if output is set, original files will not be renamed, but the renamed version will be copied in the output folder."})
 	network := parser.Selector("n", "network", []string{"resnet-50", "googlenet"}, &argparse.Options{Required: false, Help: "The pre-trained deep neural network you want to use, can be resnet-50 or googlenet", Default: "resnet-50"})
 	recursive := parser.Flag("R", "recursive", &argparse.Options{Required: false, Help: "Process files recursively."})
 	jobs := parser.Int("j", "jobs", &argparse.Options{Required: false, Help: "Number of parallel jobs", Default: 1})
@@ -26,8 +27,10 @@ func argumentParsing(args []string, arguments *Arguments) {
 		fmt.Print(parser.Usage(err))
 		os.Exit(0)
 	}
-	// Handle the input flag
+	// Handle the input/output flags
 	inputFolder, _ := filepath.Abs(*input)
+	//arguments.Output = outputFolder
+	//arguments.OutputChoice = true
 	// Finally save the collected flags
 	arguments.Network = *network
 	arguments.Jobs = *jobs

cmd/deepsort/classify.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -43,7 +44,11 @@ func googleNetClassification(path string, arguments *Arguments, wg *sync.WaitGro
 			color.Green(parsedResponse), "[GoogleNet]")
 	}
 	if arguments.DryRun != true {
-		renameFile(path, arguments, parsedResponse)
+		if isValid(arguments.Output) == false {
+			renameFile(path, arguments, parsedResponse)
+		} else {
+			fmt.Println("Output selected")
+		}
 	}
 	arguments.CountDone++
 }
@@ -79,7 +84,14 @@ func resNet50Classification(path string, arguments *Arguments, wg *sync.WaitGrou
 			color.Green(parsedResponse), "[ResNet-50]")
 	}
 	if arguments.DryRun != true {
-		renameFile(path, arguments, parsedResponse)
+		if isValid(arguments.Output) == false &&
+			arguments.OutputChoice == false {
+			renameFile(path, arguments, parsedResponse)
+		} else if arguments.OutputChoice == true &&
+			isValid(arguments.Output) == false {
+			logging.Error("Wrong output folder.", "")
+			os.Exit(1)
+		}
 	}
 	arguments.CountDone++
 }

cmd/deepsort/copy_file.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"io"
+	"io/ioutil"
+	"os"
+)
+
+func isValid(fp string) bool {
+	// Check if file already exists
+	if _, err := os.Stat(fp); err == nil {
+		return true
+	}
+
+	// Attempt to create it
+	var d []byte
+	if err := ioutil.WriteFile(fp, d, 0644); err == nil {
+		os.Remove(fp) // And delete it
+		return true
+	}
+
+	return false
+}
+
+func copy(src, dst string) error {
+	in, err := os.Open(src)
+	if err != nil {
+		return err
+	}
+	defer in.Close()
+
+	out, err := os.Create(dst)
+	if err != nil {
+		return err
+	}
+	defer out.Close()
+
+	_, err = io.Copy(out, in)
+	if err != nil {
+		return err
+	}
+	return out.Close()
+}

cmd/deepsort/main.go

@@ -8,21 +8,25 @@ import (
 	"github.com/labstack/gommon/color"
 )
 
+// Arguments store flags values
 type Arguments struct {
-	Input     string
-	URL       string
-	DryRun    bool
-	Recursive bool
-	Jobs      int
-	Network   string
-	CountDone int
+	Input        string
+	Output       string
+	OutputChoice bool
+	URL          string
+	DryRun       bool
+	Recursive    bool
+	Jobs         int
+	Network      string
+	CountDone    int
 }
 
 func main() {
 	start := time.Now()
 	arguments := new(Arguments)
 	arguments.CountDone = 0
 	arguments.Jobs = 1
+	arguments.OutputChoice = false
 	argumentParsing(os.Args, arguments)
 	if arguments.Network == "resnet-50" {
 		startResNet50(arguments)