Support unpacked "outer" directories

That is, unpacked download archived from the EnMAP portal,
containing one or more Zip sub-archives.

Author: pont-us

xarray_enmap/xarray_enmap.py

@@ -49,9 +49,9 @@ def open_dataset(
         if path.is_file():
             ds = read_dataset_from_archive(filename_or_obj, self.temp_dir)
         elif path.is_dir():
-            ds = read_dataset_from_directory(path)
+            ds = read_dataset_from_unknown_directory(path, self.temp_dir)
         elif filename_or_obj.startswith("s3://"):
-            ds = read_dataset_from_directory(filename_or_obj)
+            ds = read_dataset_from_inner_directory(filename_or_obj)
         else:
             raise ValueError(
                 f"{filename_or_obj} is neither a path nor a directory."
@@ -65,15 +65,31 @@ def close(self):
 
 
 def read_dataset_from_archive(
-    input_filename: str, temp_dir: str
+    input_filename: str | os.PathLike[Any], temp_dir: str
 ) -> xr.Dataset:
     data_dirs = list(extract_archives(input_filename, temp_dir))
     if len(data_dirs) > 1:
         LOGGER.warning("Multiple data archives found; reading the first.")
-    return read_dataset_from_directory(data_dirs[0])
+    return read_dataset_from_inner_directory(data_dirs[0])
 
 
-def read_dataset_from_directory(data_dir: str | os.PathLike[Any]):
+def read_dataset_from_unknown_directory(
+    data_dir: str | os.PathLike[Any], temp_dir: str
+):
+    data_path = pathlib.Path(data_dir)
+    metadata_files = list(data_path.glob("*METADATA.XML"))
+    match len(metadata_files):
+        case 0:
+            # assume outer directory
+            return read_dataset_from_archive(data_path, temp_dir)
+        case 1:
+            # assume inner directory
+            return read_dataset_from_inner_directory(data_path)
+        case _:
+            raise RuntimeError("Too many METADATA.XML files")
+
+
+def read_dataset_from_inner_directory(data_dir: str | os.PathLike[Any]):
     data_path = pathlib.Path(data_dir)
     LOGGER.info(f"Processing {data_path}")
     arrays = {
@@ -203,13 +219,16 @@ def extract_archives(
     final_path = dest_path / "data"
     os.mkdir(final_path)
     archive_path = pathlib.Path(archive_path)
-    if archive_path.name.endswith(".tar.gz"):
-        # An EnMAP tgz usually contains one or more zip archives containing
-        # the actual data files.
-        outer_path = dest_path / "outer-archive"
-        LOGGER.info(f"Extracting {archive_path.name}")
-        with tarfile.open(archive_path) as tgz_file:
-            tgz_file.extractall(path=outer_path, filter="data")
+    if archive_path.name.endswith(".tar.gz") or archive_path.is_dir():
+        if archive_path.is_dir():
+            outer_path = archive_path
+        else:
+            # An EnMAP tgz usually contains one or more zip archives containing
+            # the actual data files.
+            outer_path = dest_path / "outer-archive"
+            LOGGER.info(f"Extracting {archive_path.name}")
+            with tarfile.open(archive_path) as tgz_file:
+                tgz_file.extractall(path=outer_path, filter="data")
         data_paths = []
         for index, path_to_zip_file in enumerate(find_zips(outer_path)):
             data_paths.append(
@@ -219,7 +238,7 @@ def extract_archives(
     else:
         # Assume it's a zip and skip the outer archive extraction step.
         LOGGER.info(f"Assuming {archive_path} is an inner zipfile")
-        return [(extract_zip(final_path, 0, inner_path, archive_path))]
+        return [extract_zip(final_path, 0, inner_path, archive_path)]
 
 
 def find_zips(root: os.PathLike):