eodash_catalog 0.0.3__tar.gz → 0.0.5__tar.gz

{eodash_catalog-0.0.3 → eodash_catalog-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: eodash_catalog
-Version: 0.0.3
+Version: 0.0.5
 Summary: This package is intended to help create a compatible STAC catalog for the eodash dashboard client. It supports configuration of multiple endpoint types for information extraction.
 Project-URL: Documentation, https://github.com/eodash/eodash_catalog#readme
 Project-URL: Issues, https://github.com/eodash/eodash_catalog/issues

{eodash_catalog-0.0.3 → eodash_catalog-0.0.5}/src/eodash_catalog/__about__.py

@@ -1,4 +1,4 @@
 # SPDX-FileCopyrightText: 2024-present Daniel Santillan <daniel.santillan@eox.at>
 #
 # SPDX-License-Identifier: MIT
-__version__ = "0.0.3"
+__version__ = "0.0.5"

{eodash_catalog-0.0.3 → eodash_catalog-0.0.5}/src/eodash_catalog/generate_indicators.py

@@ -93,12 +93,19 @@ def process_catalog_file(file_path, options):
                 process_indicator_file(config, file_path, catalog, options)
             else:
                 # if not try to see if indicator definition available
-                process_indicator_file(
-                    config,
-                    "%s/%s.yaml" % (options.indicatorspath, collection),
-                    catalog,
-                    options,
-                )
+                file_path = "%s/%s.yaml" % (options.indicatorspath, collection)
+                if os.path.isfile(file_path):
+                    process_indicator_file(
+                        config,
+                        "%s/%s.yaml" % (options.indicatorspath, collection),
+                        catalog,
+                        options,
+                    )
+                else:
+                    print(
+                        "Warning: neither collection nor indicator found for %s"
+                        % collection
+                    )
 
         strategy = TemplateLayoutStrategy(item_template="${collection}/${year}")
         catalog.normalize_hrefs(
@@ -249,7 +256,8 @@ def process_collection_file(config, file_path, catalog, options):
                         countries.append(sub_coll_def["Country"])
                     process_collection_file(
                         config,
-                        "../collections/%s.yaml" % (sub_coll_def["Collection"]),
+                        "%s/%s.yaml"
+                        % (options.collectionspath, sub_coll_def["Collection"]),
                         parent_collection,
                         options,
                     )
@@ -281,7 +289,8 @@ def process_collection_file(config, file_path, catalog, options):
                     )
                     process_collection_file(
                         config,
-                        "../collections/%s.yaml" % (sub_coll_def["Collection"]),
+                        "%s/%s.yaml"
+                        % (options.collectionspath, sub_coll_def["Collection"]),
                         tmp_catalog,
                         options,
                     )
@@ -1477,29 +1486,35 @@ class Options:
 
 
 @click.command()
+@click.option(
+    "--catalog",
+    "-ctl",
+    help="id of catalog configuration file to be used",
+    default=None,
+)
 @click.option(
     "--catalogspath",
     "-ctp",
     help="path to catalog configuration files",
-    default="./catalogs/",
+    default="catalogs",
 )
 @click.option(
     "--collectionspath",
     "-clp",
     help="path to collection configuration files",
-    default="./collections/",
+    default="collections",
 )
 @click.option(
     "--indicatorspath",
     "-inp",
-    help="path to indicaotr configuration files",
-    default="./indicators/",
+    help="path to indicator configuration files",
+    default="indicators",
 )
 @click.option(
     "--outputpath",
     "-o",
     help="path where the generated catalogs will be saved",
-    default="./build/",
+    default="build",
 )
 @click.option(
     "-vd",
@@ -1519,7 +1534,15 @@ class Options:
     nargs=-1,
 )
 def process_catalogs(
-    catalogspath, collectionspath, indicatorspath, outputpath, vd, ni, tn, collections
+    catalog,
+    catalogspath,
+    collectionspath,
+    indicatorspath,
+    outputpath,
+    vd,
+    ni,
+    tn,
+    collections,
 ):
     """STAC generator and harvester:
     This library goes over configured endpoints extracting as much information
@@ -1538,9 +1561,12 @@ def process_catalogs(
     for file_name in os.listdir(catalogspath):
         file_path = os.path.join(catalogspath, file_name)
         if os.path.isfile(file_path):
-            tasks.append(
-                RaisingThread(target=process_catalog_file, args=(file_path, options))
-            )
-            tasks[-1].start()
+            if catalog == None or os.path.splitext(file_name)[0] == catalog:
+                tasks.append(
+                    RaisingThread(
+                        target=process_catalog_file, args=(file_path, options)
+                    )
+                )
+                tasks[-1].start()
     for task in tasks:
         task.join()