github-mirror/alist
github-mirror/alist
2
0
Fork 0
mirror of https://github.com/AlistGo/alist.git synced 2025-04-23 13:54:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: 修复path处理错误的get方法

Browse Source 
修复get方法，删除意外加入的目录
This commit is contained in:
jerry-harm 2025-04-01 13:07:27 +08:00
parent fccdd37ddd
commit afa960df9d
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
alist-web

@ -1 +0,0 @@
Subproject commit 0590fad8d0d3f26870b1973d2e8f7673d6e8dd9c

52
drivers/ipfs_api/driver.go
View File

@ -42,20 +42,27 @@ func (d *IPFS) Drop(ctx context.Context) error {
}
func (d *IPFS) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]model.Obj, error) {
ipfsPath := dir.GetPath()
switch d.Mode {
case "ipfs":
ipfsPath = filepath.Join("/ipfs", ipfsPath)
case "ipns":
ipfsPath = filepath.Join("/ipns", ipfsPath)
case "mfs":
fileStat, err := d.sh.FilesStat(ctx, ipfsPath)
if err != nil {
return nil, err
var ipfsPath string
cid := dir.GetID()
if cid != "" {
ipfsPath = filepath.Join("/ipfs", cid)
} else {
// 可能出现ipns dns解析失败的情况，需要重复获取cid，其他情况应该不会出错
ipfsPath = dir.GetPath()
switch d.Mode {
case "ipfs":
ipfsPath = filepath.Join("/ipfs", ipfsPath)
case "ipns":
ipfsPath = filepath.Join("/ipns", ipfsPath)
case "mfs":
fileStat, err := d.sh.FilesStat(ctx, ipfsPath)
if err != nil {
return nil, err
}
ipfsPath = filepath.Join("/ipfs", fileStat.Hash)
default:
return nil, fmt.Errorf("mode error")
}
ipfsPath = filepath.Join("/ipfs", fileStat.Hash)
default:
return nil, fmt.Errorf("mode error")
}
dirs, err := d.sh.List(ipfsPath)
if err != nil {
@ -77,10 +84,23 @@ func (d *IPFS) Link(ctx context.Context, file model.Obj, args model.LinkArgs) (*
}
func (d *IPFS) Get(ctx context.Context, path string) (model.Obj, error) {
if d.Mode != "mfs" {
return nil, fmt.Errorf("only get path for mfs")
path = filepath.Join(d.GetRootPath(), path)
var ipfsPath string
switch d.Mode {
case "ipfs":
ipfsPath = filepath.Join("/ipfs", path)
case "ipns":
ipfsPath = filepath.Join("/ipns", path)
case "mfs":
fileStat, err := d.sh.FilesStat(ctx, path)
if err != nil {
return nil, err
}
ipfsPath = filepath.Join("/ipfs", fileStat.Hash)
default:
return nil, fmt.Errorf("mode error")
}
file, err := d.sh.FilesStat(ctx, path)
file, err := d.sh.FilesStat(ctx, ipfsPath)
if err != nil {
return nil, err
}