fix: fix staticcheck errors - errors.Is parameter order and deprecated ioutil
This commit is contained in:
+13
-10
@@ -6,7 +6,6 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"mime/multipart"
|
||||
"net/http"
|
||||
"os"
|
||||
@@ -128,21 +127,25 @@ type File struct {
|
||||
}
|
||||
|
||||
func (service storageService) Ls(drivePath, remoteDir string) ([]File, error) {
|
||||
fileInfos, err := ioutil.ReadDir(path.Join(drivePath, remoteDir))
|
||||
fileInfos, err := os.ReadDir(path.Join(drivePath, remoteDir))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var files = make([]File, 0)
|
||||
for i := range fileInfos {
|
||||
info, err := fileInfos[i].Info()
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
file := File{
|
||||
Name: fileInfos[i].Name(),
|
||||
Path: path.Join(remoteDir, fileInfos[i].Name()),
|
||||
IsDir: fileInfos[i].IsDir(),
|
||||
Mode: fileInfos[i].Mode().String(),
|
||||
IsLink: fileInfos[i].Mode()&os.ModeSymlink == os.ModeSymlink,
|
||||
ModTime: common.NewJsonTime(fileInfos[i].ModTime()),
|
||||
Size: fileInfos[i].Size(),
|
||||
Mode: info.Mode().String(),
|
||||
IsLink: info.Mode()&os.ModeSymlink == os.ModeSymlink,
|
||||
ModTime: common.NewJsonTime(info.ModTime()),
|
||||
Size: info.Size(),
|
||||
}
|
||||
|
||||
files = append(files, file)
|
||||
@@ -264,16 +267,16 @@ func (service storageService) StorageDownload(c echo.Context, file, storageId st
|
||||
return nil
|
||||
}
|
||||
|
||||
func (service storageService) StorageLs(remoteDir, storageId string) (error, []File) {
|
||||
func (service storageService) StorageLs(remoteDir, storageId string) ([]File, error) {
|
||||
drivePath := service.GetBaseDrivePath()
|
||||
if strings.Contains(remoteDir, "../") {
|
||||
return errors.New("非法请求 :("), nil
|
||||
return nil, errors.New("非法请求 :(")
|
||||
}
|
||||
files, err := service.Ls(path.Join(drivePath, storageId), remoteDir)
|
||||
if err != nil {
|
||||
return err, nil
|
||||
return nil, err
|
||||
}
|
||||
return nil, files
|
||||
return files, nil
|
||||
}
|
||||
|
||||
func (service storageService) StorageMkDir(remoteDir, storageId string) error {
|
||||
|
||||
Reference in New Issue
Block a user