Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

upload: Separate writing avatars as local files into function.

This commit is contained in:
Vishnu Ks 2018-05-30 14:35:58 +00:00 committed by Tim Abbott
parent d57beb40c7
commit 7960785261
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
zerver/lib/upload.py
View File

@ -465,12 +465,7 @@ class LocalUploadBackend(ZulipUploadBackend):
logging.warning("%s does not exist. Its entry in the database will be removed." % (file_name,)) logging.warning("%s does not exist. Its entry in the database will be removed." % (file_name,))
return False return False
def upload_avatar_image(self, user_file: File, def write_avatar_images(self, file_path: str, image_data: bytes) -> None:
acting_user_profile: UserProfile,
target_user_profile: UserProfile) -> None:
file_path = user_avatar_path(target_user_profile)
image_data = user_file.read()
write_local_file('avatars', file_path + '.original', image_data) write_local_file('avatars', file_path + '.original', image_data)
resized_data = resize_avatar(image_data) resized_data = resize_avatar(image_data)
@ -479,6 +474,14 @@ class LocalUploadBackend(ZulipUploadBackend):
resized_medium = resize_avatar(image_data, MEDIUM_AVATAR_SIZE) resized_medium = resize_avatar(image_data, MEDIUM_AVATAR_SIZE)
write_local_file('avatars', file_path + '-medium.png', resized_medium) write_local_file('avatars', file_path + '-medium.png', resized_medium)
def upload_avatar_image(self, user_file: File,
acting_user_profile: UserProfile,
target_user_profile: UserProfile) -> None:
file_path = user_avatar_path(target_user_profile)
image_data = user_file.read()
self.write_avatar_images(file_path, image_data)
def get_avatar_url(self, hash_key: str, medium: bool=False) -> str: def get_avatar_url(self, hash_key: str, medium: bool=False) -> str:
# ?x=x allows templates to append additional parameters with &s # ?x=x allows templates to append additional parameters with &s
medium_suffix = "-medium" if medium else "" medium_suffix = "-medium" if medium else ""