Move everything into a single package

Author: riptl

README.md

@@ -21,9 +21,9 @@ Right now, the only supported installation of DeepDetect that works with DeepSor
 
 Then, download the latest DeepSort release from https://github.com/CorentinB/DeepSort/releases
 
-Unzip your release, rename it `deepsort` and make it executable with:
+Unzip your release, rename it `DeepSort` and make it executable with:
 ```
-chmod +x deepsort
+chmod +x DeepSort
 ```
 
 # Usage
@@ -34,10 +34,10 @@ DeepSort support few different parameters, you're obliged to fill two of them:
 
 For more informations, refeer to the helper:
 ```
-./deepsort --help
+./DeepSort --help
 
 [-u|--url] is required
-usage: deepsort [-h|--help] -u|--url "<value>" -i|--input "<value>"
+usage: DeepSort [-h|--help] -u|--url "<value>" -i|--input "<value>"
                 [-n|--network (resnet-50|googlenet)] [-R|--recursive]
                 [-j|--jobs <integer>] [-d|--dry-run]
 

cmd/deepsort/arguments.go arguments.gocmd/deepsort/arguments.go renamed to arguments.go

@@ -1,4 +1,4 @@
-package DeepSort
+package main
 
 import (
 	"encoding/base64"

classify.go

@@ -1,4 +1,4 @@
-package DeepSort
+package main
 
 import "errors"
 

cmd/deepsort/rename.go

@@ -7,15 +7,14 @@ import (
 	"net/http"
 	"log"
 	"path/filepath"
-	"github.com/CorentinB/DeepSort"
 )
 
 func main() {
 	start := time.Now()
 	argumentParsing(os.Args)
 
 	// Start a new classification service
-	var c = DeepSort.ClassificationService{
+	var c = ClassificationService{
 		Conn: &http.Client{},
 		URL:  arguments.URL,
 	}

cmd/deepsort/service.go

@@ -5,10 +5,9 @@ import (
 	"gopkg.in/h2non/filetype.v1"
 	"path/filepath"
 	"os"
-	"github.com/CorentinB/DeepSort"
 )
 
-func process(c *DeepSort.ClassificationService, fileList []string) {
+func process(c *ClassificationService, fileList []string) {
 	// Process files in the input folder
 	for _, file := range fileList {
 		buf, _ := ioutil.ReadFile(file)

errors.go

@@ -1,10 +1,13 @@
-package DeepSort
+package main
 
 import (
 	"strings"
 	"path/filepath"
 	"crypto/md5"
 	"encoding/hex"
+	"github.com/labstack/gommon/color"
+	"os"
+	"bytes"
 )
 
 var replaceSpace = strings.NewReplacer(" ", "_")
@@ -37,3 +40,52 @@ func formatTags(class []string) string {
 	result = replaceDoubleQuote.Replace(result)
 	return result
 }
+
+func renameFile(c *ClassificationService,
+	path string, image []byte, tags []string) {
+
+	// Generate file name
+	newPath, tagPart := FormatFileName(path, image, tags)
+
+	name := filepath.Base(path)
+
+	// Log file name to console
+	if len(name) > 19 {
+		// File name is too long, truncate it
+		var message bytes.Buffer
+
+		// Write first and last path of the file name
+		truncatedName := name[0:5] + "…" + name[len(name)-9:]
+		message.WriteString(color.Yellow("[") + color.Cyan(truncatedName) + color.Yellow("]"))
+
+		// Write tags
+		message.WriteString(color.Yellow(" Response: ") + color.Green(tagPart))
+
+		logSuccess(message.String(), c.Tag)
+	} else {
+		// File name fits in the console
+		var message bytes.Buffer
+
+		// Write file name
+		message.WriteString(color.Yellow("[") + color.Cyan(name) + color.Yellow("]"))
+
+		// Pad to 19 characters
+		for i := 15 - len(name); i > 0; i-- {
+			message.WriteByte(' ')
+		}
+
+		message.WriteString(color.Yellow(" Response: ") + color.Green(tagPart))
+
+		// Write tag
+		logSuccess(message.String(), c.Tag)
+	}
+
+	// Rename file
+	if !arguments.DryRun {
+		err := os.Rename(path, newPath)
+		if err != nil {
+			logError("Unable to rename this file.", "["+filepath.Base(path)+"]")
+			os.Exit(1)
+		}
+	}
+}