Merge lp:~davidc3/unity-lens-photos/fb-deleted-photos-previews into lp:unity-lens-photos

[David Callé]

Catch errors when previewing FB deleted photos, fallback on existing result data

Catch errors when previewing FB deleted photos, fallback on existing result data

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes) : yes
 * Did you build your software in a clean sbuild/pbuilder chroot or ppa? : yes
 * Has your component "TestPlan” been executed successfully on desktop? : yes
 * If you changed the packaging (debian), did you subscribe a core-dev to this MP? : N/A
 * If you changed the UI, did you subscribe the design-reviewers to this MP? : N/A
 * What components might get impacted by your changes? : none

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:161
http://jenkins.qa.ubuntu.com/job/unity-lens-photos-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-photos-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-photos-trusty-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-photos-trusty-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-lens-photos-ci/4/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

Looks fine...

* Are any changes against your component pending/needed to land the MP under review in a functional state and are those called out explicitly by the submitter?

No pending changes.

 * Did you do exploratory testing related to the component you own with the MP changeset included?

No.

 * Has the submitter requested review by all the relevant teams/reviewres?

Yes.

 * If you are the reviewer owning the component the MP is against, have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

Yes.

review: Approve

=== modified file 'src/unity_facebook_daemon.py'
--- src/unity_facebook_daemon.py	2014-03-18 10:25:30 +0000
+++ src/unity_facebook_daemon.py	2014-03-18 10:37:57 +0000
@@ -524,30 +524,34 @@
         else:
             fql = {'q':'{"query1":"SELECT images, owner, link, caption, created, place_id, album_object_id, position FROM photo WHERE object_id=%s","query2":"SELECT subject, text FROM photo_tag WHERE object_id=%s","query3":"SELECT username, name FROM user WHERE uid IN (SELECT owner FROM #query1)","query4":"SELECT name FROM place WHERE page_id IN (SELECT place_id FROM #query1)","query5":"SELECT name, size FROM album WHERE object_id IN (SELECT album_object_id FROM #query1)"}' % (oid, oid)}
         url = 'https://graph.facebook.com/fql?%s&access_token=%s' % (urllib.parse.urlencode(fql), self._auth_token)
-        raw_results = urllib.request.urlopen(url).read ()
-        meta = json.loads(raw_results.decode("utf8"))
+        try:
+            raw_results = urllib.request.urlopen(url).read ()
+            meta = json.loads(raw_results.decode("utf8"))
+        except urllib.error.HTTPError:
+            meta = None
         link, caption, image, date = None, None, None, None
         subject, tags, album, position = None, None, None, None
         place, name, username, album_size = None, None, None, None
         tag_list = []
-        for m in meta['data'][0]['fql_result_set']:
-            date = datetime.datetime.fromtimestamp(m['created']).strftime('%d %b %Y')
-            link = m['link']
-            caption = m['caption']
-            position = m['position']
-            image = m['images'][0]['source']
-        for m in meta['data'][1]['fql_result_set']:
-            if m['text'] not in tag_list:
-                tag_list.append(m['text'])
-            tags = ", ".join(tag_list)
-        for m in meta['data'][2]['fql_result_set']:
-            username = m['username']
-            name = m['name']
-        for m in meta['data'][3]['fql_result_set']:
-            place = m['name']
-        for m in meta['data'][4]['fql_result_set']:
-            album = m['name']
-            album_size = m['size']
+        if meta:
+            for m in meta['data'][0]['fql_result_set']:
+                date = datetime.datetime.fromtimestamp(m['created']).strftime('%d %b %Y')
+                link = m['link']
+                caption = m['caption']
+                position = m['position']
+                image = m['images'][0]['source']
+            for m in meta['data'][1]['fql_result_set']:
+                if m['text'] not in tag_list:
+                    tag_list.append(m['text'])
+                tags = ", ".join(tag_list)
+            for m in meta['data'][2]['fql_result_set']:
+                username = m['username']
+                name = m['name']
+            for m in meta['data'][3]['fql_result_set']:
+                place = m['name']
+            for m in meta['data'][4]['fql_result_set']:
+                album = m['name']
+                album_size = m['size']
         return [link,caption, image, subject, tags, username, name, place, date, album, position, album_size]
 
 if __name__ == '__main__':