paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-26 17:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload: Refactor out realm_avatar_and_logo_path function.

Browse Source
This commit is contained in:
Vishnu Ks
2019-07-19 12:11:54 +00:00
committed by Tim Abbott
parent aaa30df94c
commit af3a37b58b
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zerver/lib/upload.py
View File

@@ -255,6 +255,8 @@ class ZulipUploadBackend:
def get_export_tarball_url(self, realm: Realm, export_path: str) -> str:
raise NotImplementedError()
def realm_avatar_and_logo_path(self, realm: Realm) -> str:
raise NotImplementedError()
### S3
@@ -456,10 +458,13 @@ class S3UploadBackend(ZulipUploadBackend):
# export_path has a leading /
return "https://%s.s3.amazonaws.com%s" % (bucket, export_path)
def realm_avatar_and_logo_path(self, realm: Realm) -> str:
return os.path.join(str(realm.id), 'realm')
def upload_realm_icon_image(self, icon_file: File, user_profile: UserProfile) -> None:
content_type = guess_type(icon_file.name)[0]
bucket_name = settings.S3_AVATAR_BUCKET
s3_file_name = os.path.join(str(user_profile.realm.id), 'realm', 'icon')
s3_file_name = os.path.join(self.realm_avatar_and_logo_path(user_profile.realm), 'icon')
image_data = icon_file.read()
upload_image_to_s3(
@@ -495,7 +500,7 @@ class S3UploadBackend(ZulipUploadBackend):
basename = 'night_logo'
else:
basename = 'logo'
s3_file_name = os.path.join(str(user_profile.realm.id), 'realm', basename)
s3_file_name = os.path.join(self.realm_avatar_and_logo_path(user_profile.realm), basename)
image_data = logo_file.read()
upload_image_to_s3(
@@ -706,9 +711,11 @@ class LocalUploadBackend(ZulipUploadBackend):
image_data = read_local_file('avatars', source_file_path + '.original')
self.write_avatar_images(target_file_path, image_data)
def upload_realm_icon_image(self, icon_file: File, user_profile: UserProfile) -> None:
upload_path = os.path.join('avatars', str(user_profile.realm.id), 'realm')
def realm_avatar_and_logo_path(self, realm: Realm) -> str:
return os.path.join('avatars', str(realm.id), 'realm')
def upload_realm_icon_image(self, icon_file: File, user_profile: UserProfile) -> None:
upload_path = self.realm_avatar_and_logo_path(user_profile.realm)
image_data = icon_file.read()
write_local_file(
upload_path,
@@ -724,7 +731,7 @@ class LocalUploadBackend(ZulipUploadBackend):
def upload_realm_logo_image(self, logo_file: File, user_profile: UserProfile,
night: bool) -> None:
upload_path = os.path.join('avatars', str(user_profile.realm.id), 'realm')
upload_path = self.realm_avatar_and_logo_path(user_profile.realm)
if night:
original_file = 'night_logo.original'
resized_file = 'night_logo.png'