A working ScanDirectory() function.

pkg/files/files.go

@@ -1,9 +1,8 @@
 package files
 
 import (
-	"io/fs"
+	"io/ioutil"
 	"net/url"
-	"path/filepath"
 	"time"
 )
 
@@ -22,40 +21,34 @@ type DirEntry struct {
 	Size     string
 }
 
-func ScanDirectory(path string) (entries []DirEntry, stats DirStats, err error) {
+func ScanDirectory(path, urlBase string) (entries []DirEntry, stats DirStats, err error) {
 	var dirEntries []DirEntry = make([]DirEntry, 0)
 	var fileEntries []DirEntry = make([]DirEntry, 0)
 	var totalFilesSize int64 = 0
 
-	if err = filepath.Walk(path, func(path string, info fs.FileInfo, err error) error {
+	dir, err := ioutil.ReadDir(path)
-		if err != nil {
+	for _, entry := range dir {
-			return err
-		}
 
-		if info.IsDir() {
+		if entry.IsDir() {
 			dirEntries = append(dirEntries, DirEntry{
-				Name:     info.Name(),
+				Name:     entry.Name(),
-				Link:     url.PathEscape("/files"),
+				Link:     url.PathEscape(entry.Name()) + "/",
-				Datetime: info.ModTime(),
+				Datetime: entry.ModTime(),
 				Size:     "DIR",
 			})
 			stats.Directories++
 		} else {
-			_, _, sz := convertFileSize(info.Size())
+			_, _, sz := convertFileSize(entry.Size())
 			fileEntries = append(fileEntries, DirEntry{
-				Name:     info.Name(),
+				Name:     entry.Name(),
-				Link:     url.PathEscape("/files"),
+				Link:     "/file" + urlBase + url.PathEscape(entry.Name()),
-				Datetime: info.ModTime(),
+				Datetime: entry.ModTime(),
 				Size:     sz,
 			})
 
-			totalFilesSize += info.Size()
+			totalFilesSize += entry.Size()
 			stats.Files++
 		}
-
-		return nil
-	}); err != nil {
-		return
 	}
 
 	_, _, sz := convertFileSize(totalFilesSize)