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

More linter fixes

Browse Source
This commit is contained in:
Kovid Goyal
2023-09-18 21:36:34 +05:30
parent 1a32e62ebf
commit a8633756de
3 changed files with 50 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kittens/transfer/ftc.go
View File

@@ -137,10 +137,6 @@ type FileTransmissionCommand struct {
Data []byte `json:"d,omitempty"`
}
func escape_semicolons(x string) string {
return strings.ReplaceAll(x, ";", ";;")
}
var ftc_field_map = sync.OnceValue(func() map[string]reflect.StructField {
ans := make(map[string]reflect.StructField)
self := FileTransmissionCommand{}
@@ -242,7 +238,7 @@ func NewFileTransmissionCommand(serialized string) (ans *FileTransmissionCommand
key_length, key_start, val_start := 0, 0, 0
handle_value := func(key, serialized_val string) error {
key = strings.TrimLeft(key, `;;`)
key = strings.TrimLeft(key, `;`)
if field, ok := field_map[key]; ok {
val := v.FieldByIndex(field.Index)
switch val.Kind() {

44
kittens/transfer/receive.go
View File

@@ -19,7 +19,6 @@ import (
"kitty/kittens/unicode_input"
"kitty/tools/cli/markup"
"kitty/tools/rsync"
"kitty/tools/tty"
"kitty/tools/tui"
"kitty/tools/tui/loop"
"kitty/tools/utils"
@@ -145,7 +144,6 @@ type remote_file struct {
compression_type Compression
remote_symlink_value string
actual_file output_file
patch_file patch_file
}
func (self *remote_file) close() (err error) {
@@ -176,7 +174,9 @@ func (self *remote_file) Write(data []byte) (n int, err error) {
if self.actual_file == nil {
parent := filepath.Dir(self.expanded_local_path)
if parent != "" {
os.MkdirAll(parent, 0o755)
if err = os.MkdirAll(parent, 0o755); err != nil {
return 0, err
}
}
if self.expect_diff {
if pf, err := new_patch_file(self.expanded_local_path, self.patcher); err != nil {
@@ -263,7 +263,7 @@ func (self *remote_file) apply_metadata() {
}
}
} else {
os.Chmod(self.expanded_local_path, self.permissions)
_ = os.Chmod(self.expanded_local_path, self.permissions)
}
}
@@ -455,8 +455,6 @@ type handler struct {
last_data_write_id loop.IdType
}
var debugprintln = tty.DebugPrintln
func (self *manager) send(c FileTransmissionCommand, send func(string) loop.IdType) loop.IdType {
send(self.prefix)
send(c.Serialize(false))
@@ -486,7 +484,7 @@ func (self *handler) abort_with_error(err error, delay ...time.Duration) {
self.lp.Println(`Waiting to ensure terminal cancels transfer, will quit in no more than`, d)
self.manager.send(FileTransmissionCommand{Action: Action_cancel}, self.lp.QueueWriteString)
self.manager.state = state_canceled
self.lp.AddTimer(d, false, self.do_error_quit)
_, _ = self.lp.AddTimer(d, false, self.do_error_quit)
}
func (self *handler) do_error_quit(loop.IdType) error {
@@ -713,10 +711,12 @@ func files_for_receive(opts *Options, dest string, files []*remote_file, remote_
for spec_id, files_for_spec := range spec_map {
spec := spec_paths[spec_id]
tree := make_tree(files_for_spec, filepath.Dir(expand_home(spec)))
walk_tree(tree, func(x *tree_node) error {
if err = walk_tree(tree, func(x *tree_node) error {
ans = append(ans, x.entry)
return nil
})
}); err != nil {
return nil, err
}
}
} else {
number_of_source_files := 0
@@ -728,10 +728,12 @@ func files_for_receive(opts *Options, dest string, files []*remote_file, remote_
if dest_is_dir {
dest_path := filepath.Join(dest, filepath.Base(files_for_spec[0].remote_path))
tree := make_tree(files_for_spec, filepath.Dir(expand_home(dest_path)))
walk_tree(tree, func(x *tree_node) error {
if err = walk_tree(tree, func(x *tree_node) error {
ans = append(ans, x.entry)
return nil
})
}); err != nil {
return nil, err
}
} else {
f := files_for_spec[0]
f.expanded_local_path = expand_home(dest)
@@ -884,9 +886,13 @@ func (self *handler) on_file_transfer_response(ftc *FileTransmissionCommand) (er
if self.manager.transfer_done {
self.manager.send(FileTransmissionCommand{Action: Action_finish}, self.lp.QueueWriteString)
self.quit_after_write_code = 0
self.refresh_progress(0)
if err = self.refresh_progress(0); err != nil {
return err
}
} else if self.transmit_started {
self.refresh_progress(0)
if err = self.refresh_progress(0); err != nil {
return err
}
}
return
}
@@ -984,7 +990,7 @@ func (self *handler) draw_files() {
if p.total_transferred > 0 {
self.render_progress(`Total`, Progress{
spinner_char: sc, bytes_so_far: p.total_transferred, total_bytes: p.total_bytes_to_transfer,
secs_so_far: time.Now().Sub(p.started_at).Seconds(), is_complete: is_complete,
secs_so_far: time.Since(p.started_at).Seconds(), is_complete: is_complete,
bytes_per_sec: safe_divide(p.transfered_stats_amt, p.transfered_stats_interval.Abs().Seconds()),
})
self.lp.Println()
@@ -1049,11 +1055,15 @@ func (self *handler) on_key_event(ev *loop.KeyEvent) error {
if self.check_paths_printed && !self.transmit_started {
self.abort_with_error(fmt.Errorf(`Canceled by user`))
} else {
self.on_interrupt()
if _, err := self.on_interrupt(); err != nil {
return err
}
}
} else if ev.MatchesPressOrRepeat("ctrl+c") {
ev.Handled = true
self.on_interrupt()
if _, err := self.on_interrupt(); err != nil {
return err
}
}
return nil
}
@@ -1102,7 +1112,7 @@ func receive_loop(opts *Options, spec []string, dest string) (err error, rc int)
lp.OnKeyEvent = handler.on_key_event
lp.OnResize = func(old_sz, new_sz loop.ScreenSize) error {
if handler.progress_drawn {
handler.refresh_progress(0)
return handler.refresh_progress(0)
}
return nil
}

35
kittens/transfer/send.go
View File

@@ -348,7 +348,7 @@ type SendManager struct {
bypass string
use_rsync bool
file_progress func(*File, int)
file_done func(*File)
file_done func(*File) error
fid_map map[string]*File
all_acknowledged, all_started, has_transmitting, has_rsync bool
active_idx int
@@ -583,7 +583,7 @@ func (self *SendHandler) draw_progress_for_current_file(af *File, spinner_char s
var secs_so_far time.Duration
empty := File{}
if af.done_at == empty.done_at {
secs_so_far = time.Now().Sub(af.transmit_started_at)
secs_so_far = time.Since(af.transmit_started_at)
} else {
secs_so_far = af.done_at.Sub(af.transmit_started_at)
}
@@ -611,7 +611,9 @@ func (self *SendHandler) refresh_progress(timer_id loop.IdType) (err error) {
self.progress_update_timer = 0
}
if self.manager.active_file() == nil && !self.manager.all_acknowledged && self.done_file_ids.Len() != 0 && self.done_file_ids.Len() < len(self.manager.files) {
self.transmit_next_chunk()
if err = self.transmit_next_chunk(); err != nil {
return err
}
}
self.lp.StartAtomicUpdate()
defer self.lp.EndAtomicUpdate()
@@ -633,12 +635,12 @@ func (self *SendHandler) on_file_progress(f *File, change int) {
self.schedule_progress_update(100 * time.Millisecond)
}
func (self *SendHandler) on_file_done(f *File) {
func (self *SendHandler) on_file_done(f *File) error {
self.done_files = append(self.done_files, f)
if f.err_msg != "" {
self.failed_files = append(self.failed_files, f)
}
self.refresh_progress(0)
return self.refresh_progress(0)
}
func (self *SendHandler) send_payload(payload string) loop.IdType {
@@ -743,7 +745,9 @@ func (self *SendManager) on_file_status_update(ftc *FileTransmissionCommand) err
file.err_msg = ftc.Status
}
self.progress_tracker.on_file_done(file)
self.file_done(file)
if err := self.file_done(file); err != nil {
return err
}
if self.active_idx > -1 && file == self.files[self.active_idx] {
self.active_idx = -1
}
@@ -857,8 +861,7 @@ func (self *SendHandler) check_for_transmit_ok() (err error) {
return
}
self.transmit_ok_checked = true
self.start_transfer()
return
return self.start_transfer()
}
func (self *SendHandler) print_check_paths() {
@@ -1083,7 +1086,9 @@ func (self *SendHandler) on_text(text string, from_key_event, in_bracketed_paste
return err
}
if self.manager.all_acknowledged {
self.refresh_progress(0)
if err = self.refresh_progress(0); err != nil {
return err
}
self.transfer_finished()
}
return nil
@@ -1110,7 +1115,7 @@ func (self *SendHandler) abort_transfer(delay ...time.Duration) {
}
self.send_payload(FileTransmissionCommand{Action: Action_cancel}.Serialize())
self.manager.state = SEND_CANCELED
self.lp.AddTimer(d, false, func(loop.IdType) error {
_, _ = self.lp.AddTimer(d, false, func(loop.IdType) error {
self.lp.Quit(1)
return nil
})
@@ -1118,7 +1123,7 @@ func (self *SendHandler) abort_transfer(delay ...time.Duration) {
func (self *SendHandler) on_resize(old_size, new_size loop.ScreenSize) error {
if self.progress_drawn {
self.refresh_progress(0)
return self.refresh_progress(0)
}
return nil
}
@@ -1158,7 +1163,9 @@ func (self *SendHandler) on_writing_finished(msg_id loop.IdType, has_pending_wri
} else {
self.quit_after_write_code = 0
}
self.refresh_progress(0)
if err = self.refresh_progress(0); err != nil {
return err
}
}
if self.quit_after_write_code > -1 && !has_pending_writes {
self.lp.Quit(self.quit_after_write_code)
@@ -1168,7 +1175,9 @@ func (self *SendHandler) on_writing_finished(msg_id loop.IdType, has_pending_wri
return self.check_for_transmit_ok()
}
if chunk_transmitted {
self.refresh_progress(0)
if err = self.refresh_progress(0); err != nil {
return err
}
return self.transmit_next_chunk()
}
return