diff --git a/CHANGELOG b/CHANGELOG index b6c59eb2c..018e4a04c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,11 @@ ChangeLog ********* +26.2.1 (2026-07-23) +=================== + +- Fix zip file name for DAZ + 26.2.0 (2026-07-20) =================== diff --git a/pyproject.toml b/pyproject.toml index 47425a77a..26212f78c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "waterbutler" -version = "26.2.0" # TODO: get version from waterbutler/version.py +version = "26.2.1" # TODO: get version from waterbutler/version.py description = "WaterButler Storage Server" authors = ["Center for Open Science "] readme = "README.md" diff --git a/tests/server/api/v1/test_metadata_mixin.py b/tests/server/api/v1/test_metadata_mixin.py index 8e7ed2271..36c93e9cf 100644 --- a/tests/server/api/v1/test_metadata_mixin.py +++ b/tests/server/api/v1/test_metadata_mixin.py @@ -228,12 +228,12 @@ async def test_download_folder_as_zip(self, http_request, mock_stream): handler = mock_handler(http_request) handler.provider.zip = MockCoroutine(return_value=mock_stream) - handler.path = WaterButlerPath('/test_file') + handler.path = WaterButlerPath('/test_folder') await handler.download_folder_as_zip() assert handler._headers['Content-Type'] == 'application/zip' - expected = 'attachment; filename="guid1-test_file.zip"; filename*=UTF-8\'\'guid1-test_file.zip' + expected = 'attachment; filename="guid1-MockProvider-test_folder-archive.zip"; filename*=UTF-8\'\'guid1-MockProvider-test_folder-archive.zip' assert handler._headers['Content-Disposition'] == expected handler.write_stream.assert_called_once_with(mock_stream) diff --git a/waterbutler/server/api/v1/provider/metadata.py b/waterbutler/server/api/v1/provider/metadata.py index 4c376922e..2d72a7473 100644 --- a/waterbutler/server/api/v1/provider/metadata.py +++ b/waterbutler/server/api/v1/provider/metadata.py @@ -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 = f'{self.path_kwargs.get("resource")}-{self.path.name}' if self.path.name else f'{self.path_kwargs.get("resource")}-{self.provider.NAME}-archive' + zipfile_name = f'{self.path_kwargs.get("resource")}-{self.provider.NAME}-{self.path.name}-archive' 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')) diff --git a/waterbutler/version.py b/waterbutler/version.py index 39d7c968a..b56d4ca3b 100644 --- a/waterbutler/version.py +++ b/waterbutler/version.py @@ -1 +1 @@ -__version__ = '26.2.0' +__version__ = '26.2.1'