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

Fix local base being ignored in make_tree

Browse source
This commit is contained in:
Kovid Goyal 2023-07-25 20:32:40 +05:30
parent 141edb975e
commit bd231eaf39
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kittens/transfer/receive.go
View file

@ -593,11 +593,7 @@ func (self *tree_node) add_child(f *remote_file) *tree_node {
return self
}
c := tree_node{entry: f, parent: self, added_files: make(map[*remote_file]*tree_node)}
if self.entry != nil {
f.expanded_local_path = filepath.Join(self.entry.expanded_local_path, filepath.Base(f.remote_path))
} else {
f.expanded_local_path = f.remote_path
}
f.expanded_local_path = filepath.Join(self.entry.expanded_local_path, filepath.Base(f.remote_path))
self.added_files[f] = &c
return &c
}
@ -632,7 +628,7 @@ func make_tree(all_files []*remote_file, local_base string) (root_node *tree_nod
fid_map[f.remote_id] = f
}
node_map := make(map[string]*tree_node)
root_node = &tree_node{added_files: make(map[*remote_file]*tree_node)}
root_node = &tree_node{entry: &remote_file{expanded_local_path: local_base}, added_files: make(map[*remote_file]*tree_node)}
for _, f := range all_files {
p := ensure_parent(f, root_node, node_map, fid_map)