Yay, renaming

[theonering] / src / gvoice / addressbook.py

diff --git a/src/gvoice/addressbook.py b/src/gvoice/addressbook.py
index e796583..aeb8de5 100644 (file)
--- a/src/gvoice/addressbook.py
+++ b/src/gvoice/addressbook.py
@@ -3,6 +3,8 @@
 
 import logging
 
+import util.coroutines as coroutines
+
 
 _moduleLogger = logging.getLogger("gvoice.addressbook")
 
@@ -12,27 +14,65 @@ class Addressbook(object):
        def __init__(self, backend):
                self._backend = backend
                self._contacts = {}
+               self._addedContacts = set()
+               self._removedContacts = set()
+               self._changedContacts = set()
 
-       def clear_cache(self):
-               self._contacts.clear()
+               self.updateSignalHandler = coroutines.CoTee()
 
-       def get_contacts(self):
+       def update(self):
+               oldContacts = self._contacts
+               oldContactIds = set(self.get_contacts())
+
+               self._contacts = {}
                self._populate_contacts()
+               newContactIds = set(self.get_contacts())
+
+               self._addedContacts = newContactIds - oldContactIds
+               self._removedContacts = oldContactIds - newContactIds
+               self._changedContacts = set(
+                       contactId
+                       for contactId in newContactIds.intersection(oldContactIds)
+                       if self._has_contact_changed(contactId, oldContacts)
+               )
+
+               message = self, self._addedContacts, self._removedContacts, self._changedContacts
+               self.updateSignalHandler.send(message)
+
+       def get_contacts(self):
                return self._contacts.iterkeys()
 
+       def get_contact_name(self, contactId):
+               return self._contacts[contactId][0]
+
        def get_contact_details(self, contactId):
-               self._populate_contacts()
                self._populate_contact_details(contactId)
-               return self._contacts[contactId]
+               return self._get_contact_details(contactId)
 
        def _populate_contacts(self):
                if self._contacts:
                        return
                contacts = self._backend.get_contacts()
                for contactId, contactName in contacts:
-                       self._contacts[contactId] = None
+                       self._contacts[contactId] = (contactName, {})
 
        def _populate_contact_details(self, contactId):
-               if self._contacts[contactId] is not None:
+               if self._get_contact_details(contactId):
                        return
-               self._contacts[contactId] = self._backend.get_contact_details(contactId)
+               self._get_contact_details(contactId).update(
+                       self._backend.get_contact_details(contactId)
+               )
+
+       def _get_contact_details(self, contactId):
+               return self._contacts[contactId][1]
+
+       def _has_contact_changed(self, contactId, oldContacts):
+               oldContact = oldContacts[contactId]
+               oldContactName = oldContact[0]
+               oldContactDetails = oldContact[1]
+               if oldContactName != self.get_contact_name(contactId):
+                       return True
+               if not oldContactDetails[1]:
+                       return False
+               # if its already in the old cache, purposefully add it into the new cache
+               return oldContactDetails != self.get_contact_details(contactId)