feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Improve src matcher for the symbolic links

Browse Source
This commit is contained in:
Ivan Kravets
2022-04-21 16:31:40 +03:00
parent 72fa6eebba
commit 2f7668aef5
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
platformio/fs.py
View File

@ -146,33 +146,40 @@ def path_endswith_ext(path, extensions):
def match_src_files(src_dir, src_filter=None, src_exts=None, followlinks=True): def match_src_files(src_dir, src_filter=None, src_exts=None, followlinks=True):
def _append_build_item(items, item, src_dir): def _add_candidate(items, item, src_dir):
if not src_exts or path_endswith_ext(item, src_exts): if not src_exts or path_endswith_ext(item, src_exts):
items.add(os.path.relpath(item, src_dir)) items.add(os.path.relpath(item, src_dir))
def _find_candidates(pattern):
candidates = set()
for item in glob.glob(
os.path.join(glob.escape(src_dir), pattern), recursive=followlinks
):
if not os.path.isdir(item):
_add_candidate(candidates, item, src_dir)
continue
for root, dirs, files in os.walk(item, followlinks=followlinks):
for d in dirs if not followlinks else []:
if os.path.islink(os.path.join(root, d)):
_add_candidate(candidates, os.path.join(root, d), src_dir)
for f in files:
_add_candidate(candidates, os.path.join(root, f), src_dir)
return candidates
src_filter = src_filter or "" src_filter = src_filter or ""
if isinstance(src_filter, (list, tuple)): if isinstance(src_filter, (list, tuple)):
src_filter = " ".join(src_filter) src_filter = " ".join(src_filter)
matches = set() result = set()
# correct fs directory separator # correct fs directory separator
src_filter = src_filter.replace("/", os.sep).replace("\\", os.sep) src_filter = src_filter.replace("/", os.sep).replace("\\", os.sep)
for (action, pattern) in re.findall(r"(\+|\-)<([^>]+)>", src_filter): for (action, pattern) in re.findall(r"(\+|\-)<([^>]+)>", src_filter):
items = set() candidates = _find_candidates(pattern)
for item in glob.glob(
os.path.join(glob.escape(src_dir), pattern), recursive=True
):
if os.path.isdir(item):
for root, _, files in os.walk(item, followlinks=followlinks):
for f in files:
_append_build_item(items, os.path.join(root, f), src_dir)
else:
_append_build_item(items, item, src_dir)
if action == "+": if action == "+":
matches |= items result |= candidates
else: else:
matches -= items result -= candidates
return sorted(list(matches)) return sorted(list(result))
def to_unix_path(path): def to_unix_path(path):