From 42defd023c1f37b3d373f178e7e3e0cca3f863a0 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 20 Feb 2021 13:05:11 +0100
Subject: [PATCH] ### 0.0.18 Release
---
.../blueprints/application/application_service_config.py | 4 ++--
.../blueprints/application/application_service_download.py | 6 +++---
.../rki_vaccination/rki_vaccination_service_import.py | 4 ++--
.../rki_vaccination/rki_vaccination_service_update.py | 4 ++--
src/covid19/blueprints/who/who_service_import.py | 4 ++--
src/covid19/blueprints/who/who_service_update.py | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/covid19/blueprints/application/application_service_config.py b/src/covid19/blueprints/application/application_service_config.py
index ae3fd5f3..d4d920ce 100644
--- a/src/covid19/blueprints/application/application_service_config.py
+++ b/src/covid19/blueprints/application/application_service_config.py
@@ -9,7 +9,7 @@ from covid19.blueprints.rki_landkreise.rki_landkreise_model_import import RkiLan
class ApplicationServiceConfig:
- def __init__(self, slug, category, sub_category, tablename, cvsfile_name, url_src):
+ def __init__(self, slug: str, category: str, sub_category: str, tablename: str, cvsfile_name: str, url_src: str):
self.limit_nr = 20
self.data_path = ".." + os.sep + ".." + os.sep + "data"
self.slug = slug,
@@ -28,7 +28,7 @@ class ApplicationServiceConfig:
return ApplicationServiceConfig(
slug='who',
category='WHO',
- sub_castegory='Cases and Deaths',
+ sub_category='Cases and Deaths',
tablename=WhoImport.__tablename__,
cvsfile_name="WHO-COVID-19-global-data.csv",
url_src="https://covid19.who.int/WHO-COVID-19-global-data.csv",
diff --git a/src/covid19/blueprints/application/application_service_download.py b/src/covid19/blueprints/application/application_service_download.py
index 862c7914..f182ebe8 100644
--- a/src/covid19/blueprints/application/application_service_download.py
+++ b/src/covid19/blueprints/application/application_service_download.py
@@ -9,12 +9,12 @@ from covid19.blueprints.application.application_service_config import Applicatio
class ApplicationServiceDownload:
def __init__(self, database, config: ApplicationServiceConfig):
app.logger.debug("------------------------------------------------------------")
- app.logger.debug(" "+self.cfg.slug+" Download Service [init]")
+ app.logger.debug(" ApplicationServiceDownload [init]")
app.logger.debug("------------------------------------------------------------")
self.__database = database
self.cfg = config
app.logger.debug("------------------------------------------------------------")
- app.logger.debug(" "+self.cfg.slug+" Download Service [ready]")
+ app.logger.debug(" ApplicationServiceDownload [ready]")
def __log_error(self, error_msg: str):
flash_msg = self.cfg.msg_error + error_msg
@@ -24,7 +24,7 @@ class ApplicationServiceDownload:
app.logger.error(self.cfg.slug+"############################################################")
return self
- def __log_success(self, data_file):
+ def __log_success(self, data_file: str):
app.logger.info(self.cfg.slug+" download success: " + data_file + " ")
app.logger.info(self.cfg.slug+self.cfg.msg_ok)
flash(self.cfg.msg_ok)
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 615cdaee..5b213f2c 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_import.py
@@ -4,11 +4,11 @@ import psycopg2
from database import db, app
from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
-from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
+from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
class RkiVaccinationServiceImport:
- def __init__(self, database, config: RkiVaccinationServiceConfig):
+ def __init__(self, database, config: ApplicationServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Vaccination Service Import [init]")
app.logger.debug("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
index 67319e1b..1280a505 100644
--- a/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
+++ b/src/covid19/blueprints/rki_vaccination/rki_vaccination_service_update.py
@@ -1,12 +1,12 @@
from database import db, app
-from covid19.blueprints.rki_vaccination.rki_vaccination_service_config import RkiVaccinationServiceConfig
+from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
from covid19.blueprints.rki_vaccination.rki_vaccination_model_import import RkiVaccinationImport
from covid19.blueprints.rki_vaccination.rki_vaccination_model import RkiVaccinationDateReported, RkiVaccinationData
class RkiVaccinationServiceUpdate:
- def __init__(self, database, config: RkiVaccinationServiceConfig):
+ def __init__(self, database, config: ApplicationServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" Europe Service Update [init]")
app.logger.debug("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/who/who_service_import.py b/src/covid19/blueprints/who/who_service_import.py
index b6e965ae..124e4e5d 100644
--- a/src/covid19/blueprints/who/who_service_import.py
+++ b/src/covid19/blueprints/who/who_service_import.py
@@ -3,11 +3,11 @@ import csv
import psycopg2
from database import db, app
from covid19.blueprints.who.who_model_import import WhoImport
-from covid19.blueprints.who.who_service_download import WhoServiceConfig
+from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
class WhoServiceImport:
- def __init__(self, database, config: WhoServiceConfig):
+ def __init__(self, database, config: ApplicationServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WHO Service Import [init]")
app.logger.debug("------------------------------------------------------------")
diff --git a/src/covid19/blueprints/who/who_service_update.py b/src/covid19/blueprints/who/who_service_update.py
index 6e5d80e4..4f41f732 100644
--- a/src/covid19/blueprints/who/who_service_update.py
+++ b/src/covid19/blueprints/who/who_service_update.py
@@ -1,11 +1,11 @@
from database import db, app
from covid19.blueprints.who.who_model import WhoRegion, WhoDateReported, WhoCountry, WhoData
from covid19.blueprints.who.who_model_import import WhoImport
-from covid19.blueprints.who.who_service_download import WhoServiceConfig
+from covid19.blueprints.application.application_service_config import ApplicationServiceConfig
class WhoServiceUpdate:
- def __init__(self, database, config: WhoServiceConfig):
+ def __init__(self, database, config: ApplicationServiceConfig):
app.logger.debug("------------------------------------------------------------")
app.logger.debug(" WhoServiceUpdate [init]")
app.logger.debug("------------------------------------------------------------")
--
GitLab