test/1Panel
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/1Panel.git synced 2024-12-04 21:09:31 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

fix: 解决软连接被识别为文件问题 (#6400)

Browse Source 
Refs #5879
This commit is contained in:
蘭 2024-09-06 17:37:52 +08:00 committed by GitHub
parent dd1430dbbf
commit a53fff2416
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
backend/utils/files/fileinfo.go
View File

@ -102,6 +102,12 @@ func NewFileInfo(op FileOption) (*FileInfo, error) {
if file.IsSymlink { if file.IsSymlink {
file.LinkPath = GetSymlink(op.Path) file.LinkPath = GetSymlink(op.Path)
targetInfo, err := appFs.Stat(file.LinkPath)
if err != nil {
return nil, err
}
file.IsDir = targetInfo.IsDir()
file.Extension = filepath.Ext(file.LinkPath)
} }
if op.Expand { if op.Expand {
if err := handleExpansion(file, op); err != nil { if err := handleExpansion(file, op); err != nil {
@ -309,6 +315,12 @@ func (f *FileInfo) processFiles(files []FileSearchInfo, option FileOption) ([]*F
} }
if isSymlink { if isSymlink {
file.LinkPath = GetSymlink(fPath) file.LinkPath = GetSymlink(fPath)
targetInfo, err := file.Fs.Stat(file.LinkPath)
if err != nil {
return nil, err
}
file.IsDir = targetInfo.IsDir()
file.Extension = filepath.Ext(file.LinkPath)
} }
if df.Size() > 0 { if df.Size() > 0 {
file.MimeType = GetMimeType(fPath) file.MimeType = GetMimeType(fPath)

2
frontend/src/api/interface/file.ts
View File

@ -11,7 +11,7 @@ export namespace File {
size: number; size: number;
isDir: boolean; isDir: boolean;
isSymlink: boolean; isSymlink: boolean;
linkPath: boolean; linkPath: string;
type: string; type: string;
updateTime: string; updateTime: string;
modTime: string; modTime: string;

6
frontend/src/views/host/file-management/index.vue
View File

@ -891,12 +891,12 @@ const openView = (item: File.File) => {
compress: openDeCompress, compress: openDeCompress,
text: () => openCodeEditor(item.path, item.extension), text: () => openCodeEditor(item.path, item.extension),
}; };
const path = item.isSymlink ? item.linkPath : item.path;
return actionMap[fileType] ? actionMap[fileType](item) : openCodeEditor(item.path, item.extension); return actionMap[fileType] ? actionMap[fileType](item) : openCodeEditor(path, item.extension);
}; };
const openPreview = (item: File.File, fileType: string) => { const openPreview = (item: File.File, fileType: string) => {
filePreview.path = item.path; filePreview.path = item.isSymlink ? item.linkPath : item.path;
filePreview.name = item.name; filePreview.name = item.name;
filePreview.extension = item.extension; filePreview.extension = item.extension;
filePreview.fileType = fileType; filePreview.fileType = fileType;