Skip to content

Revert my cheeky change #1799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
esimkowitz merged 1 commit into from
Jan 23, 2025
Merged

Revert my cheeky change #1799

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions pkg/wshrpc/wshremote/wshremote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,21 +162,25 @@ func (impl *ServerImpl) remoteStreamFileInternal(ctx context.Context, data wshrp
if err != nil {
return err
}
finfo, err := impl.fileInfoInternal(data.Path, true)
path, err := wavebase.ExpandHomeDir(data.Path)
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)
if finfo.NotFound {
return nil
}
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 {
return impl.remoteStreamFileDir(ctx, finfo.Path, byteRange, dataCallback)
return impl.remoteStreamFileDir(ctx, path, byteRange, dataCallback)
} else {
return impl.remoteStreamFileRegular(ctx, finfo.Path, byteRange, dataCallback)
return impl.remoteStreamFileRegular(ctx, path, byteRange, dataCallback)
}
}

Expand Down
Loading