Merge lp:~robru/friends/no-avatar-downsample into lp:friends

[Robert Bruce Park]

Remove avatar downsampling code; always cache the largest possible image.

[lp:~robru/friends/no-avatar-downsample]

152. By Robert Bruce Park on 2013-02-27

Keep both original sizes and 100px scaled sizes.

This stores the original size at the traditional URI, and then appends
'.100px' to the filename for the 100px-scaled copy. With test coverage.

153. By Robert Bruce Park on 2013-02-27

Make test check both images.

[Ken VanDine (ken-vandine)]

We should also bump up the size of the original, for example with facebook we currently request type=large, which returns a 200x200 avatar. You can specify width and height requested and facebook will fetch the image as large as possible up to the requested size. For example:

This returns a 200x200 avatar:
https://graph.facebook.com/shaverm/picture?type=large

This returns a 256x256 avatar:
https://graph.facebook.com/shaverm/picture?width=840&height=840

For reference:
https://developers.facebook.com/docs/reference/api/using-pictures/

review: Needs Fixing

[lp:~robru/friends/no-avatar-downsample]

154. By Robert Bruce Park on 2013-02-27

Force a larger Facebook avatar.

=== modified file 'friends/protocols/facebook.py'
--- friends/protocols/facebook.py	2013-02-26 18:44:05 +0000
+++ friends/protocols/facebook.py	2013-02-27 19:06:21 +0000
@@ -101,7 +101,7 @@
             args['sender_id'] = sender_id = from_record.get('id', '')
             args['url'] = PERMALINK.format(id=sender_id)
             args['icon_uri'] = Avatar.get_image(
-                API_BASE.format(id=sender_id) + '/picture?type=large')
+                API_BASE.format(id=sender_id) + '/picture?width=840&height=840')
             args['sender_nick'] = from_record.get('name', '')
             args['from_me'] = (sender_id == self._account.user_id)
 

=== modified file 'friends/tests/test_avatars.py'
--- friends/tests/test_avatars.py	2013-02-05 01:11:35 +0000
+++ friends/tests/test_avatars.py	2013-02-27 19:06:21 +0000
@@ -84,7 +84,8 @@
             self.assertEqual(os.listdir(cache_dir),
                             # hashlib.sha1('http://example.com'
                             # .encode('utf-8')).hexdigest()
-                            ['89dce6a446a69d6b9bdc01ac75251e4c322bcdff'])
+                            ['89dce6a446a69d6b9bdc01ac75251e4c322bcdff',
+                             '89dce6a446a69d6b9bdc01ac75251e4c322bcdff.100px'])
 
     @mock.patch('friends.utils.http.Soup.Message',
                 FakeSoupMessage('friends.tests.data', 'ubuntu.png'))
@@ -118,6 +119,9 @@
             path = Avatar.get_image('http://example.com')
         # The image must have been downloaded at least once.
         pixbuf = GdkPixbuf.Pixbuf.new_from_file(path)
+        self.assertEqual(pixbuf.get_height(), 285)
+        self.assertEqual(pixbuf.get_width(), 285)
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file(path + '.100px')
         self.assertEqual(pixbuf.get_height(), 100)
         self.assertEqual(pixbuf.get_width(), 100)
         # Confirm that the resulting cache image is actually a PNG.

=== modified file 'friends/tests/test_facebook.py'
--- friends/tests/test_facebook.py	2013-02-26 19:13:31 +0000
+++ friends/tests/test_facebook.py	2013-02-27 19:06:21 +0000
@@ -119,7 +119,8 @@
             False,
             '2012-09-26T17:16:00Z',
             'OK Don...10) Headlong Flight',
-            '',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/b688c8def0455d4a3853d5fcdfaf0708645cfd3e',
             'https://www.facebook.com/809',
             0.0,
             False,
@@ -138,7 +139,8 @@
             False,
             '2012-09-26T17:34:00Z',
             'Rush takes off to the Great White North',
-            '',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/7d1a70e6998f4a38954e93ca03d689463f71d63b',
             'https://www.facebook.com/117402931676347',
             16.0,
             False,
@@ -157,7 +159,8 @@
             False,
             '2012-09-26T17:49:06Z',
             'http://www2.gibson.com/Alex-Lifeson-0225-2011.aspx',
-            '',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/7d1a70e6998f4a38954e93ca03d689463f71d63b',
             'https://www.facebook.com/117402931676347',
             27.0,
             False,
@@ -281,7 +284,8 @@
             timestamp='2012-11-06T13:49:08Z',
             sender_id=None,
             from_me=True,
-            icon_uri='',
+            icon_uri=GLib.get_user_cache_dir() +
+            '/friends/avatars/d49d72a384d50adf7c736ba27ca55bfa9fa5782d',
             message='This is Ubuntu!',
             message_id='234125',
             sender=None)

