From e330be7fc1396eaed868045a2fe5d9377f2fe431 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 13 Dec 2012 11:15:06 -0500 Subject: [PATCH] dump_pointers: Use timestamps, not IDs, for transmitting the pointer. (imported from commit 9b51b9edc5b0bdfb2305c12a123d554811ec9e06) --- zephyr/management/commands/dump_pointers.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/zephyr/management/commands/dump_pointers.py b/zephyr/management/commands/dump_pointers.py index 4127ea8289..c3fa090b42 100755 --- a/zephyr/management/commands/dump_pointers.py +++ b/zephyr/management/commands/dump_pointers.py @@ -1,17 +1,28 @@ from optparse import make_option from django.core.management.base import BaseCommand -from zephyr.models import Realm, UserProfile +from zephyr.models import Realm, UserProfile, Message +from zephyr.lib.time import datetime_to_timestamp, timestamp_to_datetime import simplejson def dump(): pointers = [] for u in UserProfile.objects.select_related("user__email").all(): - pointers.append((u.user.email, u.pointer)) + pointer = u.pointer + if pointer != -1: + pub_date = Message.objects.get(id=pointer).pub_date + pointers.append((u.user.email, datetime_to_timestamp(pub_date))) + else: + pointers.append((u.user.email, -1)) file("dumped-pointers", "w").write(simplejson.dumps(pointers) + "\n") def restore(change): - for (email, pointer) in simplejson.loads(file("dumped-pointers").read()): + for (email, timestamp) in simplejson.loads(file("dumped-pointers").read()): u = UserProfile.objects.get(user__email__iexact=email) + if timestamp == -1: + pointer = -1 + else: + pointer = Message.objects.filter( + pub_date__gte=timestamp_to_datetime(timestamp)).order_by("id")[0].id print "%s: pointer %s => %s" % (email, u.pointer, pointer) if change: u.pointer = pointer