ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

...

Browse source
This commit is contained in:
Kovid Goyal 2023-05-27 11:54:53 +05:30
parent 1d3031d011
commit e05902e8ee
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kittens/transfer/send.go
View file

@ -71,7 +71,7 @@ func NewFile(local_path, expanded_local_path string, file_id int, stat_result fs
ans := File{
local_path: local_path, expanded_local_path: expanded_local_path, file_id: fmt.Sprintf("%x", file_id),
stat_result: stat_result, file_type: file_type, display_name: wcswidth.StripEscapeCodes(local_path),
file_hash: FileHash{stat.Dev, stat.Ino}, mtime: stat_result.ModTime(),
file_hash: FileHash{uint64(stat.Dev), stat.Ino}, mtime: stat_result.ModTime(),
file_size: stat_result.Size(), bytes_to_transmit: stat_result.Size(),
permissions: stat_result.Mode().Perm(), remote_path: filepath.ToSlash(get_remote_path(local_path, remote_base)),
rsync_capable: file_type == FileType_regular && stat_result.Size() > 4096,
@ -193,7 +193,7 @@ func files_for_send(opts *Options, args []string) (files []*File, err error) {
if err == nil {
stat, ok := st.Sys().(*syscall.Stat_t)
if ok {
fh := FileHash{stat.Dev, stat.Ino}
fh := FileHash{uint64(stat.Dev), stat.Ino}
gr, found := groups[fh]
if found {
g := utils.Filter(gr, func(x *File) bool {

1
kitty_tests/file_transmission.py
View file

@ -13,7 +13,6 @@
from kittens.transfer.main import parse_transfer_args
from kittens.transfer.receive import File, files_for_receive
from kittens.transfer.rsync import decode_utf8_buffer, parse_ftc
from kittens.transfer.send import files_for_send
from kittens.transfer.utils import cwd_path, expand_home, home_path, set_paths
from kitty.file_transmission import Action, Compression, FileTransmissionCommand, FileType, TransmissionType, ZlibDecompressor, iter_file_metadata
from kitty.file_transmission import TestFileTransmission as FileTransmission