mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

lp.Println() should act live fmt.Println()

Browse Source 
also use a dedicated error type for signalining perm denied
This commit is contained in:
Kovid Goyal
2023-07-26 02:03:43 +05:30
parent 5578e34da8
commit ce593dbb5f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
kittens/transfer/receive.go
View File

@@ -16,6 +16,7 @@ import (
"time"
"kitty"
"kitty/kittens/unicode_input"
"kitty/tools/cli/markup"
"kitty/tools/rsync"
"kitty/tools/tty"
@@ -535,7 +536,7 @@ func (self *manager) on_file_transfer_response(ftc *FileTransmissionCommand) (er
if ftc.Status == `OK` {
self.state = state_waiting_for_file_metadata
} else {
return os.ErrPermission
return unicode_input.ErrCanceledByUser
}
} else {
return fmt.Errorf(`Unexpected response from terminal: %s`, ftc.String())
@@ -819,7 +820,7 @@ func (self *handler) on_file_transfer_response(ftc *FileTransmissionCommand) (er
}
transfer_started := self.manager.state == state_transferring
if merr := self.manager.on_file_transfer_response(ftc); merr != nil {
if merr == os.ErrPermission {
if merr == unicode_input.ErrCanceledByUser {
// terminal will not respond to cancel request
return fmt.Errorf("Permission denied by user")
}

4
tools/tui/loop/api.go
View File

@@ -202,8 +202,8 @@ func (self *Loop) KillIfSignalled() {
}
func (self *Loop) Println(args ...any) {
self.QueueWriteString(fmt.Sprint(args...))
self.QueueWriteString("\r\n")
self.QueueWriteString(fmt.Sprintln(args...))
self.QueueWriteString("\r")
}
func (self *Loop) SprintStyled(style string, args ...any) string {