diff --git a/src/covid19/blueprints/application/application_service_config.py b/src/covid19/blueprints/application/application_service_config.py index 2e1da803e4404324910d4b4856fee1cb4394bbfd..f073ef9010dda5913d5c7ee6e1bd578156849745 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 1a36e0a0082faf1cb62d7321b74c6fec1283b5cb..537694c257f6d5e1a389a179351b00e2f00a10bd 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: