Skip to content

Use proper last_id files when syncing chats and when restoring chats #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaubert merged 2 commits into from
Sep 14, 2015
Merged

Use proper last_id files when syncing chats and when restoring chats #224

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae1185e
When syncing chats, save last_id to the proper file "chat_last_id"
adept Sep 6, 2015
1ae1613
Record progress of chat restore in the proper file, without clobbering
adept Sep 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/gmv/gmvault.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,12 +430,12 @@ def _common_sync(self, a_timer, a_type, imap_req, compress, restart):
"""
# get all imap ids in All Mail
imap_ids = self.src.search(imap_req)


last_id_file = self.OP_EMAIL_SYNC if a_type == "email" else self.OP_CHAT_SYNC
# check if there is a restart
if restart:
LOG.critical("Restart mode activated for emails. Need to find information in Gmail, be patient ...")
imap_ids = self.get_gmails_ids_left_to_sync(self.OP_EMAIL_SYNC if a_type == "email" \
else self.OP_CHAT_SYNC, imap_ids, imap_req)
imap_ids = self.get_gmails_ids_left_to_sync(last_id_file, imap_ids, imap_req)

total_nb_msgs_to_process = len(imap_ids) # total number of emails to get

Expand Down Expand Up @@ -542,7 +542,7 @@ def _common_sync(self, a_timer, a_type, imap_req, compress, restart):
# save id every 10 restored emails
if (nb_msgs_processed % 10) == 0:
if gid:
self.save_lastid(self.OP_EMAIL_SYNC, gid, eml_date, imap_req)
self.save_lastid(last_id_file, gid, eml_date, imap_req)
else:
LOG.info("Could not process message with id %s. Ignore it\n" % (the_id))
self.error_report['empty'].append((the_id, gid if gid else None))
Expand Down Expand Up @@ -1023,7 +1023,7 @@ def restore_chats(self, extra_labels = [], restart = False): #pylint:disable=W01

# save id every nb_items restored emails
# add the last treated gm_id
self.save_lastid(self.OP_EMAIL_RESTORE, last_id)
self.save_lastid(self.OP_CHAT_RESTORE, last_id)

return self.error_report

Expand Down