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.

Sign up for GitHub

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

Little fix in function for recursive find sources #95

Merged
merged 2 commits into from
Jan 20, 2021
Merged

Little fix in function for recursive find sources #95

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
635e62e
little fix in function for recursive find sources
yasakova-anastasia Jan 19, 2021
1efe580
file filter include inside of extend(...)
yasakova-anastasia Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions datumaro/components/extractor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,10 +624,10 @@ def _find_sources_recursive(cls, path, ext, extractor_name,
for d in range(max_depth + 1):
sources.extend({'url': p, 'format': extractor_name} for p in
iglob(osp.join(path, *('*' * d), dirname, filename + ext)))
if callable(file_filter):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This way the function will be called on each iteration, and will re-check items from previous steps. We can move it out of the loop or include inside of extend(...).

sources = [s for s in sources if file_filter(s['url'])]
if sources:
break
if callable(file_filter):
sources = [s for s in sources if file_filter(s['url'])]
return sources

class Transform(Extractor):
Expand Down