making pickled caches block no execution

[theonering] / src / gvoice / conversations.py

diff --git a/src/gvoice/conversations.py b/src/gvoice/conversations.py
index c62550d..64dafb8 100644 (file)
--- a/src/gvoice/conversations.py
+++ b/src/gvoice/conversations.py
@@ -20,6 +20,11 @@ import util.go_utils as gobject_utils
 _moduleLogger = logging.getLogger(__name__)
 
 
+class ConversationError(RuntimeError):
+
+       pass
+
+
 class Conversations(object):
 
        OLDEST_COMPATIBLE_FORMAT_VERSION = misc_utils.parse_version("0.8.0")
@@ -43,7 +48,7 @@ class Conversations(object):
                try:
                        with open(path, "rb") as f:
                                fileVersion, fileBuild, convs = pickle.load(f)
-               except (pickle.PickleError, IOError, EOFError, ValueError):
+               except (pickle.PickleError, IOError, EOFError, ValueError, Exception):
                        _moduleLogger.exception("While loading for %s" % self._name)
                        return
 
@@ -111,12 +116,17 @@ class Conversations(object):
                                markAllAsRead = False
                        else:
                                markAllAsRead = True
+
                        try:
                                mergedConversations.append_conversation(conversation, markAllAsRead)
                                isConversationUpdated = True
+                       except ConversationError, e:
+                               isConversationUpdated = False
+                       except AssertionError, e:
+                               _moduleLogger.debug("%s Skipping conversation for %r because '%s'" % (self._name, key, e))
+                               isConversationUpdated = False
                        except RuntimeError, e:
-                               if False:
-                                       _moduleLogger.debug("%s Skipping conversation for %r because '%s'" % (self._name, key, e))
+                               _moduleLogger.debug("%s Skipping conversation for %r because '%s'" % (self._name, key, e))
                                isConversationUpdated = False
 
                        if isConversationUpdated:
@@ -174,10 +184,11 @@ class MergedConversations(object):
                # * We cache to disk the history of messages sent/received
                # * On first run we mark all server messages as read due to no cache
                # * If not first load or from cache (disk or in-memory) then it must be unread
-               if markAllAsRead:
-                       newConversation.isRead = True
-               else:
-                       newConversation.isRead = False
+               if newConversation.type != newConversation.TYPE_VOICEMAIL:
+                       if markAllAsRead:
+                               newConversation.isRead = True
+                       else:
+                               newConversation.isRead = False
 
                if newConversation.messages:
                        # must not have had all items removed due to duplicates
@@ -203,7 +214,7 @@ class MergedConversations(object):
                        )
 
                if newConversation.time <= self._conversations[-1].time:
-                       raise RuntimeError("Conversations got out of order")
+                       raise ConversationError("Conversations got out of order")
 
        def _find_related_conversation(self, convId):
                similarConversations = (
@@ -276,3 +287,18 @@ class FilterOutReported(object):
                if filteredConversations and self._lastMessageTimestamp < filteredConversations[0].time:
                        self._lastMessageTimestamp = filteredConversations[0].time
                return filteredConversations
+
+
+def print_conversations(path):
+       import pprint
+
+       try:
+               with open(path, "rb") as f:
+                       fileVersion, fileBuild, convs = pickle.load(f)
+       except (pickle.PickleError, IOError, EOFError, ValueError):
+               _moduleLogger.exception("")
+       else:
+               for key, value in convs.iteritems():
+                       convs[key] = value.to_dict()
+               pprint.pprint((fileVersion, fileBuild))
+               pprint.pprint(convs)