Commit 7d500ea0 authored by JOSSOUD Olivier's avatar JOSSOUD Olivier
Browse files

FTP. Functions have no more reason to be private.

parent e45fa970
...@@ -40,7 +40,7 @@ def ftp_connect(ftp_config: dict, log: logger.Logger, object_id: str) -> ftplib. ...@@ -40,7 +40,7 @@ def ftp_connect(ftp_config: dict, log: logger.Logger, object_id: str) -> ftplib.
return session return session
def _ftp_list_files_(ftp_session: ftplib.FTP, distant_directory_path: str, log: logger.Logger, object_id: str) -> list: def ftp_list_files(ftp_session: ftplib.FTP, distant_directory_path: str, log: logger.Logger, object_id: str) -> list:
"""List the files in the distant FTP directory. """List the files in the distant FTP directory.
Parameters Parameters
...@@ -72,7 +72,7 @@ def _ftp_list_files_(ftp_session: ftplib.FTP, distant_directory_path: str, log: ...@@ -72,7 +72,7 @@ def _ftp_list_files_(ftp_session: ftplib.FTP, distant_directory_path: str, log:
return filepaths return filepaths
def _ftp_download_file(source_filepath: str, dest_filepath: str, def ftp_download_file(source_filepath: str, dest_filepath: str,
log: logger.Logger, object_id: str, log: logger.Logger, object_id: str,
ftp_config: dict = None, ftp_session: ftplib.FTP = None, ftp_config: dict = None, ftp_session: ftplib.FTP = None,
delete_if_success: bool = False) -> bool: delete_if_success: bool = False) -> bool:
......
...@@ -28,7 +28,7 @@ class Collector(utils.LogConfig): ...@@ -28,7 +28,7 @@ class Collector(utils.LogConfig):
dest_filepath = self.__get_dest_filepath__(yyyymm) dest_filepath = self.__get_dest_filepath__(yyyymm)
# Download # Download
success = ftp._ftp_download_file(source_filepath, dest_filepath, self.logger, self.object_id, success = ftp.ftp_download_file(source_filepath, dest_filepath, self.logger, self.object_id,
ftp_config=self.config[self.object_id]) ftp_config=self.config[self.object_id])
# Compress # Compress
......
...@@ -40,14 +40,14 @@ class Collector(utils.LogConfig): ...@@ -40,14 +40,14 @@ class Collector(utils.LogConfig):
source_filepath = source_dir + source_filename source_filepath = source_dir + source_filename
# Check that to-be-downloaded file exists # Check that to-be-downloaded file exists
source_filepaths = ftp._ftp_list_files_(ftp_session, source_dir, self.logger, self.object_id) source_filepaths = ftp.ftp_list_files(ftp_session, source_dir, self.logger, self.object_id)
if source_filepath not in source_filepaths: if source_filepath not in source_filepaths:
self.logger.write(self.object_id, "File not found: " + source_filepath) self.logger.write(self.object_id, "File not found: " + source_filepath)
raise FileNotFoundError(source_filepath) raise FileNotFoundError(source_filepath)
# Download file # Download file
dest_filepath = self.__get_picarro_dest_filepath__(source_filepath) dest_filepath = self.__get_picarro_dest_filepath__(source_filepath)
success = ftp._ftp_download_file(source_filepath, dest_filepath, self.logger, self.object_id, success = ftp.ftp_download_file(source_filepath, dest_filepath, self.logger, self.object_id,
ftp_session=ftp_session) ftp_session=ftp_session)
ftp_session.quit() ftp_session.quit()
...@@ -96,10 +96,10 @@ class Collector(utils.LogConfig): ...@@ -96,10 +96,10 @@ class Collector(utils.LogConfig):
ftp_session = ftp.ftp_connect(self.config[self.object_id], self.logger, self.object_id) ftp_session = ftp.ftp_connect(self.config[self.object_id], self.logger, self.object_id)
hobo_distant_path = self.distant_base_dir + "/" + site_id + "/hobo/" hobo_distant_path = self.distant_base_dir + "/" + site_id + "/hobo/"
source_filepaths = ftp._ftp_list_files_(ftp_session, hobo_distant_path, self.logger, self.object_id) source_filepaths = ftp.ftp_list_files(ftp_session, hobo_distant_path, self.logger, self.object_id)
for source_filepath in source_filepaths: for source_filepath in source_filepaths:
dest_filepath = self.__get_hobo_dest_filepath__(source_filepath) dest_filepath = self.__get_hobo_dest_filepath__(source_filepath)
ftp._ftp_download_file(source_filepath, dest_filepath, self.logger, self.object_id, ftp.ftp_download_file(source_filepath, dest_filepath, self.logger, self.object_id,
ftp_session=ftp_session) ftp_session=ftp_session)
ftp_session.quit() ftp_session.quit()
......
...@@ -32,7 +32,7 @@ class Collector(utils.LogConfig): ...@@ -32,7 +32,7 @@ class Collector(utils.LogConfig):
dest_filepath = self.__get_dest_filepath__(day) dest_filepath = self.__get_dest_filepath__(day)
# Download # Download
success = ftp._ftp_download_file(source_filepath, dest_filepath, self.logger, self.object_id, success = ftp.ftp_download_file(source_filepath, dest_filepath, self.logger, self.object_id,
ftp_config=self.config[self.object_id]) ftp_config=self.config[self.object_id])
# Compress # Compress
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment