paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload: Use get_export_tarball_url in upload_export_tarball.

Browse Source
This commit is contained in:
Alex Vandiver
2022-04-06 16:52:23 -07:00
committed by Tim Abbott
parent 4cf835d9dd
commit 1a7b3ef7ed
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/upload/local.py
View File

@@ -241,8 +241,7 @@ class LocalUploadBackend(ZulipUploadBackend):
abs_path = os.path.join(assert_is_not_none(settings.LOCAL_AVATARS_DIR), path) abs_path = os.path.join(assert_is_not_none(settings.LOCAL_AVATARS_DIR), path)
os.makedirs(os.path.dirname(abs_path), exist_ok=True) os.makedirs(os.path.dirname(abs_path), exist_ok=True)
shutil.copy(tarball_path, abs_path) shutil.copy(tarball_path, abs_path)
public_url = realm.url + "/user_avatars/" + path return self.get_export_tarball_url(realm, "/user_avatars/" + path)
return public_url
@override @override
def delete_export_tarball(self, export_path: str) -> str | None: def delete_export_tarball(self, export_path: str) -> str | None:

3
zerver/lib/upload/s3.py
View File

@@ -445,8 +445,7 @@ class S3UploadBackend(ZulipUploadBackend):
else: else:
key.upload_file(Filename=tarball_path, Callback=percent_callback) key.upload_file(Filename=tarball_path, Callback=percent_callback)
public_url = self.get_public_upload_url(key.key) return self.get_export_tarball_url(realm, key.key)
return public_url
@override @override
def delete_export_tarball(self, export_path: str) -> str | None: def delete_export_tarball(self, export_path: str) -> str | None: