Fix phone number support, add URLs and birthdays from LinkedIn.

[hermes] / package / src / org / maemo / hermes / engine / linkedin / api.py

diff --git a/package/src/org/maemo/hermes/engine/linkedin/api.py b/package/src/org/maemo/hermes/engine/linkedin/api.py
index 6eaf200..101a526 100644 (file)
--- a/package/src/org/maemo/hermes/engine/linkedin/api.py
+++ b/package/src/org/maemo/hermes/engine/linkedin/api.py
@@ -1,13 +1,16 @@
+import re
 import httplib
 import gnome.gconf
 from oauth import oauth
 from xml.dom.minidom import parseString
+from org.maemo.hermes.engine.phonenumber import PhoneNumber
 from org.maemo.hermes.engine.friend import Friend
 
 class LinkedInApi():
     """LinkedIn API for Hermes.
                 
        Copyright (c) Fredrik Wendt <fredrik@wendt.se> 2010.
+       Copyright (c) Andrew Flegg <andrew@bleb.org> 2010.
        Released under the Artistic Licence."""
        
     GCONF_API_KEY = '/apps/maemo/hermes/linkedin_key'
@@ -17,7 +20,7 @@ class LinkedInApi():
     
     LI_SERVER = "api.linkedin.com"
     LI_API_URL = "https://api.linkedin.com"
-    LI_CONN_API_URL = LI_API_URL + "/v1/people/~/connections"
+    LI_CONN_API_URL = LI_API_URL + "/v1/people/~/connections:(id,first-name,last-name,picture-url,site-standard-profile-request:(url),date-of-birth,main-address,location:(country:(code)),phone-numbers,member-url-resources)"
     LI_PROFILE_API_URL = LI_API_URL + "/v1/people/~"
 
     REQUEST_TOKEN_URL = LI_API_URL + "/uas/oauth/requestToken"
@@ -95,9 +98,10 @@ class LinkedInApi():
     # -----------------------------------------------------------------------
     def _parse_dom(self, dom):
         def get_first_tag(node, tagName):
-            tags = node.getElementsByTagName(tagName)
-            if tags and len(tags) > 0:
-                return tags[0]
+            if node:
+                tags = node.getElementsByTagName(tagName)
+                if tags and len(tags) > 0:
+                    return tags[0]
         
         def extract(node, tagName):
             tag = get_first_tag(node, tagName)
@@ -107,8 +111,45 @@ class LinkedInApi():
         def extract_public_url(node):
             tag = get_first_tag(node, 'site-standard-profile-request')
             if tag:
-                url = extract(tag, 'url')
-                return url.replace("&amp;", "&")
+                url = extract(tag, 'url').replace("&amp;", "&")
+                return re.sub('[?&](auth|trk)\w*=[^&]*', '', url)
+            
+        def extract_phone_numbers(node):
+            country = extract(get_first_tag(node, 'country'), 'code')
+            tag = get_first_tag(node, 'phone-numbers')
+            numbers = []
+            for element in tag.childNodes:
+                if element.nodeName != 'phone-number':
+                    continue
+                 
+                phone_type = extract(element, 'phone-type')
+                device = phone_type == 'mobile' and phone_type or None
+                type = phone_type in set(['home', 'work']) and phone_type or None
+                
+                number = PhoneNumber(extract(element, 'phone-number'), device = device, type = type, country = country)
+                numbers.append(number)
+            return numbers
+        
+        def extract_urls(node):
+            tag = get_first_tag(node, 'member-url-resources')
+            urls = []
+            for element in tag.getElementsByTagName('url'):
+                urls.append(element.firstChild.nodeValue.replace("&amp;", "&"))
+            return urls
+        
+        def extract_birthday(node):
+            tag = get_first_tag(node, 'date-of-birth')
+            bday = None
+            if tag:
+                month = extract(tag, 'month')
+                day   = extract(tag, 'day')
+                year  = extract(tag, 'year')
+                if month and day:
+                    bday = '%s/%s' % (extract(tag, 'month'), extract(tag, 'day'))
+                    if year:
+                        bday = '%s/%s' % (bday, year)
+                    
+            return bday
         
         # look for errors
         errors = dom.getElementsByTagName('error')
@@ -123,23 +164,29 @@ class LinkedInApi():
         friends = []
         people = dom.getElementsByTagName('person')
         for p in people:
-            try:
-                fn = extract(p, 'first-name')
-                ln = extract(p, 'last-name')
-                photo_url = extract(p, 'picture-url')
-                id = extract(p, 'id')
-                public_url = extract_public_url(p)
-
-                name = fn + " " + ln
-                friend = Friend(name)
-                friend.add_url(public_url)
-                if photo_url:
-                    friend.set_photo_url(photo_url)
-                
-                friends.append(friend)
+            fn = extract(p, 'first-name')
+            ln = extract(p, 'last-name')
+            photo_url = extract(p, 'picture-url')
+            id = extract(p, 'id')
+            public_url = extract_public_url(p)
+            bday = extract_birthday(p)
 
-            except:
-                pass
+            name = fn + " " + ln
+            friend = Friend(name)
+            friend.add_url(public_url)
+            if photo_url:
+                friend.set_photo_url(photo_url)
+                
+            if bday:
+                friend.set_birthday_date(bday)
+                
+            for number in extract_phone_numbers(p):
+                friend.add_phone(number)
+                
+            for url in extract_urls(p):
+                friend.add_url(url)
+            
+            friends.append(friend)
 
         return friends
 
@@ -158,6 +205,9 @@ class LinkedInApi():
         try:
             token = oauth.OAuthToken.from_string(response)
         except Exception, e:
+            import traceback
+            traceback.print_exc()
+            print response
             raise Exception("Authorization failure - failed to get request token")
         return token
 
@@ -184,8 +234,8 @@ class LinkedInApi():
         connection.request(oauth_request.http_method, self.ACCESS_TOKEN_URL, headers=oauth_request.to_header()) 
         response = connection.getresponse()
         token_str = response.read()
-        if "ouath_problem" in token_str:
-            raise Exception("Authorization failure - failed to get access token")
+        if 'oauth_problem' in token_str:
+            raise Exception("Authorization failure - failed to get access token (" + token_str + ")")
         self._store_access_token_in_gconf(token_str)
         return oauth.OAuthToken.from_string(token_str)
 
@@ -201,7 +251,7 @@ class LinkedInApi():
         except Exception, e:
             import traceback
             traceback.print_exc()
-            raise Exception("LinkedIn authorization failed, try again (" + e + ")")
+            raise Exception("LinkedIn authorization failed, try again")
 
 
     # -----------------------------------------------------------------------