Disabling 'compress' and adding lots of debug help

[theonering] / src / gvoice / conversations.py

diff --git a/src/gvoice/conversations.py b/src/gvoice/conversations.py
index 86697ea..55a74fd 100644 (file)
--- a/src/gvoice/conversations.py
+++ b/src/gvoice/conversations.py
@@ -14,6 +14,7 @@ except ImportError:
 import constants
 import util.coroutines as coroutines
 import util.misc as misc_utils
+import util.go_utils as gobject_utils
 
 
 _moduleLogger = logging.getLogger(__name__)
@@ -38,6 +39,7 @@ class Conversations(object):
                return repr(self._get_raw_conversations.__name__)
 
        def load(self, path):
+               _moduleLogger.debug("%s Loading cache" % (self._name, ))
                assert not self._conversations
                try:
                        with open(path, "rb") as f:
@@ -53,6 +55,10 @@ class Conversations(object):
                        _moduleLogger.info("%s Loaded cache" % (self._name, ))
                        self._conversations = convs
                        self._loadedFromCache = True
+                       for key, mergedConv in self._conversations.iteritems():
+                               _moduleLogger.debug("%s \tLoaded %s" % (self._name, key))
+                               for conv in mergedConv.conversations:
+                                       _moduleLogger.debug("%s \t\tLoaded %s (%r) %r %r %r" % (self._name, conv.id, conv.time, conv.isRead, conv.isArchived, len(conv.messages)))
                else:
                        _moduleLogger.debug(
                                "%s Skipping cache due to version mismatch (%s-%s)" % (
@@ -63,27 +69,36 @@ class Conversations(object):
        def save(self, path):
                try:
                        _moduleLogger.info("%s Saving cache" % (self._name, ))
-                       for conv in self._conversations.itervalues():
-                               conv.compress(self.OLDEST_MESSAGE_WINDOW)
+                       #for conv in self._conversations.itervalues():
+                       #       conv.compress(self.OLDEST_MESSAGE_WINDOW)
+
+                       for key, mergedConv in self._conversations.iteritems():
+                               _moduleLogger.debug("%s \tSaving %s" % (self._name, key))
+                               for conv in mergedConv.conversations:
+                                       _moduleLogger.debug("%s \t\tSaving %s (%r) %r %r %r" % (self._name, conv.id, conv.time, conv.isRead, conv.isArchived, len(conv.messages)))
+
                        dataToDump = (constants.__version__, constants.__build__, self._conversations)
                        with open(path, "wb") as f:
                                pickle.dump(dataToDump, f, pickle.HIGHEST_PROTOCOL)
                except (pickle.PickleError, IOError):
                        _moduleLogger.exception("While saving for %s" % self._name)
+               _moduleLogger.info("%s Cache saved" % (self._name, ))
 
        def update(self, force=False):
                if not force and self._conversations:
                        return
-               self._asyncPool.add_task(
+
+               le = gobject_utils.AsyncLinearExecution(self._asyncPool, self._update)
+               le.start()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _update(self):
+               conversationResult = yield (
                        self._get_raw_conversations,
                        (),
                        {},
-                       self._on_get_conversations,
-                       self._on_get_conversations_failed,
                )
 
-       @misc_utils.log_exception(_moduleLogger)
-       def _on_get_conversations(self, conversationResult):
                oldConversationIds = set(self._conversations.iterkeys())
 
                updateConversationIds = set()
@@ -112,15 +127,17 @@ class Conversations(object):
                        if isConversationUpdated:
                                updateConversationIds.add(key)
 
+               for key in updateConversationIds:
+                       mergedConv = self._conversations[key]
+                       _moduleLogger.debug("%s \tUpdated %s" % (self._name, key))
+                       for conv in mergedConv.conversations:
+                               _moduleLogger.debug("%s \t\tUpdated %s (%r) %r %r %r" % (self._name, conv.id, conv.time, conv.isRead, conv.isArchived, len(conv.messages)))
+
                if updateConversationIds:
                        message = (self, updateConversationIds, )
                        self.updateSignalHandler.stage.send(message)
                self._hasDoneUpdate = True
 
-       @misc_utils.log_exception(_moduleLogger)
-       def _on_get_conversations_failed(self, error):
-               _moduleLogger.error(error)
-
        def get_conversations(self):
                return self._conversations.iterkeys()