Better exception management for corrupted/missing files

Author: remi-braun

eoreader/products/optical/dimap_v2_product.py

@@ -974,37 +974,29 @@ def open_mask(self, mask_str: str, **kwargs) -> gpd.GeoDataFrame:
             # Empty mask cannot be written on file
             mask = gpd.GeoDataFrame(geometry=[], crs=crs)
         else:
-            if self.is_archived:
-                # Open the zip file
-                try:
+            try:
+                if self.is_archived:
+                    # Open the zip file
                     mask = vectors.read(
                         self.path,
                         archive_regex=rf".*MASKS.*{mask_str}.*\.GML",
                         crs=crs,
                     )
-                except Exception:
-                    if mask_str in optional_masks:
-                        mask = gpd.GeoDataFrame(geometry=[], crs=crs)
-                    else:
-                        raise InvalidProductError(
-                            f"Mask {mask_str} not found for {self.path}"
-                        )
-            else:
-                try:
+                else:
                     mask_gml_path = files.get_file_in_dir(
                         self.path.joinpath("MASKS"),
                         f"*{mask_str}*.GML",
                         exact_name=True,
                     )
 
                     mask = vectors.read(mask_gml_path, crs=crs)
-                except FileNotFoundError:
-                    if mask_str in optional_masks:
-                        mask = gpd.GeoDataFrame(geometry=[], crs=crs)
-                    else:
-                        raise InvalidProductError(
-                            f"Mask {mask_str} not found for {self.path}"
-                        )
+            except FileNotFoundError:
+                if mask_str in optional_masks:
+                    mask = gpd.GeoDataFrame(geometry=[], crs=crs)
+                else:
+                    raise InvalidProductError(
+                        f"Mask {mask_str} not found for {self.path.joinpath('MASKS')}"
+                    )
 
             # Convert mask to correct CRS
             if not mask.empty and self.product_type in [

eoreader/products/optical/s2_product.py

@@ -679,7 +679,9 @@ def _read_band(
                                     out_ds.transform = tf
 
         except errors.RasterioIOError as ex:
-            if str(path).endswith("jp2") or str(path).endswith("tif"):
+            if (
+                str(path).endswith("jp2") or str(path).endswith("tif")
+            ) and path.exists():
                 raise InvalidProductError(f"Corrupted file: {path}") from ex
             else:
                 raise ex

eoreader/utils.py

@@ -180,7 +180,7 @@ def read(
                 **_prune_keywords(additional_keywords=["window"], **kwargs),
             )
     except errors.RasterioIOError as ex:
-        if str(path).endswith("jp2") or str(path).endswith("tif"):
+        if (str(path).endswith("jp2") or str(path).endswith("tif")) and path.exists():
             raise InvalidProductError(f"Corrupted file: {path}") from ex
         else:
             raise