Skip to content

Allow S3 Uploads while "Include Subdirectories" is False #2760

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
MichaIng merged 2 commits into from
Feb 8, 2026
Merged

Allow S3 Uploads while "Include Subdirectories" is False #2760

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c0b7da
if target_dir is false, can't len to get obj name
pbouill May 15, 2023
f55dda1
fix(uploadservice): preserve path for S3 upload with subdirs
MichaIng Feb 8, 2026
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
19 changes: 13 additions & 6 deletions motioneye/uploadservices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,7 @@ def upload_file(self, target_dir, filename, camera_name):
if target_dir:
target_dir = os.path.realpath(target_dir)
rel_filename = os.path.realpath(filename)
rel_filename = rel_filename[len(target_dir) :]

while rel_filename.startswith('/'):
rel_filename = rel_filename[1:]
rel_filename = rel_filename[len(target_dir) :].lstrip('/')

self.debug(f'uploading file "{target_dir}/{rel_filename}" to {self}')

Expand Down Expand Up @@ -1221,10 +1218,20 @@ def upload_file(self, target_dir, filename, camera_name):
aws_secret_access_key=self._secret_key,
)

if target_dir:
target_dir = os.path.realpath(target_dir)
rel_filename = os.path.realpath(filename)
rel_filename = rel_filename[len(target_dir) :].lstrip('/')

else:
rel_filename = os.path.basename(filename)

# Uploads the given file using a managed uploader, which will split up
# large files automatically and upload parts in parallel.
self.debug(f'uploading file "{filename}" to S3 bucket "{self._bucket}"')
s3.upload_file(filename, self._bucket, filename[len(target_dir) :])
self.debug(
f'uploading file "{filename}" to S3 bucket "{self._bucket}" path "{rel_filename}"'
)
s3.upload_file(filename, self._bucket, rel_filename)

def test_access(self):
try:
Expand Down
Loading