From 441a52f2556242528dac4fa7b3111a92417e1324 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Tue, 19 Jan 2021 16:13:54 +0100
Subject: [PATCH] ### 0.0.9 Release * Fixed #18 /europe/update: Download *
Fixed #19 /europe/update: Import File to DB * Issue #20 /europe/update:
Update DB * Issue #21 update_date_reported * Issue #22 update_continent *
Issue #23 update_country * Issue #24 update_data * Issue #3 ORM: 3NF for
ecdc_europa_data_import * Issue #4 data update for 3NF
ecdc_europa_data_import
---
.../covid19/who/who_service_download.py | 43 ++++++-------------
1 file changed, 13 insertions(+), 30 deletions(-)
diff --git a/org/woehlke/covid19/who/who_service_download.py b/org/woehlke/covid19/who/who_service_download.py
index 78dd9417..5fbb2b3d 100644
--- a/org/woehlke/covid19/who/who_service_download.py
+++ b/org/woehlke/covid19/who/who_service_download.py
@@ -28,34 +28,19 @@ class WhoServiceDownload:
app.logger.info("------------------------------------------------------------")
os.makedirs('data', exist_ok=True)
try:
- try:
- app.logger.info("(x)")
- #os.remove(self.__src_who_cvsfile_name)
- #os.chdir("data")
- except Exception as error:
- app.logger.info("############################################################")
- app.logger.info(error)
- app.logger.info("############################################################")
- flash(message="error before downloading ", category='error')
- try:
- data_file = wget.download(self.__url_src_data, self.__src_who_cvsfile_name)
- app.logger.info(" " + data_file + " ")
- success = True
- except RuntimeError as error:
- app.logger.info("############################################################")
- app.logger.info(" " + error + " ")
- app.logger.info("############################################################")
- flash(message="error while downloading: " + self.__url_src_data, category='error')
- try:
- #os.renames(data_file, self.__who_cvsfile_name)
- for my_dirfile in os.listdir():
- app.logger.info(my_dirfile)
- os.chdir("..")
- except Exception as error:
- app.logger.info("############################################################")
- app.logger.info(error)
- app.logger.info("############################################################")
- flash(message="error after downloading: " + self.__who_cvsfile_name, category='error')
+ os.remove(self.__src_who_cvsfile_name)
+ data_file = wget.download(self.__url_src_data, self.__src_who_cvsfile_name)
+ app.logger.info(" " + data_file + " ")
+ except RuntimeError as error:
+ app.logger.info("############################################################")
+ app.logger.info(" " + error + " ")
+ app.logger.info("############################################################")
+ flash(message="error while downloading: " + self.__url_src_data, category='error')
+ except Exception as error:
+ app.logger.info("############################################################")
+ app.logger.info(error)
+ app.logger.info("############################################################")
+ flash(message="error after downloading: " + self.__who_cvsfile_name, category='error')
except AttributeError as aerror:
app.logger.info("############################################################")
app.logger.info(aerror)
@@ -67,5 +52,3 @@ class WhoServiceDownload:
flash(msg)
return self
- def download_file_ok(self):
- return self
--
GitLab