Merge lp:~jamestait/gwibber/fix-845374 into lp:gwibber

[James Tait]

Use the SHA1 hash of the avatar URL instead of simply stripping the slashes, to avoid the resulting filename being too long to be created on ecryptfs volumes. Fixes #845374.

[Ken VanDine (ken-vandine)]

Looks great, thanks!

review: Approve

=== modified file 'gwibber/microblog/util/resources.py'
--- gwibber/microblog/util/resources.py	2012-02-13 20:39:02 +0000
+++ gwibber/microblog/util/resources.py	2012-03-12 23:57:17 +0000
@@ -5,6 +5,7 @@
 """
 
 import os, sys
+from hashlib import sha1
 from os import makedirs, remove, environ
 from os.path import join, isdir, realpath, exists
 import Image
@@ -86,7 +87,7 @@
   avatar_cache_dir = realpath(join(CACHE_BASE_DIR, "gwibber", "avatars"))
   if not isdir(avatar_cache_dir):
     makedirs(avatar_cache_dir)
-  avatar_cache_image = join(avatar_cache_dir, url.replace("/",""))
+  avatar_cache_image = join(avatar_cache_dir, sha1(url).hexdigest())
 
   if not exists(avatar_cache_image) or len(open(avatar_cache_image, "r").read()) < 1:
     logger.debug("Downloading avatar %s", url)
 
=== modified file 'libgwibber-gtk/stream-view-tile.vala'
--- libgwibber-gtk/stream-view-tile.vala	2012-03-09 19:31:03 +0000
+++ libgwibber-gtk/stream-view-tile.vala	2012-03-12 23:57:17 +0000
@@ -916,7 +916,7 @@
           b.add (avatar);
           avatar.show ();
 
-          var cimage = Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", url.replace("/",""));
+          var cimage = Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", GLib.Checksum.compute_for_string(GLib.ChecksumType.SHA1, url));
           t = "png";
           if (cimage.has_suffix ("JPG") || cimage.has_suffix ("jpeg") || cimage.has_suffix ("jpg"))
             t = "jpeg";
 
=== modified file 'libgwibber/service.vala'
--- libgwibber/service.vala	2012-02-23 08:59:27 +0000
+++ libgwibber/service.vala	2012-03-12 23:57:17 +0000
@@ -467,7 +467,7 @@
         */
         public string? avatar_path(string url) throws GLib.Error
         {
-            string _avatar_cache_image = Path.build_path(Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", url.replace("/",""));
+            string _avatar_cache_image = Path.build_path(Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", GLib.Checksum.compute_for_string(GLib.ChecksumType.SHA1, url));
             var file = File.new_for_path (_avatar_cache_image);
             if (file.query_exists ())
               return _avatar_cache_image;
 
=== modified file 'libgwibber/utils.vala'
--- libgwibber/utils.vala	2012-02-23 08:58:10 +0000
+++ libgwibber/utils.vala	2012-03-12 23:57:17 +0000
@@ -92,7 +92,7 @@
 
         public string? avatar_path(string url)
         {
-            string _avatar_cache_image = Path.build_path(Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", url.replace("/",""));
+            string _avatar_cache_image = Path.build_path(Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", GLib.Checksum.compute_for_string(GLib.ChecksumType.SHA1, url));
             var file = File.new_for_path (_avatar_cache_image);
             if (file.query_exists ())
               return _avatar_cache_image;
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-02-15 08:11:57 +0000
+++ tests/Makefile.am	2012-03-12 23:57:17 +0000
@@ -23,7 +23,8 @@
 EXTRA_DIST = \
 	service-start.in \
 	create-account.in \
-	$(top_srcdir)/tests/data/gwibber/avatars/http*test.comavatar \
+	$(top_srcdir)/tests/data/gwibber/avatars/0ce3002170fed9a8b1fce046d62f9110c926c449 \
+	$(top_srcdir)/tests/data/gwibber/avatars/8d78e9d550c70f3a73a5aefeda69322aef31de4f \
 	$(top_srcdir)/tests/data/resources/gwibber.stream_model \
 	$(top_srcdir)/tests/plugins/test/__init__.py 
 
 
=== renamed file 'tests/data/gwibber/avatars/http:test.comavatar' => 'tests/data/gwibber/avatars/0ce3002170fed9a8b1fce046d62f9110c926c449'
=== added file 'tests/data/gwibber/avatars/8d78e9d550c70f3a73a5aefeda69322aef31de4f'
=== modified file 'tests/python/utils/__init__.py'
--- tests/python/utils/__init__.py	2012-01-05 17:10:30 +0000
+++ tests/python/utils/__init__.py	2012-03-12 23:57:17 +0000
@@ -1,5 +1,6 @@
 import os, unittest, gettext, mx.DateTime
 from gi.repository import Gwibber
+from hashlib import sha1
 
 class TimeStringTestCase (unittest.TestCase):
     def setUp (self):
@@ -46,7 +47,7 @@
     def test_avatar_path (self):
         url = "http://test.com/avatar"
         avatar_path = self.utils.avatar_path (url)
-        self.assertEqual (avatar_path, os.path.join (os.environ["XDG_CACHE_HOME"], "gwibber", "avatars",  url.replace ("/","")))
+        self.assertEqual (avatar_path, os.path.join (os.environ["XDG_CACHE_HOME"], "gwibber", "avatars", sha1(url).hexdigest()))
 
 test_cases = (TimeStringTestCase, AvatarPathTestCase)
 
 
=== modified file 'tests/vala/test-utils.vala'
--- tests/vala/test-utils.vala	2011-12-08 02:11:00 +0000
+++ tests/vala/test-utils.vala	2012-03-12 23:57:17 +0000
@@ -98,7 +98,11 @@
       var utils = new Gwibber.Utils ();
       string url = "http://test.com/avatar";
       string avatar_path = utils.avatar_path (url);
-      assert (avatar_path == Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", url.replace ("/","")));
+      assert (avatar_path == Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", GLib.Checksum.compute_for_string(GLib.ChecksumType.SHA1, url)));
+      url = "http://test.com/this_is_a_very_long_avatar_url_that_should_cause_test_failures_as_per_bug_845374_which_is_scheduled_to_be_fixed_in_a_later_release_but_hopefully_will_be_patched_before_then";
+      stdout.printf(GLib.Checksum.compute_for_string(GLib.ChecksumType.SHA1, url, url.length));
+      avatar_path = utils.avatar_path (url);
+      assert (avatar_path == Path.build_path (Path.DIR_SEPARATOR_S, Environment.get_user_cache_dir(), "gwibber/avatars", GLib.Checksum.compute_for_string(GLib.ChecksumType.SHA1, url)));
     }
   }
 }