diff --git a/src/flask_covid19/blueprints/app_all/all_service_download.py b/src/flask_covid19/blueprints/app_all/all_service_download.py
index 899c705edccf056bd7f7c7c9dc5d509603b417cb..58f45646b1e947453dc489815aa3d63dd4790e31 100644
--- a/src/flask_covid19/blueprints/app_all/all_service_download.py
+++ b/src/flask_covid19/blueprints/app_all/all_service_download.py
@@ -18,7 +18,6 @@ class BlueprintDownloadService:
def __prepare_download(self):
os.makedirs(self.cfg.data_path, exist_ok=True)
if os.path.isfile(self.cfg.cvsfile_path):
- # TODO make backup of oldfile
os.remove(self.cfg.cvsfile_path)
return self
@@ -46,8 +45,8 @@ class BlueprintDownloadService:
os.chdir(orig_workdir)
return self
- def download_file(self):
- app.logger.info(" download_file - [begin] ")
+ def download(self):
+ app.logger.info(" download - [begin] ")
app.logger.info("------------------------------------------------------------")
app.logger.info(self.cfg.msg_job)
app.logger.info(os.getcwd())
@@ -72,5 +71,5 @@ class BlueprintDownloadService:
app.logger.error(exception)
finally:
app.logger.info("------------------------------------------------------------")
- app.logger.info(" download_file - [done] ")
+ app.logger.info(" download - [done] ")
return self
diff --git a/src/flask_covid19/blueprints/data_divi/divi_service.py b/src/flask_covid19/blueprints/data_divi/divi_service.py
index 0eae37486777bc0617719668662813f2e2fab1b5..bf79aa9997e69e3b281194666d567e1deba0ee3e 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_service.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_service.py
@@ -25,8 +25,7 @@ class DiviService:
def download(self):
flash("DiviService.download [start]")
- # TODO self.service_download.download()
- self.service_download.download_file()
+ self.service_download.download()
flash("DiviService.download [done]")
return self
diff --git a/src/flask_covid19/blueprints/data_divi/divi_views.py b/src/flask_covid19/blueprints/data_divi/divi_views.py
index 6171d9a38916952a0fc583f40089c724bcde5e95..a4b4335c7f8b138172932501e675401a1caf146b 100644
--- a/src/flask_covid19/blueprints/data_divi/divi_views.py
+++ b/src/flask_covid19/blueprints/data_divi/divi_views.py
@@ -561,7 +561,7 @@ def url_task_divi_update_fact_table():
def url_task_divi_full_update_star_schema():
app.logger.info("url_task_divi_full_update_star_schema [start]")
divi_service.download()
- flash("divi_service.service_download.download_file ok")
+ flash("divi_service.service_download.download ok")
task_divi_full_update_star_schema.apply_async()
flash("task_divi_full_update_star_schema started")
flash(message="long running background task started", category="warning")
diff --git a/src/flask_covid19/blueprints/data_ecdc/ecdc_service.py b/src/flask_covid19/blueprints/data_ecdc/ecdc_service.py
index dab6625a9122903b1139cfc15895a53bcb9ae2b7..a0b0ae9587e1d4b9e78dc102f1b732eba13c93ac 100644
--- a/src/flask_covid19/blueprints/data_ecdc/ecdc_service.py
+++ b/src/flask_covid19/blueprints/data_ecdc/ecdc_service.py
@@ -25,7 +25,7 @@ class EcdcService:
def download(self):
flash("EcdcService.download [start]")
# TODO self.service_download.download()
- self.service_download.download_file()
+ self.service_download.download()
flash("EcdcService.download [start]")
return self
diff --git a/src/flask_covid19/blueprints/data_owid/owid_service.py b/src/flask_covid19/blueprints/data_owid/owid_service.py
index 33dcb49bf011917c4cfdc10ad87fd0e33c08d0ca..f80b353947adc2800668ce09bc6bd921468bfd3d 100644
--- a/src/flask_covid19/blueprints/data_owid/owid_service.py
+++ b/src/flask_covid19/blueprints/data_owid/owid_service.py
@@ -25,7 +25,7 @@ class OwidService:
def download(self):
flash("OwidService.download [start]")
# TODO self.service_download.download()
- self.service_download.download_file()
+ self.service_download.download()
flash("OwidService.download [done]")
return self
diff --git a/src/flask_covid19/blueprints/data_rki/rki_service.py b/src/flask_covid19/blueprints/data_rki/rki_service.py
index 6e16cee6db3e2c0246252fec0235dbd6edaafd43..82dc89bdc930c5a67da304b90d317f77bc17705b 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service.py
@@ -23,7 +23,7 @@ class RkiService:
def download(self):
flash("RkiService.download [start]")
- self.service_download.download_file()
+ self.service_download.download()
flash("RkiService.download [done]")
return self
diff --git a/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py b/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py
index 9d9d30fc9399158ef321bf2f36f8de5b62dae859..6d7332c58c3bdc54d317b20af67275e238d36019 100644
--- a/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py
+++ b/src/flask_covid19/blueprints/data_vaccination/vaccination_service.py
@@ -24,7 +24,7 @@ class VaccinationService:
def download(self):
flash("VaccinationService.download [start]")
- self.service_download.download_file()
+ self.service_download.download()
flash("VaccinationService.download [done]")
return self
diff --git a/src/flask_covid19/blueprints/data_who/who_service.py b/src/flask_covid19/blueprints/data_who/who_service.py
index c4c23ae6168db74e8e4587fbd005ddfacaaeed6b..c81f46a04a8877931f64f8126b087fd068ab1f9b 100644
--- a/src/flask_covid19/blueprints/data_who/who_service.py
+++ b/src/flask_covid19/blueprints/data_who/who_service.py
@@ -24,7 +24,7 @@ class WhoService:
def database_drop_create_pretask(self):
flash("WhoService.database_drop_create_pretask [start]")
app.logger.info("WhoService.pretask_database_drop_create [start]")
- self.service_download.download_file()
+ self.service_download.download()
app.logger.info("WhoService.pretask_database_drop_create [done]")
flash("WhoService.database_drop_create_pretask [done]")
return self
@@ -39,7 +39,7 @@ class WhoService:
def download(self):
flash("WhoService.download [start]")
- self.service_download.download_file()
+ self.service_download.download()
flash("WhoService.download [done]")
return self