refactor for test + renamed field
[hermes] / package / src / org / maemo / hermes / engine / hermes.py
index 0d9034b..d33357f 100644 (file)
@@ -16,13 +16,13 @@ class Hermes:
 
     
     # -----------------------------------------------------------------------
-    def __init__(self, services, gui_progress):
-        """Constructor. Passed a list of services, and a callback method
-           which must implement the following API.
-                              
-             progress(i, j) - the application is currently processing friend 'i' of
-                              'j'. Should be used to provide the user a progress bar.
-        """
+    def __init__(self, services, gui_progress=None):
+        """Constructor. Passed a list of services, and a            
+           method which will be invoked with three arguments:
+                str    Name of current step
+                int    Current position
+                int    Maximum value of position."""
+
         
         # -- These fields are currently part of the API...
         #
@@ -30,55 +30,41 @@ class Hermes:
         self.matched = []
         self.unmatched = []
         self.friends = {}
-        self.addresses = None
+        self.address_book = None
         
         # -- Other initialisation...
         #
         self._services = services
-        self._progress = gui_progress
-    
-    
-    # -----------------------------------------------------------------------
-    def run(self, resync=False):
-        """Load information on the authenticated user's friends. Synchronise Facebook
-           profiles to contact database. If resync is false, no existing information
-           will be overwritten."""
-
-        class FakeContact():
-            def get_name(self):
-                return "Fredrik Wendt"
-            def get_emails(self):
-                return ["fredrik@wendt.se", "maemohermes@wendt.se"]
-            def get_photo(self):
-                return None
-            def get_mapped_to(self):
-                return set(["facebook", "gravatar"])
-        self.matched = [FakeContact()]
-#        self._sync_job = SyncJob(services, [FakeContact()], self.progress)
-#        self._sync_job.run()
-#        self._sync_job.get_unmatched_friends()
-#        self._sync_job.get_updated_contacts()
-#        self._sync_job.get_matched_contacts()
-        pass
+        self._progress = gui_progress or (lambda msg, i, j: None)
     
     
     # -----------------------------------------------------------------------
-    def run_alt(self, overwrite_existing_fields=False):
+    def run(self, overwrite_existing_fields=False):
+        self._progress("Reading contacts...", 1, 10000)
+        
         contacts = []
-        self.addresses = evolution.ebook.open_addressbook('default')
-        for contact in self.addresses.get_all_contacts():
-            contacts.append(Contact(self.addresses, contact))
+        self.address_book = self._get_address_book()
+        for contact in self.address_book.get_all_contacts():
+            contacts.append(Contact(self.address_book, contact))
+
+        # work out progress bar info
+        total_contacts = len(contacts) * len(self._services)
+        total_ticks    = 6 * total_contacts # Number of distinct loops below
 
         # warm up
+        current_tick = 1
         for service in self._services:
             print "pre-process:", service.get_id()
             for contact in contacts:
+                self._progress("Pre-processing contacts...", current_tick, total_ticks)
+                current_tick += 1
                 service.pre_process_contact(contact)
                 
         # fetch data
         for service in self._services:
             print "process_friends:", service.get_id()
+            self._progress("Reading friends...", current_tick, total_ticks)
+            current_tick += len(contacts)
             service.process_friends()
         
         # combine results into one friend
@@ -86,31 +72,46 @@ class Hermes:
             result = Friend()
             for service in self._services:
                 print "process_contact:", service.get_id()
+                self._progress("Processing contacts...", current_tick, total_ticks)
+                current_tick += 1
                 friend = service.process_contact(contact)
                 if friend:
                     contact.add_mapping(service.get_id())
-                    friend.decorate(result)
+                    friend.update_friend(result)
             
             if result.get_name() is not None:
                 self.update_contact(result, overwrite_existing_fields)
             else:
-                self.unmatched.add(contact)
+                self.unmatched.append(contact)
             
         # give services a chance to create new contacts
         for service in self._services:
             print "create_contacts:", service.get_id()
-            for friend in service.create_contacts():
+            to_create = service.get_friends_to_create_contacts_for()
+            tick_increment = len(contacts) / (len(to_create) or 1)
+            print tick_increment, to_create
+            for friend in to_create:
+                self._progress("Creating contacts...", current_tick, total_ticks)
+                current_tick += tick_increment
                 self.create_contact_from_friend(friend)
                 
         # finalisation
         for service in self._services:
             print "finalize:", service.get_id()
+            self._progress("Finalising...", current_tick, total_ticks)
+            current_tick += len(contacts)
             service.finalise(self.updated, overwrite_existing_fields)
             
         # commit changes
+        tick_increment = total_contacts / (len(self.updated) or 1)
+        print tick_increment, self.updated
         for contact in self.updated:
             print "committing changes to:", contact.get_name(), contact
-            self.addresses.commit_contact(contact.get_econtact())
+            self._progress("Saving changes...", current_tick, total_ticks)
+            current_tick += tick_increment
+            self.address_book.commit_contact(contact.get_econtact())
+            
+        self._progress('Finished', 1, -1)
         
 
     # -----------------------------------------------------------------------
@@ -130,9 +131,14 @@ class Hermes:
         econtact.props.full_name = friend['name']
         econtact.props.given_name = friend['first_name']
         econtact.props.family_name = friend['last_name']
-        contact = Contact(self.addresses, econtact)
+        contact = Contact(self.address_book, econtact)
                 
-        self.addresses.add_contact(contact)
+        self.address_book.add_contact(contact.get_econtact())
         self.update_contact(contact, friend)
         
         print "Created [%s]" % (contact.get_name())
+        
+        
+    # -----------------------------------------------------------------------
+    def _get_address_book(self):
+        return evolution.ebook.open_addressbook('default')