Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FileCopier: avoid repeated copies of absolute paths. #5792

Merged
merged 1 commit into from Oct 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions conans/client/file_copier.py
Expand Up @@ -67,6 +67,12 @@ def __call__(self, pattern, dst="", src="", keep_path=True, links=False, symlink
if symlinks is not None:
links = symlinks

if os.path.isabs(src):
# Avoid repeatedly copying absolute paths
return self._copy(os.curdir, pattern, src, dst, links,
ignore_case, excludes, keep_path,
excluded_folders=[self._dst_folder])

files = []
for src_folder in self._src_folders:
excluded = [self._dst_folder]
Expand Down
29 changes: 29 additions & 0 deletions conans/test/unittests/client/file_copier_test.py
@@ -1,3 +1,4 @@
import mock
import os
import platform
import unittest
Expand Down Expand Up @@ -171,3 +172,31 @@ def excludes_test(self):
copier = FileCopier([folder1], folder2)
copier("*.txt", excludes=("*Test*.txt", "*Impl*"))
self.assertEqual(['MyLib.txt'], os.listdir(folder2))

def multifolder_test(self):
src_folder1 = temp_folder()
src_folder2 = temp_folder()
save(os.path.join(src_folder1, "file1.txt"), "Hello1")
save(os.path.join(src_folder2, "file2.txt"), "Hello2")

dst_folder = temp_folder()
copier = FileCopier([src_folder1, src_folder2], dst_folder)
copier("*")
self.assertEqual(['file1.txt', 'file2.txt'],
sorted(os.listdir(dst_folder)))

@mock.patch('shutil.copy2')
def avoid_repeat_copies_test(self, copy2_mock):
src_folders = [temp_folder() for _ in range(2)]
for index, src_folder in enumerate(src_folders):
save(os.path.join(src_folder, "sub", "file%d.txt" % index),
"Hello%d" % index)

dst_folder = temp_folder()
copier = FileCopier(src_folders, dst_folder)


for src_folder in src_folders:
copier("*", src=os.path.join(src_folder, "sub"))

self.assertEqual(copy2_mock.call_count, len(src_folders))