Optimize reading of files

Author: riptl

cmd/deepsort/classify.go

@@ -10,12 +10,15 @@ import (
 
 	"github.com/CorentinB/DeepSort/pkg/logging"
 	"github.com/labstack/gommon/color"
+	"encoding/base64"
+	"encoding/hex"
+	"crypto/md5"
 )
 
-func googleNetClassification(path string, arguments *Arguments, wg *sync.WaitGroup) {
+func googleNetClassification(path string, content []byte, arguments *Arguments, wg *sync.WaitGroup) {
 	defer wg.Done()
 	url := arguments.URL + "/predict"
-	dataStr := readFile(path)
+	dataStr := base64.StdEncoding.EncodeToString(content)
 	var jsonStr = []byte(`{"service":"deepsort-resnet","parameters":{"input":{"width":224,"height":224},"output":{"best":1},"mllib":{"gpu":false}},"data":["` + dataStr + `"]}`)
 	// DEBUG
 	//fmt.Println("Request: " + string(jsonStr))
@@ -43,15 +46,17 @@ func googleNetClassification(path string, arguments *Arguments, wg *sync.WaitGro
 			color.Green(parsedResponse), "[GoogleNet]")
 	}
 	if arguments.DryRun != true {
-		renameFile(path, arguments, parsedResponse)
+		hashBytes := md5.Sum(content)
+		hash := hex.EncodeToString(hashBytes[:])
+		renameFile(path, hash, arguments, parsedResponse)
 	}
 	arguments.CountDone++
 }
 
-func resNet50Classification(path string, arguments *Arguments, wg *sync.WaitGroup) {
+func resNet50Classification(path string, content []byte, arguments *Arguments, wg *sync.WaitGroup) {
 	defer wg.Done()
 	url := arguments.URL + "/predict"
-	dataStr := readFile(path)
+	dataStr := base64.StdEncoding.EncodeToString(content)
 	var jsonStr = []byte(`{"service":"deepsort-resnet-50","parameters":{"input":{"width":224,"height":224},"output":{"best":1},"mllib":{"gpu":false}},"data":["` + dataStr + `"]}`)
 	// DEBUG
 	//fmt.Println("Request: " + string(jsonStr))
@@ -79,7 +84,9 @@ func resNet50Classification(path string, arguments *Arguments, wg *sync.WaitGrou
 			color.Green(parsedResponse), "[ResNet-50]")
 	}
 	if arguments.DryRun != true {
-		renameFile(path, arguments, parsedResponse)
+		hashBytes := md5.Sum(content)
+		hash := hex.EncodeToString(hashBytes[:])
+		renameFile(path, hash, arguments, parsedResponse)
 	}
 	arguments.CountDone++
 }

cmd/deepsort/hash_file.go

@@ -35,9 +35,9 @@ func run(arguments *Arguments) {
 			count++
 			wg.Add(1)
 			if arguments.Network == "resnet-50" {
-				go resNet50Classification(path, arguments, &wg)
+				go resNet50Classification(path, buf, arguments, &wg)
 			} else {
-				go googleNetClassification(path, arguments, &wg)
+				go googleNetClassification(path, buf, arguments, &wg)
 			}
 			if count == arguments.Jobs {
 				wg.Wait()
@@ -69,9 +69,9 @@ func runRecursively(arguments *Arguments) ([]string, error) {
 			count++
 			wg.Add(1)
 			if arguments.Network == "resnet-50" {
-				go resNet50Classification(file, arguments, &wg)
+				go resNet50Classification(file, buf, arguments, &wg)
 			} else {
-				go googleNetClassification(file, arguments, &wg)
+				go googleNetClassification(file, buf, arguments, &wg)
 			}
 		}
 		if count == arguments.Jobs {

cmd/deepsort/process.go

@@ -7,9 +7,8 @@ import (
 	"github.com/CorentinB/DeepSort/pkg/logging"
 )
 
-func renameFile(path string, arguments *Arguments, response string) {
+func renameFile(path string, hash string, arguments *Arguments, response string) {
 	absPath, _ := filepath.Abs(path)
-	hash := hashFileMD5(absPath)
 	dirPath := filepath.Dir(absPath)
 	extension := path[len(path)-4:]
 	newName := response + "_" + hash + extension