Skip to content

build object path when upload folder #60

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

Merged
pluto-workhub merged 1 commit into from
Mar 22, 2023
Merged

build object path when upload folder #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions mcs/api/bucket_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,33 +201,36 @@ def _create_folders(self, bucket_name, path):
self.api_client._request_with_params(POST, CREATE_FOLDER, self.MCS_API, params, self.token, None)
path, folder_name = object_to_filename(path)

def _upload_to_bucket(self, bucket_name, file_path, prefix=''):
def _upload_to_bucket(self, bucket_name, object_name, file_path):
if os.path.isdir(file_path):
return self.upload_folder(bucket_name, file_path, prefix)
return self.upload_folder(bucket_name, object_name, file_path)
else:
file_name = os.path.basename(file_path)
return self.upload_file(bucket_name, os.path.join(prefix, file_name), file_path)
return self.upload_file(bucket_name, object_name, file_path)

def upload_folder(self, bucket_name, folder_path, prefix=''):
folder_name = os.path.basename(folder_path)
def upload_folder(self, bucket_name, object_name, folder_path):
prefix, folder_name = object_to_filename(object_name)
self.create_folder(bucket_name, folder_name, prefix)
res = []
files = os.listdir(folder_path)
for f in files:
f_path = os.path.join(folder_path, f)
upload = self._upload_to_bucket(bucket_name, f_path, os.path.join(prefix, folder_name))
upload = self._upload_to_bucket(bucket_name, os.path.join(object_name, f), f_path)
res.append(upload)

self._create_folders(bucket_name, prefix)

return res

def upload_ipfs_folder(self, bucket_name, object_name, folder_path):
folder_name = os.path.basename(object_name) or os.path.basename(folder_path)
prefix = os.path.normpath(os.path.dirname(object_name)) if os.path.dirname(object_name) else ''
# folder_name = os.path.basename(object_name) or os.path.basename(folder_path)
# prefix = os.path.normpath(os.path.dirname(object_name)) if os.path.dirname(object_name) else ''
prefix, folder_name = object_to_filename(object_name)
bucket_uid = self._get_bucket_id(bucket_name)
files = self._read_files(folder_path, folder_name)
form_data = {"folder_name": folder_name, "prefix": prefix, "bucket_uid": bucket_uid}
res = self.api_client._request_with_params(POST, PIN_IPFS, self.MCS_API, form_data, self.token, files)
if res:
self._create_folders(bucket_name, prefix)
folder = (File(res["data"], self.gateway))
return folder
else:
Expand Down