Caching conversation data to avoid false positives on program start

diff --git a/src/connection.py b/src/connection.py
index 8fa47bd..7ea65de 100644 (file)
--- a/src/connection.py
+++ b/src/connection.py
@@ -7,6 +7,7 @@
 """
 
 
 """
 
 

+import os

 import weakref
 import logging
 
 import weakref
 import logging
 

@@ -101,6 +102,12 @@ class TheOneRingConnection(
                else:
                        self.__connection = None
                        self.__connectionEventId = None
                else:
                        self.__connection = None
                        self.__connectionEventId = None

+               self.__cachePath = os.sep.join((constants._data_path_, "cache", self.username))
+               try:
+                       os.makedirs(self.__cachePath)
+               except OSError, e:
+                       if e.errno != 17:
+                               raise

 
                self.set_self_handle(handle.create_handle(self, 'connection'))
 
 
                self.set_self_handle(handle.create_handle(self, 'connection'))
 

@@ -126,7 +133,7 @@ class TheOneRingConnection(
        def get_handle_by_name(self, handleType, handleName):
                requestedHandleName = handleName.encode('utf-8')
                if handleType == telepathy.HANDLE_TYPE_CONTACT:
        def get_handle_by_name(self, handleType, handleName):
                requestedHandleName = handleName.encode('utf-8')
                if handleType == telepathy.HANDLE_TYPE_CONTACT:

-                       _moduleLogger.info("RequestHandles Contact: %s" % requestedHandleName)
+                       _moduleLogger.info("get_handle_by_name Contact: %s" % requestedHandleName)

                        requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name(
                                requestedHandleName
                        )
                        requestedContactId, requestedContactNumber = handle.ContactHandle.from_handle_name(
                                requestedHandleName
                        )

@@ -140,7 +147,7 @@ class TheOneRingConnection(
                        h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
                elif handleType == telepathy.HANDLE_TYPE_LIST:
                        # Support only server side (immutable) lists
                        h = handle.create_handle(self, 'contact', requestedContactId, requestedContactNumber)
                elif handleType == telepathy.HANDLE_TYPE_LIST:
                        # Support only server side (immutable) lists

-                       _moduleLogger.info("RequestHandles List: %s" % requestedHandleName)
+                       _moduleLogger.info("get_handle_by_name List: %s" % requestedHandleName)

                        h = handle.create_handle(self, 'list', requestedHandleName)
                else:
                        raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType)
                        h = handle.create_handle(self, 'list', requestedHandleName)
                else:
                        raise telepathy.errors.NotAvailable('Handle type unsupported %d' % handleType)

@@ -163,6 +170,7 @@ class TheOneRingConnection(
                try:
                        cookieFilePath = None
                        self.__session = gvoice.session.Session(cookieFilePath)
                try:
                        cookieFilePath = None
                        self.__session = gvoice.session.Session(cookieFilePath)

+                       self.__session.load(self.__cachePath)

 
                        self.__callback = coroutines.func_sink(
                                coroutines.expand_positional(
 
                        self.__callback = coroutines.func_sink(
                                coroutines.expand_positional(

@@ -262,6 +270,7 @@ class TheOneRingConnection(
                self.__callback = None
 
                self.__channelManager.close()
                self.__callback = None
 
                self.__channelManager.close()

+               self.session.save(self.__cachePath)

                self.session.logout()
                self.session.close()
                self.__session = None
                self.session.logout()
                self.session.close()
                self.__session = None

diff --git a/src/gvoice/conversations.py b/src/gvoice/conversations.py
index 6e08112..1ad9ae9 100644 (file)
--- a/src/gvoice/conversations.py
+++ b/src/gvoice/conversations.py
@@ -1,12 +1,15 @@
 #!/usr/bin/python
 
 #!/usr/bin/python
 

-# @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
 
 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
 
 import util.coroutines as coroutines
 import util.misc as util_misc
 

@@ -22,6 +25,25 @@ class Conversations(object):
 
                self.updateSignalHandler = coroutines.CoTee()
 
 
                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
        def update(self, force=False):
                if not force and self._conversations:
                        return

@@ -44,7 +66,7 @@ class Conversations(object):
                                isConversationUpdated = True
                        except RuntimeError, e:
                                if False:
                                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:
                                isConversationUpdated = False
 
                        if isConversationUpdated:

@@ -64,7 +86,7 @@ class Conversations(object):
                try:
                        del self._conversations[key]
                except KeyError:
                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()
 
        def clear_all(self):
                self._conversations.clear()

@@ -119,7 +141,8 @@ class MergedConversations(object):
                        for newMessage in newConversationMessages
                        if newMessage not in relatedConversation.messages
                ]
                        for newMessage in newConversationMessages
                        if newMessage not in relatedConversation.messages
                ]

-               _moduleLogger.debug("Found %d new messages in conversation %s (%d/%d)" % (
+               _moduleLogger.debug("%s Found %d new messages in conversation %s (%d/%d)" % (
+                       self._name,

                        len(newConversationMessages) - len(newConversation.messages),
                        newConversation.id,
                        len(newConversation.messages),
                        len(newConversationMessages) - len(newConversation.messages),
                        newConversation.id,
                        len(newConversation.messages),

diff --git a/src/gvoice/session.py b/src/gvoice/session.py
index d68f592..8f5b79c 100644 (file)
--- a/src/gvoice/session.py
+++ b/src/gvoice/session.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
 #!/usr/bin/env python
 

+import os

 import logging
 
 import backend
 import logging
 
 import backend

@@ -79,6 +80,14 @@ class Session(object):
                self._masterStateMachine.append_machine(self._voicemailsStateMachine)
                self._masterStateMachine.append_machine(self._textsStateMachine)
 
                self._masterStateMachine.append_machine(self._voicemailsStateMachine)
                self._masterStateMachine.append_machine(self._textsStateMachine)
 

+       def load(self, path):
+               self._texts.load(os.sep.join((path, "texts.cache")))
+               self._voicemails.load(os.sep.join((path, "voicemails.cache")))
+
+       def save(self, path):
+               self._texts.save(os.sep.join((path, "texts.cache")))
+               self._voicemails.save(os.sep.join((path, "voicemails.cache")))
+

        def close(self):
                self._voicemails.updateSignalHandler.unregister_sink(
                        self._voicemailsStateMachine.request_reset_timers
        def close(self):
                self._voicemails.updateSignalHandler.unregister_sink(
                        self._voicemailsStateMachine.request_reset_timers