From b6ebc965be0d71cc3c370a2a28b5f69c61747942 Mon Sep 17 00:00:00 2001
From: pmouquet <pascal.mouquet@ird.fr>
Date: Mon, 12 Feb 2024 17:34:55 +0400
Subject: [PATCH] bugfix zipfile path
---
sen2chain/download_eodag.py | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/sen2chain/download_eodag.py b/sen2chain/download_eodag.py
index 2070734..74299dc 100644
--- a/sen2chain/download_eodag.py
+++ b/sen2chain/download_eodag.py
@@ -18,6 +18,7 @@ from queue import Queue
from eodag.utils.logging import get_logging_verbose
from threading import Thread
import multiprocessing
+from simplejson import JSONDecodeError
from .config import SHARED_DATA, Config
from .utils import get_tile, set_permissions
@@ -69,7 +70,6 @@ class S2cEodag:
end = end,
tileIdentifier = self.name,
)
-
logger.info("{} - Searching online products, ref: {}".format(self.name, ref))
logging.disable(level=logging.WARNING)
try:
@@ -77,8 +77,7 @@ class S2cEodag:
**default_search_criteria
)
logging.disable(logging.NOTSET)
-
- except simplejson.errors.JSONDecodeError:
+ except JSONDecodeError:
logging.disable(logging.NOTSET)
logger.info("Issue with this tile search for now, pass")
pass
@@ -88,8 +87,8 @@ class S2cEodag:
# else:
# ref_string = "specific cloudmask(s) and / or indice(s) product(s)"
- fitered = self.products[:]
- for p in fitered:
+ filtered = self.products[:]
+ for p in filtered:
if (outputs_prefix / (p.properties["title"] + ".SAFE")).exists():
l1c_presence = "PRESENT"
else:
@@ -304,7 +303,7 @@ class S2cEodag:
setup_logging(verbose = 2)
if remove_existing_zipfile:
- zip_file = L1cProduct(product_id.properties["id"]).zipfile
+ zip_file = L1cProduct(product_id.properties["id"]).zip_path
if zip_file:
logger.info("Found existing zipfile {}".format(zip_file.name))
try:
@@ -314,19 +313,19 @@ class S2cEodag:
pass
if product_id.properties["storageStatus"] == "ONLINE":
# logging.disable(level=logging.WARNING)
- try:
- downloaded_path = self.dag.download(
- product_id,
- outputs_prefix = outputs_prefix,
- extract = extract,
- delete_archive = delete_archive,
- wait=1,
- timeout=0,
- )
- except:
- logger.info("Issue with dowloading{}, removing corrupted zipfile".format(product_id.properties["id"]))
- downloaded_path = None
- pass
+ # try:
+ downloaded_path = self.dag.download(
+ product_id,
+ outputs_prefix = outputs_prefix,
+ extract = extract,
+ delete_archive = delete_archive,
+ wait=1,
+ timeout=0,
+ )
+ # except:
+ # logger.info("Issue with dowloading {}, removing corrupted zipfile".format(product_id.properties["id"]))
+ # downloaded_path = None
+ # pass
if downloaded_path:
logger.info("dl_path {}".format(downloaded_path))
# logging.disable(logging.NOTSET)
--
GitLab