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

Jump to bottom

Added support for renaming filenames on store if they exists #120

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added support for renaming filenames on store if they exists #120

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
38 changes: 27 additions & 11 deletions django_drf_filepond/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def _init_storage_backend():
# either the 22-char upload_id or the value provided to the
# destination_file_path parameter as a query string parameter using the
# "id" key.
def store_upload(upload_id, destination_file_path):
def store_upload(upload_id, destination_file_path, rename_if_exists=False):
"""
Store the temporary upload with the specified upload ID to the
destination_file_path. destination_file_path should be a directory only
Expand Down Expand Up @@ -116,11 +116,32 @@ def store_upload(upload_id, destination_file_path):
if storage_backend:
return _store_upload_remote(destination_path, destination_name, tu)
else:
return _store_upload_local(destination_path, destination_name, tu)
return _store_upload_local(destination_path, destination_name, tu,
rename_if_exists=rename_if_exists)


def _get_available_target_file_path(target_dir, target_filename,
rename_if_exists=False):
target_file_path = os.path.join(target_dir, target_filename)
if not os.path.exists(target_file_path):
return target_file_path

if rename_if_exists:
idx = 2
while os.path.exists(target_file_path):
root, ext = os.path.splitext(target_filename)
target_file_path = f'{root} ({idx}).{ext}'
idx += 1
return target_file_path

LOG.error('File with specified name and path <%s> already exists'
% target_file_path)
raise FileExistsError('The specified temporary file cannot be stored'
' to the specified location - file exists.')


def _store_upload_local(destination_file_path, destination_file_name,
temp_upload):
temp_upload, rename_if_exists=False):
file_path_base = local_settings.FILE_STORE_PATH

# If called via store_upload, this has already been checked but in
Expand All @@ -130,7 +151,7 @@ def _store_upload_local(destination_file_path, destination_file_name,

# Is this necessary? Checking on every file storage in case the directory
# was removed but not sure that this is really necessary.
if((not os.path.exists(file_path_base)) or
if ((not os.path.exists(file_path_base)) or
(not os.path.isdir(file_path_base))):
raise FileNotFoundError(
'The local output directory [%s] defined by FILE_STORE_PATH is '
Expand All @@ -148,13 +169,8 @@ def _store_upload_local(destination_file_path, destination_file_name,
destination_file_path = os.path.join(destination_file_path,
target_filename)

# Check we're not about to overwrite anything
target_file_path = os.path.join(target_dir, target_filename)
if os.path.exists(target_file_path):
LOG.error('File with specified name and path <%s> already exists'
% target_file_path)
raise FileExistsError('The specified temporary file cannot be stored'
' to the specified location - file exists.')
target_file_path = _get_available_target_file_path(
target_dir, target_filename, rename_if_exists=rename_if_exists)

su = StoredUpload(upload_id=temp_upload.upload_id,
file=destination_file_path,
Expand Down