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

storage: Simplify system bot avatar logic.

This commit is contained in:
Tim Abbott 2024-10-25 09:54:54 -07:00
parent c3017e55d2
commit 71d81484ad
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
zerver/lib/storage.py
View File

@ -25,8 +25,6 @@ else:
class IgnoreBundlesManifestStaticFilesStorage(ManifestStaticFilesStorage): class IgnoreBundlesManifestStaticFilesStorage(ManifestStaticFilesStorage):
hashed_static_avatar_file_map: dict[str, str] = {}
def process_static_avatars_name( def process_static_avatars_name(
self, self,
name: str, name: str,
@ -64,21 +62,20 @@ class IgnoreBundlesManifestStaticFilesStorage(ManifestStaticFilesStorage):
return f"{base_name}-{extension}" return f"{base_name}-{extension}"
if name.endswith("-medium.png"): if name.endswith("-medium.png"):
# This logic relies on the fact that the medium files will hashed_medium_file = reformat_medium_filename(
# be hashed first due to the "-medium" string, which places
# them earlier in the naming order. So, adhering to the
# medium file naming convention is crucial for this logic.
hashed_medium_file: str = reformat_medium_filename(
super().hashed_name(name, content, filename) super().hashed_name(name, content, filename)
) )
default_file = name.replace("-medium.png", ".png")
hashed_default_file = hashed_medium_file.replace("-medium.png", ".png")
self.hashed_static_avatar_file_map[default_file] = hashed_default_file
return hashed_medium_file return hashed_medium_file
assert name in self.hashed_static_avatar_file_map else:
return self.hashed_static_avatar_file_map[name] medium_name = name.replace(".png", "-medium.png")
from django.core.files import File
with File(open(self.path(medium_name), "rb")) as medium_content:
hashed_medium_file = reformat_medium_filename(
super().hashed_name(medium_name, medium_content, filename)
)
hashed_default_file = hashed_medium_file.replace("-medium.png", ".png")
return hashed_default_file
@override @override
def hashed_name( def hashed_name(