From d4ed5b48e3e3d6560861c5bb9e00ccf7122c5b67 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Thu, 29 Apr 2021 18:30:25 +0200
Subject: [PATCH] working on: 0.0.32 Release
---
.../blueprints/application/application_service_config.py | 5 +++--
.../blueprints/application/application_service_download.py | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/covid19/blueprints/application/application_service_config.py b/src/covid19/blueprints/application/application_service_config.py
index 2e1da803..f073ef90 100644
--- a/src/covid19/blueprints/application/application_service_config.py
+++ b/src/covid19/blueprints/application/application_service_config.py
@@ -17,7 +17,7 @@ class ApplicationServiceConfig:
cvsfile_name: str,
url_src: str):
self.limit_nr = 20
- self.data_path = ".." + os.sep + ".." + os.sep + "data"
+ self.data_path = ".." + os.sep + "data"
self.slug = slug,
self.category = category
self.cvsfile_subpath = cvsfile_subpath
@@ -25,7 +25,8 @@ class ApplicationServiceConfig:
self.tablename = tablename
self.cvsfile_name = cvsfile_name
self.url_src = url_src
- self.cvsfile_path = self.data_path + os.sep + self.cvsfile_subpath + os.sep + self.cvsfile_name
+ self.download_path = self.data_path + os.sep + self.cvsfile_name
+ self.cvsfile_path = ".." + os.sep + self.data_path + os.sep + self.cvsfile_subpath + os.sep + self.cvsfile_name
self.msg_job = "download FILE: "+self.cvsfile_name+" from "+self.url_src
self.msg_ok = "downloaded FILE: " + self.cvsfile_path + " from " + self.url_src
self.msg_error = "Error while downloading: " + self.cvsfile_path + " from " + self.url_src
diff --git a/src/covid19/blueprints/application/application_service_download.py b/src/covid19/blueprints/application/application_service_download.py
index 1a36e0a0..537694c2 100644
--- a/src/covid19/blueprints/application/application_service_download.py
+++ b/src/covid19/blueprints/application/application_service_download.py
@@ -47,7 +47,7 @@ class ApplicationServiceDownload:
os.chdir(self.cfg.data_path)
my_cmds = [
'wget ' + self.cfg.url_src,
- 'mv ' + self.cfg.cvsfile_name + ' ' + self.cfg.cvsfile_path,
+ 'mv ' + self.cfg.download_path + ' ' + self.cfg.cvsfile_path,
]
# subprocess.Popen(my_cmd, shell=True)
for my_cmd in my_cmds:
--
GitLab