apps/ffmpegd
1
0
Fork 0
mirror of https://github.com/alfg/ffmpegd.git synced 2025-09-26 19:41:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

maint: update file reader to os.ReadDir.

Browse Source
This commit is contained in:
Alf
2022-07-26 20:17:25 -07:00
parent 519f9e068c
commit d58a1e2781
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/ffmpegd.go
View File

@@ -3,7 +3,6 @@ package cmd
import (
"encoding/json"
"fmt"
"io/ioutil"
"math"
"net/http"
"os"
@@ -191,9 +190,7 @@ func handleFiles(w http.ResponseWriter, r *http.Request) {
Files: []file{},
}
base, _ := filepath.Abs(".")
cleaned := filepath.Join(base, cleanPath(prefix))
files, _ := ioutil.ReadDir(cleaned)
files, _ := os.ReadDir(cleanPath(prefix))
for _, f := range files {
if f.IsDir() {
if prefix == "." {
@@ -208,7 +205,8 @@ func handleFiles(w http.ResponseWriter, r *http.Request) {
} else {
obj.Name = prefix + "/" + f.Name()
}
obj.Size = f.Size()
info, _ := f.Info()
obj.Size = info.Size()
resp.Files = append(resp.Files, obj)
}
}
@@ -219,7 +217,7 @@ func handleFiles(w http.ResponseWriter, r *http.Request) {
}
func cleanPath(path string) string {
// Clean path to make safe for use with filepath.Join.
// Clean path to make safe for use with filepath.Join.
if path == "" {
return ""
}