Skip to content

Fix offset regression in wshremote #1807

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 4 commits into from
Jan 23, 2025
Merged

Fix offset regression in wshremote #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8bbc612
Fix offset regression in wshremote
esimkowitz Jan 23, 2025
9820f2f
fix
esimkowitz Jan 23, 2025
edc905a
add extra guard conditions
sawka Jan 23, 2025
9d32f24
add some margin for markdown preview content
sawka Jan 23, 2025
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
3 changes: 3 additions & 0 deletions frontend/app/view/preview/preview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
align-items: start;
justify-content: start;
overflow: auto;
.markdown {
margin: 10px 5px;
}
}

&.view-preview-text {
Expand Down
41 changes: 26 additions & 15 deletions pkg/wshrpc/wshremote/wshremote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,15 +714,29 @@ func (impl *ServerImpl) RemoteMkdirCommand(ctx context.Context, path string) err
}
return nil
}

func (*ServerImpl) RemoteWriteFileCommand(ctx context.Context, data wshrpc.FileData) error {
var truncate, append bool
var atOffset int64
if data.Info != nil && data.Info.Opts != nil {
truncate = data.Info.Opts.Truncate
append = data.Info.Opts.Append
}
if data.At != nil {
atOffset = data.At.Offset
}
if truncate && atOffset > 0 {
return fmt.Errorf("cannot specify non-zero offset with truncate option")
}
if append && atOffset > 0 {
return fmt.Errorf("cannot specify non-zero offset with append option")
}
path, err := wavebase.ExpandHomeDir(data.Info.Path)
if err != nil {
return err
}
createMode := data.Info.Mode
if createMode == 0 {
createMode = 0644
createMode := os.FileMode(0644)
if data.Info != nil && data.Info.Mode > 0 {
createMode = data.Info.Mode
}
dataSize := base64.StdEncoding.DecodedLen(len(data.Data64))
dataBytes := make([]byte, dataSize)
Expand All @@ -738,34 +752,31 @@ func (*ServerImpl) RemoteWriteFileCommand(ctx context.Context, data wshrpc.FileD
if finfo != nil {
fileSize = finfo.Size()
}
offset := fileSize
if data.At != nil {
if data.At.Offset > 0 {
offset = min(data.At.Offset, fileSize)
}
if atOffset > fileSize {
return fmt.Errorf("cannot write at offset %d, file size is %d", atOffset, fileSize)
}

openFlags := os.O_CREATE | os.O_WRONLY
if data.Info.Opts.Truncate {
if truncate {
openFlags |= os.O_TRUNC
}
if data.Info.Opts.Append {
if append {
openFlags |= os.O_APPEND
}

file, err := os.OpenFile(path, openFlags, createMode)
if err != nil {
return fmt.Errorf("cannot open file %q: %w", path, err)
}
if offset > 0 && !data.Info.Opts.Append {
n, err = file.WriteAt(dataBytes[:n], offset)
defer file.Close()
if atOffset > 0 && !append {
n, err = file.WriteAt(dataBytes[:n], atOffset)
} else {
n, err = file.Write(dataBytes[:n])
}
if err != nil {
return fmt.Errorf("cannot write to file %q: %w", path, err)
}
log.Printf("wrote %d bytes to file %q at offset %q\n", n, path, offset)
log.Printf("wrote %d bytes to file %q at offset %d\n", n, path, atOffset)
return nil
}

Expand Down
Loading