Fix download

panodata · Jun 16, 2020 · 7a30358 · 7a30358
1 parent 408a039
commit 7a30358
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/python_dwd/constants/access_credentials.py b/python_dwd/constants/access_credentials.py
@@ -4,6 +4,7 @@
 DWD_USER = 'anonymous'
 DWD_PASSWORD = ''
 FTP_EXPRESSION = 'ftp://'
+HTTPS_EXPRESSION = 'https://'
 
 DWD_FOLDER_MAIN = './dwd_data'
 DWD_FOLDER_METADATA = 'metadata'

diff --git a/python_dwd/download/download.py b/python_dwd/download/download.py
@@ -52,10 +52,10 @@ def _download_dwd_data(remote_file: Union[str, Path]) -> BytesIO:
     try:
         with urllib.request.urlopen(file_server) as url_request:
             zip_file = BytesIO(url_request.read())
-    except urllib.error.URLError:
-        raise urllib.error.URLError(f"Error: the stationdata {file_server} couldn't be reached.")
-    except urllib.error.HTTPError:
-        pass
+    except urllib.error.URLError as e:
+        raise e(f"Error: the stationdata {file_server} couldn't be reached.")
+    except:
+        print(file_server)
 
     try:
         with zipfile.ZipFile(zip_file) as zip_file_opened:

diff --git a/python_dwd/download/download_services.py b/python_dwd/download/download_services.py
@@ -2,7 +2,7 @@
 from pathlib import Path, PurePosixPath
 from typing import Union
 
-from python_dwd.constants.access_credentials import DWD_FOLDER_STATIONDATA, DWD_SERVER, DWD_PATH, FTP_EXPRESSION
+from python_dwd.constants.access_credentials import DWD_FOLDER_STATIONDATA, DWD_SERVER, DWD_PATH, HTTPS_EXPRESSION
 
 
 def create_local_file_name(remote_file_path: Union[Path, str],
@@ -32,4 +32,4 @@ def create_remote_file_name(file: str) -> str:
                                 DWD_PATH,
                                 file)
 
-    return f"{FTP_EXPRESSION}{file_server}"
+    return f"{HTTPS_EXPRESSION}{file_server}"