diff --git a/src/util/scans/scans.go b/src/util/scans/scans.go
index 10b75d9..a155141 100644
--- a/src/util/scans/scans.go
+++ b/src/util/scans/scans.go
@@ -33,7 +33,7 @@ func New(request *http.Request) scan {
var scan scan
data, _ := io.ReadAll(request.Body)
json.Unmarshal(data, &scan)
- scan.generateScanName()
+ scan.ScanName = scan.generateScanName()
return scan
}
@@ -79,7 +79,10 @@ func (scan scan) Execute() *result {
// unexported functions
func (scan scan) generateScanName() string {
- if len(scan.FileName) == 0 {
+ var scanName string
+ if len(scan.FileName) > 0 {
+ scanName = scan.FileName
+ } else {
day := fmt.Sprint(time.Now().Day())
if len(day) < 2 {
day = "0" + day
@@ -100,15 +103,14 @@ func (scan scan) generateScanName() string {
if len(second) < 2 {
second = "0" + second
}
- scan.FileName = day + month + fmt.Sprint(time.Now().Year()) + "-" + hour + minute + second
+ scanName = day + month + fmt.Sprint(time.Now().Year()) + "-" + hour + minute + second
}
- if !strings.HasSuffix(scan.FileName, ".png") {
- scan.FileName += ".png"
+ if !strings.HasSuffix(scanName, ".png") {
+ scanName += ".png"
}
error := os.MkdirAll(scannerConfig.OutputDirectory, 0755)
if error != nil {
log.Fatal("an error occurred creating the output directory", error.Error())
}
- scan.ScanName = scannerConfig.OutputDirectory + scan.FileName
- return scan.ScanName
+ return scannerConfig.OutputDirectory + scanName
}
diff --git a/static/html/index.html b/static/html/index.html
index 4b9c505..3e02946 100644
--- a/static/html/index.html
+++ b/static/html/index.html
@@ -1,8 +1,8 @@
-
+
go-scan
-
+