From e0800d0ac1a0f9ad42f56bf7421ebb2bb6d7d20d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caner=20Feyzullaho=C4=9Flu?= Date: Wed, 21 Sep 2016 15:13:42 +0300 Subject: [PATCH] File transfer method improvements --- opt/ahenk/base/file/ssh_file_transfer.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/opt/ahenk/base/file/ssh_file_transfer.py b/opt/ahenk/base/file/ssh_file_transfer.py index b8efd12..4b85788 100644 --- a/opt/ahenk/base/file/ssh_file_transfer.py +++ b/opt/ahenk/base/file/ssh_file_transfer.py @@ -53,25 +53,28 @@ class Ssh(object): self.logger.error('A problem occurred while sending file. Exception message: {0}'.format(str(e))) return False - def get_file(self, local_path=None): + def get_file(self, local_path=None, file_name=None): self.logger.debug('Getting file ...') - file_md5 = None try: tmp_file_name = str(Util.generate_uuid()) local_full_path = System.Ahenk.received_dir_path() + tmp_file_name sftp = paramiko.SFTPClient.from_transport(self.connection) sftp.get(self.target_path, local_full_path) - file_md5 = str(Util.get_md5_file(local_full_path)) + if local_path is None: receive_path = System.Ahenk.received_dir_path() else: receive_path = local_path - Util.rename_file(local_full_path, receive_path + file_md5) - self.logger.debug('File was downloaded to {0} from {1}'.format(local_full_path, self.target_path)) + if file_name is not None: + f_name = file_name + else: + f_name = str(Util.get_md5_file(local_full_path)) + Util.rename_file(local_full_path, receive_path + f_name) + self.logger.debug('File was downloaded to {0} from {1}'.format(receive_path, self.target_path)) except Exception as e: self.logger.warning('A problem occurred while downloading file. Exception message: {0}'.format(str(e))) raise - return file_md5 + return f_name def connect(self): self.logger.debug('Connecting to {0} via {1}'.format(self.target_hostname, self.target_port))