Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix nested folders being created in root folder #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix nested folders being created in root folder #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eef7317
fix nested folders being created in root folder
keyn4 Jul 8, 2024
6b2ef85
keep author structure if no snapshot is found
keyn4 Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions target_sftp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,37 +56,43 @@ def upload(args):
try:
sftp_client.mkdir(dir)
except Exception as e:
logger.exception(f"Failed to create folder {dir} in path {sftp_client.getcwd()}. See details below")
logger.exception(f"Failed to create folder {dir} in path {sftp_client.getcwd()}. Exception: {e}")
# If it already exists, we ignore
pass

# Switch into the dir if it exists
sftp_client.chdir(dir) #will change if folder already exists
except Exception as e:
logger.exception(f"Failed to create folder {dir} in path {sftp_client.getcwd()}. See details below")
logger.exception(f"Failed to create folder {dir} in path {sftp_client.getcwd()}. Exception: {e}")
raise e

for root, dirs, files in os.walk(config["input_path"]):
input_path = config["input_path"]
for root, dirs, files in os.walk(input_path):
for dir in dirs:
try:
sftp_client.mkdir(dir)
dir_path = dir
prev_folder = root.replace(input_path, "")
dir_path = os.path.join(prev_folder, dir)
dir_path = dir_path[1:] if dir_path.startswith("/") else dir_path
sftp_client.mkdir(dir_path)
logger.info(f"Created remote folder {dir}")
except:
except Exception as e:
logger.info(f"Remote folder {dir} already exists")
if isinstance(files,list) and len(files) == 0:
logger.info(f"No files in {root}. Skipping...")
for file in files: #upload all files
# upload all files...
for file in files:
file_path = os.path.join(root, file)
stripped_file_path = file_path.replace(config['input_path'] + "/", "",1)
stripped_file_path = file_path.replace(input_path + "/", "",1)
prev_cwd = None

if "/" in stripped_file_path:
prev_cwd = sftp_client.getcwd()
# Go into the folder
sftp_client.chdir(stripped_file_path.split("/")[0])
sftp_client.chdir("/".join(stripped_file_path.split("/")[0:-1]))

# Save the file
logger.info(f"Uploading {file} to {config['path_prefix']} at {sftp_client.getcwd()}")
logger.info(f"Uploading {file} to {sftp_client.getcwd()}")
sftp_client.put(file_path, file)

if prev_cwd is not None:
Expand Down