Add: -R / --recursive argument, now doesnt do recursive classification by default.

Author: CorentinB

cmd/deepsort/arguments.go

@@ -15,6 +15,7 @@ func argumentParsing(args []string, argument *Arguments) {
 	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."})
 	dryRun := parser.Flag("d", "dry-run", &argparse.Options{Required: false, Help: "Just classify images and return results, do not apply."})
+	recursive := parser.Flag("R", "recursive", &argparse.Options{Required: false, Help: "Process files recursively."})
 	// Parse input
 	err := parser.Parse(os.Args)
 	if err != nil {
@@ -27,7 +28,7 @@ func argumentParsing(args []string, argument *Arguments) {
 	inputFolder, _ := filepath.Abs(*input)
 	// Finally save the collected flags
 	argument.DryRun = *dryRun
-	fmt.Println(argument.DryRun)
+	argument.Recursive = *recursive
 	argument.Input = inputFolder
 	argument.URL = *URL
 }

cmd/deepsort/main.go

@@ -9,17 +9,23 @@ import (
 )
 
 type Arguments struct {
-	Input  string
-	URL    string
-	DryRun bool
+	Input     string
+	URL       string
+	DryRun    bool
+	Recursive bool
 }
 
 func main() {
 	start := time.Now()
 	arguments := new(Arguments)
 	argumentParsing(os.Args, arguments)
 	startGoogleNet(arguments)
-	logging.Success("Starting image classification..", "[GoogleNet]")
-	runRecursively(arguments)
+	if arguments.Recursive == true {
+		logging.Success("Starting image classification recursively..", "[GoogleNet]")
+		runRecursively(arguments)
+	} else {
+		logging.Success("Starting image classification..", "[GoogleNet]")
+		run(arguments)
+	}
 	color.Println(color.Cyan("Done in ") + color.Yellow(time.Since(start)) + color.Cyan("!"))
 }

cmd/deepsort/process_recursively.go

@@ -2,24 +2,44 @@ package main
 
 import (
 	"io/ioutil"
+	"log"
 	"os"
 	"path/filepath"
 
 	"github.com/CorentinB/DeepSort/pkg/logging"
 	filetype "gopkg.in/h2non/filetype.v1"
 )
 
-func runRecursively(arguments *Arguments) ([]string, error) {
-	searchDir := arguments.Input
+func run(arguments *Arguments) {
+	f, err := os.Open(arguments.Input)
+	if err != nil {
+		log.Fatal(err)
+	}
+	files, err := f.Readdir(-1)
+	f.Close()
+	if err != nil {
+		logging.Error("Unable to process this directory.", "["+arguments.Input+"]")
+		os.Exit(1)
+	}
+
+	for _, file := range files {
+		path := arguments.Input + "/" + file.Name()
+		buf, _ := ioutil.ReadFile(path)
+		if filetype.IsImage(buf) {
+			googleNetClassification(path, arguments)
+		}
+	}
+}
 
+func runRecursively(arguments *Arguments) ([]string, error) {
 	fileList := make([]string, 0)
-	e := filepath.Walk(searchDir, func(path string, f os.FileInfo, err error) error {
+	e := filepath.Walk(arguments.Input, func(path string, f os.FileInfo, err error) error {
 		fileList = append(fileList, path)
 		return err
 	})
 
 	if e != nil {
-		logging.Error("Unable to process this directory.", "["+searchDir+"]")
+		logging.Error("Unable to process this directory.", "["+arguments.Input+"]")
 		os.Exit(1)
 	}