Skip to content

[ENG-11468] Improve output zip file name from DAZ #486

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
cslzchen merged 2 commits into from
Jun 19, 2026
Merged

[ENG-11468] Improve output zip file name from DAZ #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e826985
Update zipfile name format in download_folder_as_zip method to includ…
Ostap-Zherebetskyi Jun 19, 2026
db83a31
Update zipfile naming convention in download_folder_as_zip method to …
Ostap-Zherebetskyi Jun 19, 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
4 changes: 2 additions & 2 deletions tests/server/api/v1/test_metadata_mixin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ async def test_download_folder_as_zip(self, http_request, mock_stream):
await handler.download_folder_as_zip()

assert handler._headers['Content-Type'] == 'application/zip'
expected = 'attachment; filename="test_file.zip"; filename*=UTF-8\'\'test_file.zip'
expected = 'attachment; filename="guid1-test_file.zip"; filename*=UTF-8\'\'guid1-test_file.zip'
assert handler._headers['Content-Disposition'] == expected

handler.write_stream.assert_called_once_with(mock_stream)
Expand All @@ -249,7 +249,7 @@ async def test_download_folder_as_zip_root(self, http_request, mock_stream):
await handler.download_folder_as_zip()

assert handler._headers['Content-Type'] == 'application/zip'
expected = 'attachment; filename="MockProvider-archive.zip"; filename*=UTF-8\'\'MockProvider-archive.zip'
expected = 'attachment; filename="guid1-MockProvider-archive.zip"; filename*=UTF-8\'\'guid1-MockProvider-archive.zip'
assert handler._headers['Content-Disposition'] == expected

handler.write_stream.assert_called_once_with(mock_stream)
2 changes: 1 addition & 1 deletion waterbutler/server/api/v1/provider/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ async def get_file_revisions(self):
return self.write({'data': [r.json_api_serialized() for r in result]})

async def download_folder_as_zip(self):
zipfile_name = self.path.name or f'{self.provider.NAME}-archive'
zipfile_name = f'{self.path_kwargs.get("resource")}-{self.path.name}' if self.path.name else f'{self.path_kwargs.get("resource")}-{self.provider.NAME}-archive'
self.set_header('Content-Type', 'application/zip')
self.set_header('Content-Disposition', make_disposition(zipfile_name + '.zip'))

Expand Down
Loading