voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix handling of destination replacement when source is drive root.

Browse source
This commit is contained in:
Ethan Dalool 2020-08-20 13:53:29 -07:00
parent 499c012194
commit 09437547f0
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
voussoirkit/spinal.py
View file

@ -250,11 +250,26 @@ def copy_dir(
if source_file.is_link: if source_file.is_link:
continue continue
destination_abspath = source_file.absolute_path.replace( # The source abspath will only end in os.sep if it is the drive root.
source.absolute_path, # Non-root folders already have their trailing slash stripped by
destination.absolute_path # pathclass. Using rstrip helps us make the following transformation:
) # source: A:\
destination_file = pathclass.Path(destination_abspath) # destination: B:\backup
# A:\myfile.txt
# -> replace(A:, B:\backup\A)
# -> B:\backup\A\myfile.txt
#
# Without disturbing the other case in which source is not drive root.
# source: A:\Documents
# destination: B:\backup\A\Documents
# A:\Documents\myfile.txt
# -> replace(A:\Documents, B:\backup\A\Documents)
# -> B:\backup\A\Documents\myfile.txt
destination_file = pathclass.Path(source_file.absolute_path.replace(
source.absolute_path.rstrip(os.sep),
destination.absolute_path,
1
))
if destination_file.is_dir: if destination_file.is_dir:
raise DestinationIsDirectory(destination_file) raise DestinationIsDirectory(destination_file)