mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-17 07:00:12 +01:00
🎨 API /api/file/readDir support for returning symbolic link information (#8805)
* 🎨 API `/api/file/readDir` response symlink info * 🎨 distinguish between directory symlink and file symlink
This commit is contained in:
parent
1ac46032fa
commit
b45cf73ed8
4 changed files with 20 additions and 3 deletions
2
API.md
2
API.md
|
|
@ -1076,10 +1076,12 @@ View API token in <kbd>Settings - About</kbd>, request header: `Authorization: T
|
||||||
"data": [
|
"data": [
|
||||||
{
|
{
|
||||||
"isDir": true,
|
"isDir": true,
|
||||||
|
"isSymlink": false,
|
||||||
"name": "20210808180320-abz7w6k"
|
"name": "20210808180320-abz7w6k"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"isDir": false,
|
"isDir": false,
|
||||||
|
"isSymlink": false,
|
||||||
"name": "20210808180320-abz7w6k.sy"
|
"name": "20210808180320-abz7w6k.sy"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -1068,10 +1068,12 @@
|
||||||
"data": [
|
"data": [
|
||||||
{
|
{
|
||||||
"isDir": true,
|
"isDir": true,
|
||||||
|
"isSymlink": false,
|
||||||
"name": "20210808180320-abz7w6k"
|
"name": "20210808180320-abz7w6k"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"isDir": false,
|
"isDir": false,
|
||||||
|
"isSymlink": false,
|
||||||
"name": "20210808180320-abz7w6k.sy"
|
"name": "20210808180320-abz7w6k.sy"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -172,9 +172,18 @@ func readDir(c *gin.Context) {
|
||||||
|
|
||||||
files := []map[string]interface{}{}
|
files := []map[string]interface{}{}
|
||||||
for _, entry := range entries {
|
for _, entry := range entries {
|
||||||
|
path := filepath.Join(dirPath, entry.Name())
|
||||||
|
info, err = os.Stat(path)
|
||||||
|
if nil != err {
|
||||||
|
logging.LogErrorf("stat [%s] failed: %s", path, err)
|
||||||
|
ret.Code = 500
|
||||||
|
ret.Msg = err.Error()
|
||||||
|
return
|
||||||
|
}
|
||||||
files = append(files, map[string]interface{}{
|
files = append(files, map[string]interface{}{
|
||||||
"name": entry.Name(),
|
"name": entry.Name(),
|
||||||
"isDir": entry.IsDir(),
|
"isDir": info.IsDir(),
|
||||||
|
"isSymlink": util.IsSymlink(entry),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,12 @@ func IsEmptyDir(p string) bool {
|
||||||
return 1 > len(files)
|
return 1 > len(files)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func IsSymlink(dir fs.DirEntry) bool {
|
||||||
|
return dir.Type() == fs.ModeSymlink
|
||||||
|
}
|
||||||
|
|
||||||
func IsDirRegularOrSymlink(dir fs.DirEntry) bool {
|
func IsDirRegularOrSymlink(dir fs.DirEntry) bool {
|
||||||
return dir.IsDir() || dir.Type() == fs.ModeSymlink
|
return dir.IsDir() || IsSymlink(dir)
|
||||||
}
|
}
|
||||||
|
|
||||||
func IsPathRegularDirOrSymlinkDir(path string) bool {
|
func IsPathRegularDirOrSymlinkDir(path string) bool {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue