Merge lp:~robru/friends/fix-flickr-images into lp:friends

[Robert Bruce Park]

Correctly generate flickr photo URLs. (LP: #1159979)

Alright Ken, this definitely de-cripples Flickr, definitely important to get this in for raring otherwise our flickr users are gonna hate us ;-)

Tested on live data to make sure it works for real, and also updated tests to reflect what should really be going on. Having Gwibber run for real on live data sure makes it a lot more obvious what works and what doesn't! It's like I've been flying blind all this time...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:170
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~robru/friends/fix-flickr-images/+merge/155371/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/friends-ci/11/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/friends-raring-amd64-ci/11

Click here to trigger a rebuild:
http://s-jenkins:8080/job/friends-ci/11/rebuild

review: Needs Fixing (continuous-integration)

[Ken VanDine (ken-vandine)]

Much better!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'friends/protocols/flickr.py'
--- friends/protocols/flickr.py	2013-03-12 21:08:21 +0000
+++ friends/protocols/flickr.py	2013-03-25 23:36:19 +0000
@@ -44,8 +44,8 @@
 # http://www.flickr.com/services/api/misc.buddyicons.html
 FARM = 'http://farm{farm}.static.flickr.com/{server}/'
 BUDDY_ICON_URL = FARM + 'buddyicons/{nsid}.jpg'
-IMAGE_URL = FARM + '{nsid}_{secret}_{type}.jpg'
-IMAGE_PAGE_URL = 'http://www.flickr.com/photos/{owner}/{nsid}'
+IMAGE_URL = FARM + '{photo}_{secret}_{type}.jpg'
+IMAGE_PAGE_URL = 'http://www.flickr.com/photos/{owner}/{photo}'
 PEOPLE_URL = 'http://www.flickr.com/people/{owner}'
 
 
@@ -121,6 +121,11 @@
             # Pre-calculate some values to publish.
             username = data.get('username', '')
             ownername = data.get('ownername', '')
+            photo_id = data.get('id')
+
+            if photo_id is None:
+                # Can't do anything without this, really.
+                continue
 
             # Icons.
             icon_farm = data.get('iconfarm')
@@ -132,7 +137,7 @@
             if None not in (icon_farm, icon_server, owner):
                 icon_uri = Avatar.get_image(BUDDY_ICON_URL.format(
                     farm=icon_farm, server=icon_server, nsid=owner))
-                url = PEOPLE_URL.format(owner=owner)
+                url = IMAGE_PAGE_URL.format(owner=owner, photo=photo_id)
 
             # Calculate the ISO 8601 UTC time string.
             try:
@@ -144,17 +149,20 @@
             farm = data.get('farm')
             server = data.get('server')
             secret = data.get('secret')
-            img_url = ''
-            img_src = ''
-            img_thumb = ''
+            img_src, img_thumb = '', ''
             if None not in (farm, server, secret):
-                args = dict(farm=farm, server=server, nsid=owner, secret=secret)
-                img_url = IMAGE_URL.format(type='b', **args)
+                args = dict(
+                    farm=farm,
+                    server=server,
+                    photo=photo_id,
+                    secret=secret,
+                    )
                 img_src = IMAGE_URL.format(type='m', **args)
                 img_thumb = IMAGE_URL.format(type='t', **args)
 
             self._publish(
-                message_id=data.get('id', ''),
+                message_id=photo_id,
+                message=data.get('title', ''),
                 stream='images',
                 sender=ownername,
                 sender_id=owner,
@@ -163,8 +171,7 @@
                 url=url,
                 from_me=from_me,
                 timestamp=timestamp,
-                link_caption=data.get('title', ''),
-                link_url=img_url,
+                link_url=url,
                 link_picture=img_src,
                 link_icon=img_thumb,
                 latitude=data.get('latitude', 0.0),
@@ -204,7 +211,7 @@
         else:
             destination_url = IMAGE_PAGE_URL.format(
                 owner=self._account.user_name,
-                nsid=post_id,
+                photo=post_id,
                 )
             self._publish(
                 from_me=True,
 
=== modified file 'friends/tests/test_flickr.py'
--- friends/tests/test_flickr.py	2013-03-20 23:57:40 +0000
+++ friends/tests/test_flickr.py	2013-03-25 23:36:19 +0000
@@ -169,18 +169,18 @@
              'raise my voice',
              True,
              '2013-03-12T19:51:42Z',
-             '',
+             'Chocolate chai #yegcoffee',
              GLib.get_user_cache_dir() +
              '/friends/avatars/7b30ff0140dd9b80f2b1782a2802c3ce785fa0ce',
-             'http://www.flickr.com/people/47303164@N00',
+             'http://www.flickr.com/photos/47303164@N00/8552892154',
              0,
              False,
-             'http://farm9.static.flickr.com/8378/47303164@N00_a_m.jpg',
-             '',
-             'http://farm9.static.flickr.com/8378/47303164@N00_a_b.jpg',
-             '',
-             'Chocolate chai #yegcoffee',
-             'http://farm9.static.flickr.com/8378/47303164@N00_a_t.jpg',
+             'http://farm9.static.flickr.com/8378/8552892154_a_m.jpg',
+             '',
+             'http://www.flickr.com/photos/47303164@N00/8552892154',
+             '',
+             '',
+             'http://farm9.static.flickr.com/8378/8552892154_a_t.jpg',
              '',
              0.0,
              0.0,
@@ -197,18 +197,18 @@
              'Nelson Webb',
              True,
              '2013-03-12T13:54:10Z',
-             '',
+             'St. Michael - The Archangel',
              GLib.get_user_cache_dir() +
              '/friends/avatars/cae2939354a33fea5f008df91bb8e25920be5dc3',
-             'http://www.flickr.com/people/27204141@N05',
+             'http://www.flickr.com/photos/27204141@N05/8550829193',
              0,
              False,
-             'http://farm9.static.flickr.com/8246/27204141@N05_e_m.jpg',
-             '',
-             'http://farm9.static.flickr.com/8246/27204141@N05_e_b.jpg',
-             '',
-             'St. Michael - The Archangel',
-             'http://farm9.static.flickr.com/8246/27204141@N05_e_t.jpg',
+             'http://farm9.static.flickr.com/8246/8550829193_e_m.jpg',
+             '',
+             'http://www.flickr.com/photos/27204141@N05/8550829193',
+             '',
+             '',
+             'http://farm9.static.flickr.com/8246/8550829193_e_t.jpg',
              '',
              53.833156,
              -112.330784,