github
/
alist
mirror of https://github.com/Xhofe/alist
1
0
Fork 0
Code Issues Releases Wiki Activity

chore: Merge pull request #874 from Xhofe/dev 

support mount to root path
pull/905/head v2.3.1
Xhofe 2022-04-01 09:42:37 +08:00 committed by GitHub
parent e6be11c17f e83081380e
commit 876579ea3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build_docker.yml vendored
View File

@ -3,8 +3,6 @@ name: build_docker
on: on:
push: push:
branches: [ v2 ] branches: [ v2 ]
pull_request:
branches: [ v2 ]
jobs: jobs:
build_docker: build_docker:

6
model/account.go
View File

@ -207,6 +207,9 @@ func GetAccountsByPath(path string) []Account {
if bIndex != -1 { if bIndex != -1 {
name = name[:bIndex] name = name[:bIndex]
} }
if name == "/" {
name = ""
}
// 不是这个账号 // 不是这个账号
if path != name && !strings.HasPrefix(path, name+"/") { if path != name && !strings.HasPrefix(path, name+"/") {
continue continue
@ -253,6 +256,9 @@ func GetAccountFilesByPath(prefix string) []File {
continue continue
} }
full := utils.ParsePath(v.Name) full := utils.ParsePath(v.Name)
if len(full) <= len(prefix) {
continue
}
// 不是以prefix为前缀 // 不是以prefix为前缀
if !strings.HasPrefix(full, prefix+"/") && prefix != "/" { if !strings.HasPrefix(full, prefix+"/") && prefix != "/" {
continue continue

3
server/common/common.go
View File

@ -38,6 +38,9 @@ func ParsePath(rawPath string) (*model.Account, string, base.Driver, error) {
if bIndex != -1 { if bIndex != -1 {
name = name[:bIndex] name = name[:bIndex]
} }
if name == "/" {
name = ""
}
return &account, strings.TrimPrefix(rawPath, name), driver, nil return &account, strings.TrimPrefix(rawPath, name), driver, nil
} }