From a4162cdc7bc838b9807232ce2aed47e4c6e5f72f Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Wed, 17 Feb 2021 21:58:03 +0100
Subject: [PATCH] ### 0.0.18 Release
---
src/covid19/blueprints/ecdc/ecdc_service_config.py | 5 +++++
src/covid19/blueprints/ecdc/ecdc_service_download.py | 2 +-
src/covid19/blueprints/ecdc/ecdc_service_import.py | 5 ++---
.../blueprints/rki_bundeslaender/rki_service_config.py | 4 ++++
.../blueprints/rki_bundeslaender/rki_service_download.py | 5 ++++-
.../blueprints/rki_bundeslaender/rki_service_import.py | 3 +--
src/covid19/blueprints/rki_landkreise/rki_service_config.py | 5 +++++
.../blueprints/rki_landkreise/rki_service_download.py | 2 +-
src/covid19/blueprints/rki_landkreise/rki_service_import.py | 3 +--
.../rki_vaccination/rki_vaccination_service_config.py | 5 +++++
.../rki_vaccination/rki_vaccination_service_download.py | 2 +-
.../rki_vaccination/rki_vaccination_service_import.py | 3 +--
src/covid19/blueprints/who/who_service_config.py | 5 +++++
src/covid19/blueprints/who/who_service_download.py | 2 +-
src/covid19/blueprints/who/who_service_import.py | 4 ++--
15 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_config.py b/src/covid19/blueprints/ecdc/ecdc_service_config.py
index cff65b0f..8727f9ef 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_config.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_config.py
@@ -1,10 +1,15 @@
import os
+from covid19.blueprints.ecdc.ecdc_model_import import EcdcImport
+
class EcdcServiceConfig:
def __init__(self):
self.limit_nr = 20
+ self.category = 'ECDC'
+ self.sub_category = 'European Centre for Disease Prevention and Control'
self.data_path = ".."+os.sep+".."+os.sep+"data"
+ self.tablename = EcdcImport.__tablename__
self.cvsfile_name = "ecdc_europa_data.csv"
self.url_src = "https://opendata.ecdc.europa.eu/covid19/casedistribution/csv/"
self.cvsfile_path = self.data_path + os.sep + self.cvsfile_name
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_download.py b/src/covid19/blueprints/ecdc/ecdc_service_download.py
index 289dc595..29e74d36 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_download.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_download.py
@@ -19,7 +19,7 @@ class EcdcServiceDownload:
app.logger.info("------------------------------------------------------------")
app.logger.info(" download ECDC [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
diff --git a/src/covid19/blueprints/ecdc/ecdc_service_import.py b/src/covid19/blueprints/ecdc/ecdc_service_import.py
index 16f7a307..a9ed2ea1 100644
--- a/src/covid19/blueprints/ecdc/ecdc_service_import.py
+++ b/src/covid19/blueprints/ecdc/ecdc_service_import.py
@@ -1,4 +1,3 @@
-import os
import csv
import psycopg2
@@ -20,12 +19,12 @@ class EcdcServiceImport:
def import_file(self):
app.logger.info(" import ECDC [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" TABLE: ecdc_data_import <-- " + self.cfg.cvsfile_name)
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
k = 0
try:
EcdcImport.remove_all()
- with open(self.cfg.cvsfile_name, newline='') as csv_file:
+ with open(self.cfg.cvsfile_path, newline='') as csv_file:
file_reader = csv.DictReader(csv_file, delimiter=',', quotechar='"')
for row in file_reader:
o = EcdcImport(
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py
index 1e407048..83035db8 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_config.py
@@ -1,11 +1,15 @@
from datetime import date
import os
+from covid19.blueprints.rki_bundeslaender.rki_model_import import RkiBundeslaenderImport
class RkiBundeslaenderServiceConfig:
def __init__(self):
self.limit_nr = 20
self.data_path = ".."+os.sep+".."+os.sep+"data"
+ self.category = 'RKI'
+ self.sub_category = 'Bundeslaender'
+ self.tablename = RkiBundeslaenderImport.__tablename__
self.url_src = "https://opendata.arcgis.com/datasets/ef4b445a53c1406892257fe63129a8ea_0.csv"
self.cvsfile_name = "RKI_COVID19__" + date.today().isoformat() + "__bundeslaender.csv"
self.cvsfile_path = self.data_path + os.sep + self.cvsfile_name
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
index bc4cc08d..d6258678 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_download.py
@@ -19,7 +19,7 @@ class RkiBundeslaenderServiceDownload:
def download_file(self):
app.logger.info(" download - RKI [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
@@ -43,6 +43,9 @@ class RkiBundeslaenderServiceDownload:
app.logger.error("############################################################")
flash(message="error while downloading: " + self.cfg.cvsfile_path, category='error')
finally:
+ app.logger.info("")
+ app.logger.info("------------------------------------------------------------")
+ app.logger.info(" downloaded FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
app.logger.info(" download - RKI [done] ")
msg = "downloaded: " + self.cfg.cvsfile_path+" from "+self.cfg.url_src
diff --git a/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py b/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
index 26dafb50..c8c5d793 100644
--- a/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
+++ b/src/covid19/blueprints/rki_bundeslaender/rki_service_import.py
@@ -21,8 +21,7 @@ class RkiBundeslaenderServiceImport:
def import_file(self):
app.logger.info(" import RKI [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: " + self.cfg.cvsfile_name)
- app.logger.info(" TABLE: " + RkiBundeslaenderImport.__tablename__)
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
row = None
try:
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_config.py b/src/covid19/blueprints/rki_landkreise/rki_service_config.py
index 1ad53a74..abed9c74 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_config.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_config.py
@@ -1,11 +1,16 @@
from datetime import date
import os
+from covid19.blueprints.rki_landkreise.rki_model_import import RkiLandkreiseImport
+
class RkiLandkreiseServiceConfig:
def __init__(self):
self.limit_nr = 20
self.data_path = ".."+os.sep+".."+os.sep+"data"
+ self.category = 'RKI'
+ self.sub_category = 'Landkreise'
+ self.tablename = RkiLandkreiseImport.__tablename__
self.url_src = "https://opendata.arcgis.com/datasets/917fc37a709542548cc3be077a786c17_0.csv"
self.cvsfile_name = "RKI_COVID19__" + date.today().isoformat() + "__landkreise.csv"
self.cvsfile_path = self.data_path + os.sep + self.cvsfile_name
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_download.py b/src/covid19/blueprints/rki_landkreise/rki_service_download.py
index 7ed74cdd..964f617e 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_download.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_download.py
@@ -19,7 +19,7 @@ class RkiLandkreiseServiceDownload:
def download_file(self):
app.logger.info(" RKI Landkreise Service Download - download_file begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_path+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
diff --git a/src/covid19/blueprints/rki_landkreise/rki_service_import.py b/src/covid19/blueprints/rki_landkreise/rki_service_import.py
index 639dd176..70025cfc 100644
--- a/src/covid19/blueprints/rki_landkreise/rki_service_import.py
+++ b/src/covid19/blueprints/rki_landkreise/rki_service_import.py
@@ -21,8 +21,7 @@ class RkiLandkreiseServiceImport:
def import_file(self):
app.logger.info(" RKI Landkreise Service Import - import_file [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name)
- app.logger.info(" TABLE: who_global_data_import")
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
row = None
if sys.platform == 'linux':
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
index cce5bbab..9de53f68 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_config.py
@@ -1,9 +1,14 @@
import os
+from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
+
class RkiVaccinationServiceConfig:
def __init__(self):
self.limit_nr = 20
+ self.category = 'RKI'
+ self.sub_category = 'Vaccination'
+ self.tablename = RkiVaccinationImport.__tablename__
self.url_src = "https://impfdashboard.de/static/data/germany_vaccinations_timeseries_v2.tsv"
self.cvsfile_name = "germany_vaccinations_timeseries_v2.tsv"
self.data_path = ".."+os.sep+".."+os.sep+"data"
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
index c580c9f8..7b037368 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_download.py
@@ -18,7 +18,7 @@ class RkiVaccinationServiceDownload:
def download_file(self):
app.logger.info(" download - Vaccination [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
index daf77af2..6bf3c175 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -27,8 +27,7 @@ class RkiVaccinationServiceImport:
src_cvsfile_name = self.cfg.data_path+os.sep+self.cfg.cvsfile_name
app.logger.info(" import Vaccination [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" ")
- app.logger.info(" TABLE: who_global_data_import")
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
try:
RkiVaccinationImport.remove_all()
diff --git a/src/covid19/blueprints/who/who_service_config.py b/src/covid19/blueprints/who/who_service_config.py
index d29be34e..dc413241 100644
--- a/src/covid19/blueprints/who/who_service_config.py
+++ b/src/covid19/blueprints/who/who_service_config.py
@@ -1,9 +1,14 @@
import os
+from covid19.blueprints.who.who_model_import import WhoImport
+
class WhoServiceConfig:
def __init__(self):
self.limit_nr = 20
+ self.category = 'WHO'
+ self.sub_category = 'Cases and Deaths'
+ self.tablename = WhoImport.__tablename__
self.url_src = "https://covid19.who.int/" + self.cvsfile_name
self.cvsfile_name = "WHO-COVID-19-global-data.csv"
self.data_path = ".."+os.sep+".."+os.sep+"data"
diff --git a/src/covid19/blueprints/who/who_service_download.py b/src/covid19/blueprints/who/who_service_download.py
index cc9a87eb..8696bfa2 100644
--- a/src/covid19/blueprints/who/who_service_download.py
+++ b/src/covid19/blueprints/who/who_service_download.py
@@ -18,7 +18,7 @@ class WhoServiceDownload:
def download_file(self):
app.logger.info(" download - [begin] ")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src)
+ app.logger.info(" download FILE: "+self.cfg.cvsfile_name+" from "+self.cfg.url_src)
app.logger.info("------------------------------------------------------------")
try:
os.makedirs(self.cfg.data_path, exist_ok=True)
diff --git a/src/covid19/blueprints/who/who_service_import.py b/src/covid19/blueprints/who/who_service_import.py
index fda94e9f..1c48bdec 100644
--- a/src/covid19/blueprints/who/who_service_import.py
+++ b/src/covid19/blueprints/who/who_service_import.py
@@ -19,8 +19,7 @@ class WhoServiceImport:
def import_file(self):
app.logger.info(" import WHO [begin]")
app.logger.info("------------------------------------------------------------")
- app.logger.info(" FILE: "+self.cfg.cvsfile_path)
- app.logger.info(" TABLE: "+WhoImport.__tablename__)
+ app.logger.info(" import into TABLE: "+self.cfg.tablename+" from "+self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
row = None
if sys.platform == 'linux':
@@ -62,6 +61,7 @@ class WhoServiceImport:
app.logger.warning("WARN: import WHO [end]")
finally:
app.logger.info("")
+ app.logger.info(" imported into TABLE: " + self.cfg.tablename + " from " + self.cfg.cvsfile_path)
app.logger.info("------------------------------------------------------------")
app.logger.info(" import WHO [done]")
return self
--
GitLab