Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-02-15 01:32:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert my cheeky change (#1799)

Browse Source
This commit is contained in:
Evan Simkowitz 2025-01-22 17:50:50 -08:00 committed by GitHub
parent 735d963aae
commit 689b2d63c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/wshrpc/wshremote/wshremote.go
View File

@ -162,21 +162,25 @@ func (impl *ServerImpl) remoteStreamFileInternal(ctx context.Context, data wshrp
if err != nil { if err != nil {
return err return err
} }
finfo, err := impl.fileInfoInternal(data.Path, true) path, err := wavebase.ExpandHomeDir(data.Path)
if err != nil { if err != nil {
return fmt.Errorf("cannot stat file %q: %w", data.Path, err) return err
}
finfo, err := impl.fileInfoInternal(path, true)
if err != nil {
return fmt.Errorf("cannot stat file %q: %w", path, err)
} }
dataCallback([]*wshrpc.FileInfo{finfo}, nil, byteRange) dataCallback([]*wshrpc.FileInfo{finfo}, nil, byteRange)
if finfo.NotFound { if finfo.NotFound {
return nil return nil
} }
if finfo.Size > wshrpc.MaxFileSize { if finfo.Size > wshrpc.MaxFileSize {
return fmt.Errorf("file %q is too large to read, use /wave/stream-file", finfo.Path) return fmt.Errorf("file %q is too large to read, use /wave/stream-file", path)
} }
if finfo.IsDir { if finfo.IsDir {
return impl.remoteStreamFileDir(ctx, finfo.Path, byteRange, dataCallback) return impl.remoteStreamFileDir(ctx, path, byteRange, dataCallback)
} else { } else {
return impl.remoteStreamFileRegular(ctx, finfo.Path, byteRange, dataCallback) return impl.remoteStreamFileRegular(ctx, path, byteRange, dataCallback)
} }
} }