diff --git a/geoget/download.py b/geoget/download.py index 6dac5dd..14ea9d2 100644 --- a/geoget/download.py +++ b/geoget/download.py @@ -78,8 +78,10 @@ def download_raw_files(self, path_save:Path, replace=False): # Search filenames filenames = [] - for order_id in progress_bar(order_ids): - url = f'https://ladsweb.modaps.eosdis.nasa.gov/details/file/{self.collection}/{order_id}' + if order_ids: + ids_str = ','.join(order_ids) + url = (f'https://modwebsrv.modaps.eosdis.nasa.gov/axis2/services/MODAPSservices/' + f'getFileProperties?fileIds={ids_str}') # Ladsweb will sometimes return 504 timeouts, so we retry up to 10 times good_file = False for _ in range(10): @@ -91,7 +93,9 @@ def download_raw_files(self, path_save:Path, replace=False): except: warnings.warn(f'Unable to get {url} (most likely receieved 504 Gateway Time-out). Retrying.', UserWarning) sleep(10) - + + print(f'Found {filenames}.') + pattern = r'^\w+.A(20[0-9][0-9])([0-3][0-9][0-9])..*$' # Extract time from filenames @@ -320,4 +324,4 @@ def run_all(request_list, path_save): for request in request_list: request.run(path_save) sleep(5) - order_manager(path_save) \ No newline at end of file + order_manager(path_save)