64px version for custom icons (bug 641121)

apps/addons/models.py

@@ -497,7 +497,7 @@ class Addon(amo.models.OnChangeMixin, amo.models.ModelBase):
                                      icon_type_split[1], size)
         else:
             return settings.ADDON_ICON_URL % (
-                    self.id, int(time.mktime(self.modified.timetuple())))
+                    self.id, size, int(time.mktime(self.modified.timetuple())))
 
     def update_status(self, using=None):
         if self.status == amo.STATUS_NULL:

apps/addons/tests/test_models.py

@@ -206,7 +206,7 @@ class TestAddonModels(test_utils.TestCase):
         3. Test for default non-THEME icon.
         """
         a = Addon.objects.get(pk=3615)
-        expected = (settings.ADDON_ICON_URL % (3615, 0)).rstrip('/0')
+        expected = (settings.ADDON_ICON_URL % (3615, 32, 0)).rstrip('/0')
         assert a.icon_url.startswith(expected)
         a = Addon.objects.get(pk=6704)
         a.icon_type = None
@@ -1043,7 +1043,7 @@ class TestFlushURLs(test_utils.TestCase):
 
     def setUp(self):
         settings.ADDON_ICON_URL = (
-            '%s/%s/%s/images/addon_icon/%%d/?modified=%%s' % (
+            '%s/%s/%s/images/addon_icon/%%d-%%d.png?modified=%%s' % (
             settings.STATIC_URL, settings.LANGUAGE_CODE, settings.DEFAULT_APP))
         settings.PREVIEW_THUMBNAIL_URL = (settings.STATIC_URL +
             '/img/uploads/previews/thumbs/%s/%d.png?modified=%d')

apps/api/tests/test_legacy.py

@@ -198,7 +198,7 @@ class APITest(TestCase):
         self.assertContains(response, "<summary>Delicious Bookmarks is the")
         self.assertContains(response, "<description>This extension integrates")
 
-        icon_url = settings.ADDON_ICON_URL % (3615, '')
+        icon_url = settings.ADDON_ICON_URL % (3615, 32, '')
         self.assertContains(response, "<icon>" + icon_url)
         self.assertContains(response, "<application>")
         self.assertContains(response, "<name>Firefox</name>")

apps/devhub/tests/test_views.py

@@ -1963,7 +1963,8 @@ class TestSubmitStep4(TestSubmitBase):
 
     def setUp(self):
         self.old_addon_icon_url = settings.ADDON_ICON_URL
-        settings.ADDON_ICON_URL = "%s/%s/%s/images/addon_icon/%%d/%%s" % (
+        url_string = "%s/%s/%s/images/addon_icon/%%d-%%d.png?%%s"
+        settings.ADDON_ICON_URL = url_string % (
             settings.STATIC_URL, settings.LANGUAGE_CODE, settings.DEFAULT_APP)
         super(TestSubmitStep4, self).setUp()
         SubmitStep.objects.create(addon_id=3615, step=5)
@@ -2046,8 +2047,8 @@ class TestSubmitStep4(TestSubmitBase):
 
         addon = self.get_addon()
 
-        eq_('/'.join(addon.get_icon_url(64).split('/')[-3:-1]),
-            'addon_icon/%s' % addon.id)
+        addon_url = addon.get_icon_url(64).split('?')[0]
+        assert addon_url.endswith('images/addon_icon/%s-64.png' % addon.id)
 
         eq_(data['icon_type'], 'image/png')
 
@@ -2078,8 +2079,8 @@ class TestSubmitStep4(TestSubmitBase):
         self.client.post(self.url, data_formset)
         addon = self.get_addon()
 
-        eq_('/'.join(addon.get_icon_url(64).split('/')[-3:-1]),
-            'addon_icon/%s' % addon.id)
+        addon_url = addon.get_icon_url(64).split('?')[0]
+        assert addon_url.endswith('images/addon_icon/%s-64.png' % addon.id)
 
         eq_(data['icon_type'], 'image/png')
 

settings.py

@@ -537,7 +537,7 @@ PREVIEW_FULL_PATH = (PREVIEWS_PATH + '/full/%s/%d.png')
 STATIC_URL = SITE_URL
 ADDON_ICONS_DEFAULT_URL = MEDIA_URL + '/img/addon-icons'
 ADDON_ICON_BASE_URL = MEDIA_URL + 'img/amo2009/icons/'
-ADDON_ICON_URL = "%s/%s/%s/images/addon_icon/%%d.png?modified=%%s" % (
+ADDON_ICON_URL = "%s/%s/%s/images/addon_icon/%%d-%%d.png?modified=%%s" % (
         STATIC_URL, LANGUAGE_CODE, DEFAULT_APP)
 PREVIEW_THUMBNAIL_URL = (STATIC_URL +
         '/img/uploads/previews/thumbs/%s/%d.png?modified=%d')