From 3ef17820e61a58924b5964a3832f6495cf4dfad0 Mon Sep 17 00:00:00 2001 From: Andrew Flegg Date: Wed, 9 Jun 2010 21:02:48 +0100 Subject: [PATCH] Fix updating of contacts, and change method name. Also, pull in unmatched friends for manual mapping. --- package/src/org/maemo/hermes/engine/friend.py | 2 +- package/src/org/maemo/hermes/engine/hermes.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/src/org/maemo/hermes/engine/friend.py b/package/src/org/maemo/hermes/engine/friend.py index 2ca6b5d..a45a6bb 100644 --- a/package/src/org/maemo/hermes/engine/friend.py +++ b/package/src/org/maemo/hermes/engine/friend.py @@ -73,7 +73,7 @@ class Friend(): def set_photo_url(self, url): self._set('photo-url', url) - def update_friend(self, other_friend, overwrite=False): + def update_from_friend(self, other_friend, overwrite=False): """ Overwrites any attributes in this friend, with attributes from other_friend """ diff --git a/package/src/org/maemo/hermes/engine/hermes.py b/package/src/org/maemo/hermes/engine/hermes.py index d33357f..2cbacd6 100644 --- a/package/src/org/maemo/hermes/engine/hermes.py +++ b/package/src/org/maemo/hermes/engine/hermes.py @@ -77,10 +77,10 @@ class Hermes: friend = service.process_contact(contact) if friend: contact.add_mapping(service.get_id()) - friend.update_friend(result) + result.update_from_friend(friend) if result.get_name() is not None: - self.update_contact(result, overwrite_existing_fields) + self.update_contact(contact, result, overwrite_existing_fields) else: self.unmatched.append(contact) @@ -101,6 +101,7 @@ class Hermes: self._progress("Finalising...", current_tick, total_ticks) current_tick += len(contacts) service.finalise(self.updated, overwrite_existing_fields) + self.friends[service.get_id] = service.get_unmatched_friends() # commit changes tick_increment = total_contacts / (len(self.updated) or 1) -- 1.7.9.5