paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 18:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

export: Pass users to export_avatars_from_local.

Browse Source
This commit is contained in:
Steve Howell
2021-12-07 10:54:28 +00:00
committed by Tim Abbott
parent 79e9ba13e2
commit 15bc677f35
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/lib/export.py
View File

@@ -1285,6 +1285,8 @@ def export_uploads_and_avatars(realm: Realm, output_dir: Path) -> None:
if not os.path.exists(dir_path): if not os.path.exists(dir_path):
os.makedirs(dir_path) os.makedirs(dir_path)
users = list(UserProfile.objects.filter(realm=realm))
if settings.LOCAL_UPLOADS_DIR: if settings.LOCAL_UPLOADS_DIR:
# Small installations and developers will usually just store files locally. # Small installations and developers will usually just store files locally.
export_uploads_from_local( export_uploads_from_local(
@@ -1296,6 +1298,7 @@ def export_uploads_and_avatars(realm: Realm, output_dir: Path) -> None:
realm, realm,
local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars"), local_dir=os.path.join(settings.LOCAL_UPLOADS_DIR, "avatars"),
output_dir=avatars_output_dir, output_dir=avatars_output_dir,
users=users,
) )
export_emoji_from_local( export_emoji_from_local(
realm, realm,
@@ -1308,7 +1311,7 @@ def export_uploads_and_avatars(realm: Realm, output_dir: Path) -> None:
output_dir=realm_icons_output_dir, output_dir=realm_icons_output_dir,
) )
else: else:
user_ids = {user.id for user in UserProfile.objects.filter(realm=realm)} user_ids = {user.id for user in users}
# Some bigger installations will have their data stored on S3. # Some bigger installations will have their data stored on S3.
export_files_from_s3( export_files_from_s3(
@@ -1532,13 +1535,13 @@ def export_uploads_from_local(realm: Realm, local_dir: Path, output_dir: Path) -
records_file.write(orjson.dumps(records, option=orjson.OPT_INDENT_2)) records_file.write(orjson.dumps(records, option=orjson.OPT_INDENT_2))
def export_avatars_from_local(realm: Realm, local_dir: Path, output_dir: Path) -> None: def export_avatars_from_local(
realm: Realm, local_dir: Path, output_dir: Path, users: List[UserProfile]
) -> None:
count = 0 count = 0
records = [] records = []
users = list(UserProfile.objects.filter(realm=realm))
internal_realm = get_realm(settings.SYSTEM_BOT_REALM) internal_realm = get_realm(settings.SYSTEM_BOT_REALM)
users += [ users += [
get_system_bot(settings.NOTIFICATION_BOT, internal_realm.id), get_system_bot(settings.NOTIFICATION_BOT, internal_realm.id),