diff options
author | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-09-01 11:41:55 +0300 |
---|---|---|
committer | Patrik Teivonen <patrik.teivonen@qt.io> | 2022-09-07 21:12:04 +0000 |
commit | fc4d871b3760766ddf192f5d3f61877acba8ca7a (patch) | |
tree | 6ca3b99094a9cc9b5cb3e332b9a239e40827e54e /packaging-tools/remote_uploader.py | |
parent | 03ca8c3c145fa8a01235d15f9532714fa09d5b4b (diff) |
pep8-naming: N803 argument name should be lowercase (function arguments)
Enable this check and rename function arguments to be PEP8 compliant.
Change-Id: Ia75f66decdab75197335b1cff5f87c6f25b0d259
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Diffstat (limited to 'packaging-tools/remote_uploader.py')
-rwxr-xr-x | packaging-tools/remote_uploader.py | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/packaging-tools/remote_uploader.py b/packaging-tools/remote_uploader.py index 09d5f5bbe..d2678bada 100755 --- a/packaging-tools/remote_uploader.py +++ b/packaging-tools/remote_uploader.py @@ -44,15 +44,15 @@ class RemoteUploaderError(Exception): class RemoteUploader: """RemoteUploader can be used to upload given file(s) to remote network disk.""" - def __init__(self, dryRun, remoteServer, remoteServerUserName, remoteBasePath): - self.dryRun = dryRun - self.set_tools(remoteServer, remoteServerUserName) - self.remoteLogin = remoteServerUserName + '@' + remoteServer - self.remoteTargetBaseDir = remoteBasePath + def __init__(self, dry_run, remote_server, remote_server_username, remote_base_path): + self.dryRun = dry_run + self.set_tools(remote_server, remote_server_username) + self.remoteLogin = remote_server_username + '@' + remote_server + self.remoteTargetBaseDir = remote_base_path self.init_finished = False - def set_tools(self, remoteServer, remoteServerUserName): - self.ssh_cmd = ['ssh', '-o', 'GSSAPIAuthentication=no', '-o', 'StrictHostKeyChecking=no', remoteServerUserName + '@' + remoteServer] + def set_tools(self, remote_server, remote_server_username): + self.ssh_cmd = ['ssh', '-o', 'GSSAPIAuthentication=no', '-o', 'StrictHostKeyChecking=no', remote_server_username + '@' + remote_server] system = platform.system().lower() if "windows" in system: if not which("scp"): @@ -63,50 +63,50 @@ class RemoteUploader: raise RemoteUploaderError("'rsync' tool not found from PATH") self.copy_cmd = ['rsync'] - def init_snapshot_upload_path(self, projectName, version, snapshotId): + def init_snapshot_upload_path(self, project_name, version, snapshot_id): assert not self.init_finished, f"Already initialized as: {self.remoteTargetDir}" - self.remoteTargetDir = self.remoteTargetBaseDir + "/" + projectName + "/" + version + "/" + snapshotId - self.remoteLatestLink = self.remoteTargetBaseDir + "/" + projectName + "/" + version + "/latest" + self.remoteTargetDir = self.remoteTargetBaseDir + "/" + project_name + "/" + version + "/" + snapshot_id + self.remoteLatestLink = self.remoteTargetBaseDir + "/" + project_name + "/" + version + "/latest" self.init_finished = True self.ensure_remote_dir(self.remoteTargetDir) - def init_upload_path(self, remotePath): + def init_upload_path(self, remote_path): assert not self.init_finished, f"Already initialized as: {self.remoteTargetDir}" - self.remoteTargetDir = self.remoteTargetBaseDir + "/" + remotePath + self.remoteTargetDir = self.remoteTargetBaseDir + "/" + remote_path self.init_finished = True self.ensure_remote_dir(self.remoteTargetDir) - def ensure_remote_dir(self, remoteDir): + def ensure_remote_dir(self, remote_dir): assert self.init_finished, "RemoteUploader not initialized!" - print(f"Creating remote directory: {remoteDir}") - cmd = self.ssh_cmd + ['mkdir', '-p', remoteDir] + print(f"Creating remote directory: {remote_dir}") + cmd = self.ssh_cmd + ['mkdir', '-p', remote_dir] print("Executing: ", ' '.join(cmd)) if not self.dryRun: check_call(cmd, timeout=60) # give it 60s - def _copy_to_remote(self, fileName, destDirName): + def _copy_to_remote(self, file_name, dest_dir_name): """Copy the given file to destDirName which is relative to remoteBasePath.""" assert self.init_finished, "RemoteUploader not initialized!" remoteDestination = self.remoteLogin + ':' + self.remoteTargetDir - if destDirName: - remoteDestination = remoteDestination + '/' + destDirName + '/' + if dest_dir_name: + remoteDestination = remoteDestination + '/' + dest_dir_name + '/' if "windows" in platform.system().lower(): - self.ensure_remote_dir(self.remoteTargetDir + '/' + destDirName + '/') - print(f"Copying [{fileName}] to [{remoteDestination}]") - cmd = self.copy_cmd + [fileName, remoteDestination] + self.ensure_remote_dir(self.remoteTargetDir + '/' + dest_dir_name + '/') + print(f"Copying [{file_name}] to [{remoteDestination}]") + cmd = self.copy_cmd + [file_name, remoteDestination] print("Executing: ", ' '.join(cmd)) if not self.dryRun: check_call(cmd, timeout=60 * 10) # give it 10 mins - def copy_to_remote(self, path: str, destDirName=""): + def copy_to_remote(self, path: str, dest_dir_name=""): items = [path] if os.path.isfile(path) else [os.path.join(path, x) for x in os.listdir(path)] for item in items: - self._copy_to_remote(item, destDirName) + self._copy_to_remote(item, dest_dir_name) - def update_latest_symlink(self, forceUpdate=True): + def update_latest_symlink(self, force_update=True): assert self.init_finished, "RemoteUploader not initialized!" print(f"Creating remote symlink: [{self.remoteLatestLink}] -> [{self.remoteTargetDir}]") - options = ["-sfn"] if forceUpdate else ["-sn"] + options = ["-sfn"] if force_update else ["-sn"] try: cmd = self.ssh_cmd + ['ln'] + options + [self.remoteTargetDir, self.remoteLatestLink] print("Executing: ", ' '.join(cmd)) |