Generalizing the backend

git-svn-id: file:///svnroot/gc-dialer/trunk@72 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index 141a2c1..c7036c1 100755 (executable)
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -268,7 +268,8 @@ class Dialpad(object):
        def populate_recentview(self):
                print "Populating"
                self._recentmodel.clear()
-               for item in self._gcBackend.get_recent():
+               for personsName, phoneNumber, date, action in self._gcBackend.get_recent():
+                       item = (phoneNumber, "%s on %s from/to %s - %s" % (action.capitalize(), date, personsName, phoneNumber))
                        self._recentmodel.append(item)
                self._recenttime = time.time()
 

diff --git a/gc_dialer/gcbackend.py b/gc_dialer/gcbackend.py
index 888e8e4..4f59a0a 100644 (file)
--- a/gc_dialer/gcbackend.py
+++ b/gc_dialer/gcbackend.py
@@ -123,9 +123,6 @@ class GCDialer(object):
                return False
 
        def clear_caches(self):
-               """
-               @todo Fill this in
-               """
                pass
 
        def reset(self):
@@ -210,12 +207,16 @@ class GCDialer(object):
 
        def get_recent(self):
                """
-               @returns Iterable of (Phone Number, Description)
+               @returns Iterable of (personsName, phoneNumber, date, action)
                """
                try:
                        recentCallsPage = self._browser.download(GCDialer._inboxallURL)
                        for match in self._inboxRe.finditer(recentCallsPage):
-                               yield (match.group(4), "%s on %s from/to %s - %s" % (match.group(1).capitalize(), match.group(2), match.group(3), match.group(4)))
+                               phoneNumber = match.group(4)
+                               action = match.group(1)
+                               date = match.group(2)
+                               personsName = match.group(3)
+                               yield personsName, phoneNumber, date, action
                except:
                        pass