=== modified file 'friends/tests/test_flickr.py'
--- friends/tests/test_flickr.py	2013-02-19 17:00:41 +0000
+++ friends/tests/test_flickr.py	2013-02-27 19:06:21 +0000
@@ -22,7 +22,7 @@
 
 import unittest
 
-from gi.repository import Dee
+from gi.repository import GLib, Dee
 
 from friends.errors import AuthorizationError, FriendsError
 from friends.protocols.flickr import Flickr
@@ -218,7 +218,8 @@
              False,
              '',
              '',
-             '',
+             GLib.get_user_cache_dir() +
+             '/friends/avatars/b913501d6face9d13f3006b731a711b596d23099',
              'http://www.flickr.com/people/789',
              0.0,
              False,

=== modified file 'friends/tests/test_twitter.py'
--- friends/tests/test_twitter.py	2013-02-05 01:11:35 +0000
+++ friends/tests/test_twitter.py	2013-02-27 19:06:21 +0000
@@ -23,7 +23,7 @@
 
 import unittest
 
-from gi.repository import Dee
+from gi.repository import GLib, Dee
 from urllib.error import HTTPError
 
 from friends.protocols.twitter import RateLimiter, Twitter
@@ -130,7 +130,9 @@
         expected = [
             [[['twitter', '1234', '240558470661799936']],
              'messages', 'OAuth Dancer', '119476949', 'oauth_dancer', False,
-             '2012-08-28T21:16:23Z', 'just another test', '',
+             '2012-08-28T21:16:23Z', 'just another test',
+             GLib.get_user_cache_dir() +
+             '/friends/avatars/ded4ba3c00583ee511f399d0b2537731ca14c39d',
              'https://twitter.com/oauth_dancer/status/240558470661799936',
              0.0, False, '', '', '', '', '', '',
              ],
@@ -138,14 +140,18 @@
              'messages', 'Raffi Krikorian', '8285392', 'raffi', False,
              '2012-08-28T21:08:15Z', 'lecturing at the "analyzing big data ' +
              'with twitter" class at @cal with @othman  http://t.co/bfj7zkDJ',
-             '', 'https://twitter.com/raffi/status/240556426106372096',
+             GLib.get_user_cache_dir() +
+             '/friends/avatars/0219effc03a3049a622476e6e001a4014f33dc31',
+             'https://twitter.com/raffi/status/240556426106372096',
              0.0, False, '', '', '', '', '', '',
              ],
             [[['twitter', '1234', '240539141056638977']],
              'messages', 'Taylor Singletary', '819797', 'episod', False,
              '2012-08-28T19:59:34Z',
              'You\'d be right more often if you thought you were wrong.',
-             '', 'https://twitter.com/episod/status/240539141056638977',
+             GLib.get_user_cache_dir() +
+             '/friends/avatars/0c829cb2934ad76489be21ee5e103735d9b7b034',
+             'https://twitter.com/episod/status/240539141056638977',
              0.0, False, '', '', '', '', '', '',
              ],
             ]
@@ -176,7 +182,9 @@
         expected_row = [
             [['twitter', '1234', '240558470661799936']],
             'messages', 'OAuth Dancer', '119476949', 'oauth_dancer', True,
-            '2012-08-28T21:16:23Z', 'just another test', '',
+            '2012-08-28T21:16:23Z', 'just another test',
+            GLib.get_user_cache_dir() +
+            '/friends/avatars/ded4ba3c00583ee511f399d0b2537731ca14c39d',
             'https://twitter.com/oauth_dancer/status/240558470661799936',
             0.0, False, '', '', '', '', '', '',
             ]

=== modified file 'friends/utils/avatar.py'
--- friends/utils/avatar.py	2013-02-20 13:08:27 +0000
+++ friends/utils/avatar.py	2013-02-27 19:06:21 +0000
@@ -69,15 +69,20 @@
         if size == 0:
             log.debug('Getting: {}'.format(url))
             image_data = Downloader(url).get_bytes()
+
+            # Save original size at canonical URI
+            with open(local_path, 'wb') as fd:
+                fd.write(image_data)
+
+            # Append '.100px' to filename and scale image there.
             input_stream = Gio.MemoryInputStream.new_from_data(
                 image_data, None)
             try:
                 pixbuf = GdkPixbuf.Pixbuf.new_from_stream_at_scale(
                     input_stream, 100, 100, True, None)
-                pixbuf.savev(local_path, 'png', [], [])
+                pixbuf.savev(local_path + '.100px', 'png', [], [])
             except GLib.GError:
-                log.error('Failed to save image: {}'.format(url))
-                return ''
+                log.error('Failed to scale image: {}'.format(url))
         return local_path
 
     @staticmethod