From d6c8b130411e3126426da58e2d8f10311a4edae2 Mon Sep 17 00:00:00 2001
From: John Garland <johnnybg+deluge@gmail.com>
Date: Wed, 5 May 2010 03:19:54 +1000
Subject: [PATCH] Handle trackers with incorrect / missing icon mimetypes

---
 deluge/ui/tracker_icons.py  |  11 +++++++++--
 tests/openbt.png            | Bin 0 -> 673 bytes
 tests/test_tracker_icons.py |  14 +++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 tests/openbt.png

diff --git a/deluge/ui/tracker_icons.py b/deluge/ui/tracker_icons.py
index 5a6aa3b68..b079738f3 100644
--- a/deluge/ui/tracker_icons.py
+++ b/deluge/ui/tracker_icons.py
@@ -424,8 +424,15 @@ class FaviconParser(HTMLParser):
                     href = value
                 elif attr == "type":
                     type = value
-            if href and type:
-                self.icons.append((href, type))
+            if href:
+                try:
+                    mimetype = extension_to_mimetype(href.rpartition('.')[2])
+                except KeyError:
+                    pass
+                else:
+                    type = mimetype
+                if type:
+                    self.icons.append((href, type))
 
     def handle_endtag(self, tag):
         if tag == "head":
diff --git a/tests/openbt.png b/tests/openbt.png
new file mode 100644
index 0000000000000000000000000000000000000000..270d617aec02a1f51da388ad978afe47022a11d6
GIT binary patch
literal 673
zcmV;S0$%-zP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!LrFwIRCwB)Q%!3VQ4~GzWs**&$p|S)
zi?Kl{;zryH;==#nq9Bo?U04vol?z=&$PZ}!AVN_T3vLue)IT5=#XlgWMoqQJ)G1BU
z%uJHWT<^@-ku(&<3vb}vciwq(&$(AI@-u4yGWfsPRv<)<Y+HwI1F;x{ssiyiI6n*}
z0{Sk<aR6@skxT-rswi-}u5$7O5~ojLQ2UAg`&D?g9}s#P;Nu`%57cTxPUVm|dj>L}
zXWR!2*4JG$k{Q!}{*v~>`(;x5W{K+hBpJCvxY9XlU%x@_W<A0=&t6bN%a~~BljhEB
zk@ko6c!la}hU&=-S&yEKobMDbQA5v}Fs6>0jqEhJU%!ojS_@aHb>-SfzW=34#>5fw
z@4`4dV>Yx2YM09NuhG6$CjSmQXiBiyLT3{e@1k|_G6vsk2YTjyUSrGx?4=4sIu+z(
z_!S__fh<fT#w!Yst@FHSs~kTDp{bzGZeaOe0tShc26gt_(2LgX3hd>FLpk-rc_5Jp
z`ywLXrlDRBp0PCq?kwGbb^pOo&fBbWEpF6k5doN>`}%DJ?0x(MZ_C7BV*`U~HOdDV
zzpOt5%3cXFn?;N}%vpKLdf2ck%aHL{(7w&$Jd*QsTxN<jDnN{nha{3c@U5UuC!@|4
zA=!=HQW;Xy0Pb~>RD)W5fx$E2^&A|!w}{@mRdipyVIpnYCulNA5BlD+LV@-VQZP*Z
z@<PG+fncblZ22V^e8CNb85=uzaD7f8L&3Y<;P?G;{w=@&W7&PS%pxr{00000NkvXX
Hu0mjf5zjRg

literal 0
HcmV?d00001

diff --git a/tests/test_tracker_icons.py b/tests/test_tracker_icons.py
index 702e648fe..5ff7241e6 100644
--- a/tests/test_tracker_icons.py
+++ b/tests/test_tracker_icons.py
@@ -12,7 +12,7 @@ common.set_tmp_config_dir()
 icons = TrackerIcons()
 
 class TrackerIconsTestCase(unittest.TestCase):
-    def test_get_png(self):
+    def test_get_deluge_png(self):
         # Deluge has a png favicon link
         icon = TrackerIcon("../deluge.png")
         d = icons.get("deluge-torrent.org")
@@ -20,7 +20,7 @@ class TrackerIconsTestCase(unittest.TestCase):
         d.addCallback(self.assertEquals, icon)
         return d
 
-    def test_get_ico(self):
+    def test_get_google_ico(self):
         # Google doesn't have any icon links
         # So instead we'll grab its favicon.ico
         icon = TrackerIcon("../google.ico")
@@ -29,7 +29,7 @@ class TrackerIconsTestCase(unittest.TestCase):
         d.addCallback(self.assertEquals, icon)
         return d
 
-    def test_get_ico_with_redirect(self):
+    def test_get_google_ico_with_redirect(self):
         # google.com redirects to www.google.com
         icon = TrackerIcon("../google.ico")
         d = icons.get("google.com")
@@ -44,3 +44,11 @@ class TrackerIconsTestCase(unittest.TestCase):
         d.addCallback(self.assertNotIdentical, None)
         d.addCallback(self.assertEquals, icon)
         return d
+
+    def test_get_openbt_png(self):
+        # openbittorrent.com has an incorrect type (image/gif)
+        icon = TrackerIcon("../openbt.png")
+        d = icons.get("openbittorrent.com")
+        d.addCallback(self.assertNotIdentical, None)
+        d.addCallback(self.assertEquals, icon)
+        return d