diff --git a/covid19/oodm/europe/europe_service_download.py b/covid19/oodm/europe/europe_service_download.py index 39d880a01ab9f74a3e28d4acde2da913f11cac8b..d61443478630c93e8750fec9093abecafe14ccd0 100644 --- a/covid19/oodm/europe/europe_service_download.py +++ b/covid19/oodm/europe/europe_service_download.py @@ -22,9 +22,8 @@ class EuropeServiceDownload: app.logger.info("------------------------------------------------------------") app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src_data) app.logger.info("------------------------------------------------------------") - os.makedirs('data', exist_ok=True) - app.logger.info("------------------------------------------------------------") try: + os.makedirs(self.cfg.data_path, exist_ok=True) if os.path.isfile(src_cvsfile_name): os.remove(src_cvsfile_name) wget.download(self.cfg.url_src_data, src_cvsfile_name) diff --git a/covid19/oodm/rki/rki_service_download.py b/covid19/oodm/rki/rki_service_download.py index ed188bd764cca637413ee3202c69f41eb9188a50..239ac9f6b00ce903d823eb3edd8b735ec22cf025 100644 --- a/covid19/oodm/rki/rki_service_download.py +++ b/covid19/oodm/rki/rki_service_download.py @@ -28,11 +28,10 @@ class RkiServiceDownload: src_cvsfile_path = ".." + os.sep + "data" + os.sep + cvsfile_name app.logger.info(" download - RKI "+datascope+" [begin] ") app.logger.info("------------------------------------------------------------") - app.logger.info(" FILE: "+cvsfile_name+" ") - app.logger.info(" FROM: "+url_src+" ") + app.logger.info(" FILE: "+cvsfile_name+" <- "+url_src) app.logger.info("------------------------------------------------------------") - #os.makedirs('data', exist_ok=True) try: + os.makedirs(self.cfg.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) diff --git a/covid19/oodm/vaccination/vaccination_service_download.py b/covid19/oodm/vaccination/vaccination_service_download.py index 0ef205ae1b95dd0d9a5b5061d23dc622d681fbf5..fd43e8f0c4c7b3e91d22c34b75ee26880e9a7fc2 100644 --- a/covid19/oodm/vaccination/vaccination_service_download.py +++ b/covid19/oodm/vaccination/vaccination_service_download.py @@ -18,10 +18,10 @@ class VaccinationServiceDownload: def download_file(self): app.logger.info(" download - Vaccination [begin] ") app.logger.info("------------------------------------------------------------") - app.logger.info(" FILE: "+self.cfg.cvsfile_name+" ") - app.logger.info(" FROM: "+self.cfg.url_src_data+" ") + app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src_data) app.logger.info("------------------------------------------------------------") try: + os.makedirs(self.cfg.data_path, exist_ok=True) if os.path.isfile(self.cfg.cvsfile_path): os.remove(self.cfg.cvsfile_path) data_file = wget.download(self.cfg.url_src_data, self.cfg.cvsfile_path) diff --git a/covid19/oodm/who/who_service_download.py b/covid19/oodm/who/who_service_download.py index 1fab2a1a4b388821de0c932ba9f1980919650c11..6d2553f5e38b7a4b8997b7093d73e2c76ec6dc23 100644 --- a/covid19/oodm/who/who_service_download.py +++ b/covid19/oodm/who/who_service_download.py @@ -19,11 +19,10 @@ class WhoServiceDownload: src_cvsfile_name = self.cfg.data_path+os.sep+self.cfg.cvsfile_name app.logger.info(" download - [begin] ") app.logger.info("------------------------------------------------------------") - app.logger.info(" FILE: "+self.cfg.cvsfile_name+" ") - app.logger.info(" FROM: "+self.cfg.url_src_data+" ") + app.logger.info(" FILE: "+self.cfg.cvsfile_name+" <- "+self.cfg.url_src_data) app.logger.info("------------------------------------------------------------") - os.makedirs(self.cfg.data_path, exist_ok=True) try: + os.makedirs(self.cfg.data_path, exist_ok=True) if os.path.isfile(src_cvsfile_name): os.remove(src_cvsfile_name) data_file = wget.download(self.cfg.url_src_data, src_cvsfile_name) diff --git a/covid19/oodm/who/who_service_update.py b/covid19/oodm/who/who_service_update.py index 84181cbbc5d1ce621fa7c872d0f13d0f19d12d90..3ae26cc7f010bbbc2cb7e848c0fe0bdb0e5cb5f2 100644 --- a/covid19/oodm/who/who_service_update.py +++ b/covid19/oodm/who/who_service_update.py @@ -39,7 +39,7 @@ class WhoServiceUpdate: app.logger.info("------------------------------------------------------------") i = 0 for i_who_region, in WhoGlobalDataImportTable.get_regions(): - c = WhoRegion.find_by_region() + c = WhoRegion.find_by_region(i_who_region) if c is None: o = WhoRegion(region=i_who_region) db.session.add(o)