From ba6f2a8290f2c0c4c55eacfd75bd1897c2b04fe7 Mon Sep 17 00:00:00 2001
From: Fredrik Wendt <fredrik@wendt.se>
Date: Wed, 9 Jun 2010 20:20:01 +0100
Subject: [PATCH] minor cleanup in hermes.py

Signed-off-by: Fredrik Wendt <fredrik@wendt.se>
---
 package/src/main.py                                |    2 +-
 package/src/org/maemo/hermes/engine/friend.py      |    2 +-
 package/src/org/maemo/hermes/engine/hermes.py      |   29 ++------------------
 .../src/org/maemo/hermes/engine/twitter/service.py |    4 ++-
 package/src/org/maemo/hermes/gui/gtkui.py          |    2 +-
 5 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/package/src/main.py b/package/src/main.py
index 05e7e45..016b14e 100644
--- a/package/src/main.py
+++ b/package/src/main.py
@@ -17,8 +17,8 @@ if gnome.gconf.client_get_default().get_string('/desktop/gnome/url-handlers/http
 gui = HermesGUI(providers = [
                  org.maemo.hermes.engine.facebook.provider.Provider(),
                  org.maemo.hermes.engine.twitter.provider.Provider(),
-                 org.maemo.hermes.engine.gravatar.provider.Provider(),
                  org.maemo.hermes.engine.linkedin.provider.Provider(),
+                 org.maemo.hermes.engine.gravatar.provider.Provider(),
              ])
 gui.run()
 
diff --git a/package/src/org/maemo/hermes/engine/friend.py b/package/src/org/maemo/hermes/engine/friend.py
index ff4cd05..2ca6b5d 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(self, other_friend, overwrite=False):
+    def update_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 d60849e..c69aeaf 100644
--- a/package/src/org/maemo/hermes/engine/hermes.py
+++ b/package/src/org/maemo/hermes/engine/hermes.py
@@ -39,32 +39,7 @@ class Hermes:
     
     
     # -----------------------------------------------------------------------
-    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
-    
-    
-    # -----------------------------------------------------------------------
-    def run_alt(self, overwrite_existing_fields=False):
+    def run(self, overwrite_existing_fields=False):
         self._progress("Reading contacts...", 1, 10000)
         
         contacts = []
@@ -102,7 +77,7 @@ class Hermes:
                 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)
diff --git a/package/src/org/maemo/hermes/engine/twitter/service.py b/package/src/org/maemo/hermes/engine/twitter/service.py
index 6257840..7e01452 100644
--- a/package/src/org/maemo/hermes/engine/twitter/service.py
+++ b/package/src/org/maemo/hermes/engine/twitter/service.py
@@ -33,7 +33,9 @@ class Service(org.maemo.hermes.engine.service.Service):
 
     # -----------------------------------------------------------------------
     def process_friends(self):
-        for tweeter in self._get_tweeters():
+        tweeters = self._get_tweeters()
+        #print "got ", len(tweeters), " tweeters from twitter"
+        for tweeter in tweeters:
             key = canonical(tweeter.name)
             url = 'http://twitter.com/%s' % (tweeter.screen_name)
             friend = Friend(tweeter.name)
diff --git a/package/src/org/maemo/hermes/gui/gtkui.py b/package/src/org/maemo/hermes/gui/gtkui.py
index 3c09a5f..606d7d0 100644
--- a/package/src/org/maemo/hermes/gui/gtkui.py
+++ b/package/src/org/maemo/hermes/gui/gtkui.py
@@ -79,7 +79,7 @@ class HermesGUI(WimpWorks):
                     services.append(provider.service(self))
                     
                 hermes = Hermes(services, self.progress)
-                hermes.run_alt(force)
+                hermes.run(force)
                 gobject.idle_add(self.open_summary, hermes)
         
             except urllib2.HTTPError, e:
-- 
1.7.9.5