Skip to content

enh: selectfiles select(only)dirs too #2134

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

Merged
merged 5 commits into from
Oct 27, 2017
Merged

enh: selectfiles select(only)dirs too #2134

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3afea0c
enh: selectdirs too
mgxd Jul 27, 2017
864dbae
Merge branch 'master' of git://github.com/nipy/nipype into enh/select…
mgxd Aug 22, 2017
57b03db
Merge branch 'master' of git://github.com/nipy/nipype into enh/select…
mgxd Sep 27, 2017
992a81b
bf: ensure template can end with os separator
mgxd Sep 27, 2017
06b45ee
sty: cleanup
mgxd Sep 27, 2017
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
21 changes: 15 additions & 6 deletions nipype/interfaces/io.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,15 +1188,18 @@ class SelectFilesInputSpec(DynamicTraitedSpec, BaseInterfaceInputSpec):
base_directory = Directory(exists=True,
desc="Root path common to templates.")
sort_filelist = traits.Bool(True, usedefault=True,
desc="When matching mutliple files, return them in sorted order.")
desc="When matching mutliple files, return them"
" in sorted order.")
raise_on_empty = traits.Bool(True, usedefault=True,
desc="Raise an exception if a template pattern matches no files.")
desc="Raise an exception if a template pattern "
"matches no files.")
force_lists = traits.Either(traits.Bool(), traits.List(Str()),
default=False, usedefault=True,
desc=("Whether to return outputs as a list even when only one file "
"matches the template. Either a boolean that applies to all "
"output fields or a list of output field names to coerce to "
" a list"))
desc=("Whether to return outputs as a list even"
" when only one file matches the template. "
"Either a boolean that applies to all output "
"fields or a list of output field names to "
"coerce to a list"))


class SelectFiles(IOBase):
Expand Down Expand Up @@ -1296,13 +1299,19 @@ def _list_outputs(self):

for field, template in list(self._templates.items()):

find_dirs = template[-1] == os.sep

# Build the full template path
if isdefined(self.inputs.base_directory):
template = op.abspath(op.join(
self.inputs.base_directory, template))
else:
template = op.abspath(template)

# re-add separator if searching exclusively for directories
if find_dirs:
template += os.sep

# Fill in the template and glob for files
filled_template = template.format(**info)
filelist = glob.glob(filled_template)
Expand Down