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

More work on file transmission

Browse Source
This commit is contained in:
Kovid Goyal
2021-10-29 21:52:49 +05:30
parent 5eb87b9f10
commit ee852cf5fc
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kittens/transfer/receive.py
View File

@@ -14,7 +14,7 @@ from kitty.file_transmission import (
from ..tui.handler import Handler
from ..tui.loop import Loop, debug
from .utils import random_id
from .utils import expand_home, random_id
debug
@@ -102,7 +102,7 @@ def files_for_receive(cli_opts: TransferCLIOptions, dest: str, files: List[File]
spec_paths = [posixpath.join('~', posixpath.relpath(x, home)) for x in spec_paths]
for spec_id, files_for_spec in spec_map.items():
spec = spec_paths[spec_id]
tree = make_tree(files_for_spec, os.path.dirname(os.path.expanduser(spec)))
tree = make_tree(files_for_spec, os.path.dirname(expand_home(spec)))
for x in tree:
yield x.entry
else:
@@ -112,7 +112,7 @@ def files_for_receive(cli_opts: TransferCLIOptions, dest: str, files: List[File]
dest_path = os.path.join(dest, posixpath.basename(files_for_spec[0].remote_path))
else:
dest_path = dest
tree = make_tree(files_for_spec, os.path.expanduser(dest_path))
tree = make_tree(files_for_spec, expand_home(dest_path))
for x in tree:
yield x.entry

4
kittens/transfer/utils.py
View File

@@ -141,6 +141,10 @@ def home_path() -> str:
return _home or os.path.expanduser('~')
def cwd_path() -> str:
return _cwd or os.getcwd()
def expand_home(path: str) -> str:
if path.startswith('~' + os.sep) or (os.altsep and path.startswith('~' + os.altsep)):
return os.path.join(home_path(), path[2:].lstrip(os.sep + (os.altsep or '')))