Fixing a random logging bug which causes an exception

[theonering] / src / gvoice / conversations.py

diff --git a/src/gvoice/conversations.py b/src/gvoice/conversations.py
index 8baf8b8..d0f80e9 100644 (file)
--- a/src/gvoice/conversations.py
+++ b/src/gvoice/conversations.py
@@ -1,12 +1,15 @@
 #!/usr/bin/python
 
-# @bug Its inconsistent as to whether messages from contacts come as from the
-# contact or just a raw number.  It seems GV is inconsistent about populating the contact id, so we might have to pull from the addressbook
-# @bug False positives on startup.  Luckily the object path for the channel is
-# unique, so can use that to cache some of the data out to file
+from __future__ import with_statement
 
 import logging
 
+try:
+       import cPickle
+       pickle = cPickle
+except ImportError:
+       import pickle
+
 import util.coroutines as coroutines
 import util.misc as util_misc
 
@@ -22,6 +25,25 @@ class Conversations(object):
 
                self.updateSignalHandler = coroutines.CoTee()
 
+       @property
+       def _name(self):
+               return repr(self._get_raw_conversations.__name__)
+
+       def load(self, path):
+               assert not self._conversations
+               try:
+                       with open(path, "rb") as f:
+                               self._conversations = pickle.load(f)
+               except (pickle.PickleError, IOError):
+                       _moduleLogger.exception("While loading for %s" % self._name)
+
+       def save(self, path):
+               try:
+                       with open(path, "wb") as f:
+                               pickle.dump(self._conversations, f, pickle.HIGHEST_PROTOCOL)
+               except (pickle.PickleError, IOError):
+                       _moduleLogger.exception("While saving for %s" % self._name)
+
        def update(self, force=False):
                if not force and self._conversations:
                        return
@@ -32,7 +54,7 @@ class Conversations(object):
                conversations = list(self._get_raw_conversations())
                conversations.sort()
                for conversation in conversations:
-                       key = conversation.contactId, util_misc.strip_number(conversation.number)
+                       key = util_misc.normalize_number(conversation.number)
                        try:
                                mergedConversations = self._conversations[key]
                        except KeyError:
@@ -44,7 +66,7 @@ class Conversations(object):
                                isConversationUpdated = True
                        except RuntimeError, e:
                                if False:
-                                       _moduleLogger.info("Skipping conversation for %r because '%s'" % (key, e))
+                                       _moduleLogger.info("%s Skipping conversation for %r because '%s'" % (self._name, key, e))
                                isConversationUpdated = False
 
                        if isConversationUpdated:
@@ -64,7 +86,7 @@ class Conversations(object):
                try:
                        del self._conversations[key]
                except KeyError:
-                       _moduleLogger.info("Conversation never existed for %r" % (key,))
+                       _moduleLogger.info("%s Conversation never existed for %r" % (self._name, key, ))
 
        def clear_all(self):
                self._conversations.clear()
@@ -90,7 +112,7 @@ class MergedConversations(object):
                if not self._conversations:
                        return
 
-               for constantField in ("contactId", "number"):
+               for constantField in ("number", ):
                        assert getattr(self._conversations[0], constantField) == getattr(newConversation, constantField), "Constant field changed, soemthing is seriously messed up: %r v %r" % (
                                getattr(self._conversations[0], constantField),
                                getattr(newConversation, constantField),