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

export: Clean up export_messages().

Browse Source 
This is pretty minor cleanup, but it makes it a little more
explicit what we're writing to the shard file, and it allows
us to use a more specific mypy type when calling
floatify_datetime_fields.
This commit is contained in:
Steve Howell
2016-08-09 18:28:46 -07:00
committed by Tim Abbott
parent 1d1f36c0b8
commit 35c59fc4d7
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
zerver/lib/export.py
View File

@@ -255,16 +255,25 @@ def export_messages(realm, user_profile_ids, recipient_ids,
if len(message_chunk) == 0: if len(message_chunk) == 0:
break break
# Figure out the name of our shard file.
message_filename = os.path.join(output_dir, "messages-%06d.json" % (dump_file_id,)) message_filename = os.path.join(output_dir, "messages-%06d.json" % (dump_file_id,))
message_filename += '.partial' message_filename += '.partial'
logging.info("Fetched Messages for %s" % (message_filename,)) logging.info("Fetched Messages for %s" % (message_filename,))
# Clean up our messages.
table_data = {} # type: TableData
table_data['zerver_message'] = message_chunk
floatify_datetime_fields(table_data, 'zerver_message')
# Build up our output for the .partial file, which needs
# a list of user_profile_ids to search for (as well as
# the realm id).
output = {} # type: MessageOutput output = {} # type: MessageOutput
output['zerver_message'] = message_chunk output['zerver_message'] = table_data['zerver_message']
floatify_datetime_fields(output, 'zerver_message')
output['zerver_userprofile_ids'] = list(user_profile_ids) output['zerver_userprofile_ids'] = list(user_profile_ids)
output['realm_id'] = realm.id output['realm_id'] = realm.id
# And write the data.
write_message_export(message_filename, output) write_message_export(message_filename, output)
min_id = max(message_ids) min_id = max(message_ids)
dump_file_id += 1 dump_file_id += 1