Merge pull request #140 from effigies/fix/get_one

fix(cli): Fix crash in templateflow get when matching one file

Author: mgxd

templateflow/cli.py

@@ -141,7 +141,9 @@ def ls(template, **kwargs):
 def get(template, **kwargs):
     """Fetch the assets corresponding to template and optional filters."""
     entities = {k: _nulls(v) for k, v in kwargs.items() if v != ''}
-    click.echo('\n'.join(f'{match}' for match in api.get(template, **entities)))
+    paths = api.get(template, **entities)
+    filenames = [str(paths)] if isinstance(paths, Path) else [str(file) for file in paths]
+    click.echo('\n'.join(filenames))
 
 
 if __name__ == '__main__':

templateflow/tests/test_cli.py

@@ -0,0 +1,69 @@
+from pathlib import Path
+
+import click.testing
+import pytest
+
+from .. import cli
+
+
+@pytest.fixture
+def runner():
+    return click.testing.CliRunner()
+
+
+def test_ls_one(runner):
+    result = runner.invoke(cli.main, ['ls', 'MNI152Lin', '--res', '1', '-s', 'T1w'])
+
+    # One result
+    lines = result.stdout.strip().splitlines()
+    assert len(lines) == 1
+
+    assert 'tpl-MNI152Lin/tpl-MNI152Lin_res-01_T1w.nii.gz' in lines[0]
+
+    path = Path(lines[0])
+
+    assert path.exists()
+
+
+def test_ls_multi(runner):
+    result = runner.invoke(cli.main, ['ls', 'MNI152Lin', '--res', '1', '-s', 'T1w', '-s', 'T2w'])
+
+    # Two results
+    lines = result.stdout.strip().splitlines()
+    assert len(lines) == 2
+
+    assert 'tpl-MNI152Lin/tpl-MNI152Lin_res-01_T1w.nii.gz' in lines[0]
+    assert 'tpl-MNI152Lin/tpl-MNI152Lin_res-01_T2w.nii.gz' in lines[1]
+
+    paths = [Path(line) for line in lines]
+
+    assert all(path.exists() for path in paths)
+
+
+def test_get_one(runner):
+    result = runner.invoke(cli.main, ['get', 'MNI152Lin', '--res', '1', '-s', 'T1w'])
+
+    # One result, possible download status before
+    lines = result.stdout.strip().splitlines()[-2:]
+
+    assert 'tpl-MNI152Lin/tpl-MNI152Lin_res-01_T1w.nii.gz' in lines[0]
+
+    path = Path(lines[0])
+
+    stat_res = path.stat()
+    assert stat_res.st_size == 10669511
+
+
+def test_get_multi(runner):
+    result = runner.invoke(cli.main, ['get', 'MNI152Lin', '--res', '1', '-s', 'T1w', '-s', 'T2w'])
+
+    # Two result, possible download status before
+    lines = result.stdout.strip().splitlines()[-3:]
+
+    assert 'tpl-MNI152Lin/tpl-MNI152Lin_res-01_T1w.nii.gz' in lines[0]
+    assert 'tpl-MNI152Lin/tpl-MNI152Lin_res-01_T2w.nii.gz' in lines[1]
+
+    paths = [Path(line) for line in lines]
+
+    stats = [path.stat() for path in paths]
+    assert [stat_res.st_size for stat_res in stats] == [10669511, 10096230]