From be0be8ab85479f3ac2018be25e67e2d16387f1b0 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Fri, 12 Feb 2021 18:12:39 +0100
Subject: [PATCH] * Fixed #123 split RkiBundeslaenderService into two Services,
one for bundeslaender and one for landkreise * Fixed #128 add fields from csv
to RkiLandkreiseImport * Fixed #139 refactor RkiBundeslaenderServiceDownload
to new method scheme introduced 07.02.2021 * Fixed #140 move WhoImport to RKI
in: rk_service_import.py * Fixed #125 implement RkiLandkreise * Fixed #126
implement RkiBundeslaenderImport
---
BACKLOG.md | 12 ++++-----
.../rki_bundeslaender/rki_service_download.py | 27 ++++++++-----------
2 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/BACKLOG.md b/BACKLOG.md
index 5f7148f2..4cce36b6 100644
--- a/BACKLOG.md
+++ b/BACKLOG.md
@@ -190,14 +190,14 @@
### 0.0.17 Release
-* Issue #146 add Tasks and URLs for starting Tasks to rki_views
-* Fixed #140 move WhoImport to RKI in: rk_service_import.py
-* Issue #139 refactor RkiBundeslaenderServiceDownload to new method scheme introduced 07.02.2021
* Fixed #123 split RkiBundeslaenderService into two Services, one for bundeslaender and one for landkreise
-* Issue #125 implement RkiLandkreise
-* Issue #126 implement RkiBundeslaenderImport
-* Issue #127 implement RkiBundeslaenderImport.get_dates_reported
* Fixed #128 add fields from csv to RkiLandkreiseImport
+* Fixed #139 refactor RkiBundeslaenderServiceDownload to new method scheme introduced 07.02.2021
+* Fixed #140 move WhoImport to RKI in: rk_service_import.py
+* Fixed #125 implement RkiLandkreise
+* Fixed #126 implement RkiBundeslaenderImport
+* Issue #146 add Tasks and URLs for starting Tasks to rki_views
+* Issue #127 implement RkiBundeslaenderImport.get_dates_reported
* Issue #132 refactor RkiBundeslaenderService to new method scheme introduced 07.02.2021
* Issue #133 implement RkiBundeslaenderService.task_database_drop_create
* Issue #134 implement RkiBundeslaenderService.run_update_dimension_tables_only
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
index 410c8bfd..4b1731c6 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
@@ -1,15 +1,11 @@
import os
import wget
-from datetime import date
from flask import flash
from database import app
from covid19.blueprints.rki_bundeslaender.rki_service_config import RkiBundeslaenderServiceConfig
-# RkiBundeslaenderServiceDownload
-# TODO: #123 split RkiService into two Services: RkiBundeslaenderService and RkiLandkreiseService
-# TODO: #139 refactor RkiBundeslaenderServiceDownload to new method scheme introduced 07.02.2021
class RkiBundeslaenderServiceDownload:
def __init__(self, database):
app.logger.debug("------------------------------------------------------------")
@@ -20,35 +16,34 @@ class RkiBundeslaenderServiceDownload:
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" RKI Service Download [ready]")
- # TODO: #123 split RkiBundeslaenderService into two Services, one for bundeslaender and one for landkreise
- def __download_file(self):
- app.logger.info(" download - RKI "+datascope+" [begin] ")
+ def download_file(self):
+ app.logger.info(" download - RKI [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+cvsfile_name+" <- "+url_src)
+ app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
- os.makedirs(data_path, exist_ok=True)
- if os.path.isfile(src_cvsfile_path):
- os.remove(src_cvsfile_path)
- data_file = wget.download(url_src, src_cvsfile_path)
+ os.makedirs(self.cfg.data_path, exist_ok=True)
+ if os.path.isfile(self.cfg.src_cvsfile_path):
+ os.remove(self.cfg.src_cvsfile_path)
+ data_file = wget.download(self.cfg.url_src, self.cfg.src_cvsfile_path)
app.logger.info(" " + data_file + " ")
except RuntimeError as error:
app.logger.error("############################################################")
app.logger.error(" " + error + " ")
app.logger.error("############################################################")
- flash(message="error while downloading: " + url_src, category='error')
+ flash(message="error while downloading: " + self.cfg.url_src, category='error')
except Exception as error:
app.logger.error("############################################################")
app.logger.error(error)
app.logger.error("############################################################")
- flash(message="error after downloading: " + url_src, category='error')
+ flash(message="error after downloading: " + self.cfg.url_src, category='error')
except AttributeError as aerror:
app.logger.error("############################################################")
app.logger.error(aerror)
app.logger.error("############################################################")
finally:
app.logger.info("------------------------------------------------------------")
- app.logger.info(" download - RKI "+datascope+" [done] ")
- msg = "downloaded: " + cvsfile_name + " "
+ app.logger.info(" download - RKI [done] ")
+ msg = "downloaded: " + self.cfg.cvsfile_name + " "
flash(msg)
return self
--
GitLab