Allow folders to be specified as input files #3, v0.0.7

Author: m-mohr

CHANGELOG.md

@@ -27,6 +27,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - ...
 
+## [v0.0.7] - 2024-02-23
+
+- Allow folders to be specified as input files [#3](https://github.com/fiboa/cli/issues/3)
+
 ## [v0.0.6] - 2024-02-23
 
 - Add `-e` option for create command to support extension schema mapping to local files

fiboa_cli/__init__.py

@@ -3,7 +3,7 @@
 
 from .validate import validate as validate_
 from .create import create as create_
-from .util import log, check_ext_schema_for_cli, valid_file_for_cli, valid_files_for_cli
+from .util import log, check_ext_schema_for_cli, valid_file_for_cli, valid_files_folders_for_cli
 from .version import __version__
 
 @click.group()
@@ -15,7 +15,7 @@ def cli():
     pass
 
 @click.command()
-@click.argument('files', nargs=-1, callback=valid_files_for_cli)
+@click.argument('files', nargs=-1, callback=lambda ctx, param, value: valid_files_folders_for_cli(value, ["parquet", "geoparquet"]))
 @click.option(
     '--schema', '-s',
     type=click.Path(exists=True),
@@ -72,7 +72,7 @@ def validate(files, schema, ext_schema, fiboa_version, collection, data):
             sys.exit(2)
 
 @click.command()
-@click.argument('files', nargs=-1, callback=valid_files_for_cli)
+@click.argument('files', nargs=-1, callback=lambda ctx, param, value: valid_files_folders_for_cli(value, ["json", "geojson"]))
 @click.option(
     '--out', '-o',
     type=click.Path(exists=False),

fiboa_cli/create.py

@@ -23,14 +23,18 @@ def create(config):
 
     # Load all features from the GeoJSON files
     features = []
-    for file in config.get("files"):
+    files = config.get("files")
+    for file in files:
         geojson = load_file(file)
         if geojson["type"] == "Feature":
             features.append(geojson)
         elif geojson["type"] == "FeatureCollection":
             features += geojson.features
         else:
-            raise Exception("Unsupported GeoJSON type, must be Feature or FeatureCollection")
+            log(f"{file}: Skipped - Unsupported GeoJSON type, must be Feature or FeatureCollection")
+
+    if len(features) == 0:
+        raise Exception("No valid features provided as input files")
 
     properties = {}
 

fiboa_cli/util.py

@@ -80,8 +80,20 @@ def is_valid_url(url):
     except:
         return False
 
-def valid_files_for_cli(ctx, param, value):
-    return [is_valid_file_uri(v) for v in value]
+def valid_files_folders_for_cli(value, extensions = []):
+    files = []
+    for v in value:
+        v = is_valid_file_uri(v)
+        if os.path.isdir(v):
+            for f in os.listdir(v):
+                if len(extensions) > 0 and not f.endswith(tuple(extensions)):
+                    continue
+                if f == "collection.json" or f == "catalog.json": # likely STAC
+                    continue
+                files.append(os.path.join(v, f))
+        else:
+            files.append(v)
+    return files
 
 def valid_file_for_cli(ctx, param, value):
     return is_valid_file_uri(value)

fiboa_cli/version.py

@@ -1 +1 @@
-__version__ = "0.0.6"
+__version__ = "0.0.7"