Changeset 6bb4559

Timestamp:

05/08/2010 06:26:08 AM (15 years ago)

Author:

John Garland <johnnybg+deluge@gmail.com>

Children:

8f021c

Parents:

7c9eea

git-author:

John Garland <johnnybg+deluge@gmail.com> (05/08/2010 06:24:16 AM)

git-committer:

John Garland <johnnybg+deluge@gmail.com> (05/08/2010 06:26:08 AM)

Message:

Make host_to_url support redirection and add another test

Files:

• deluge/ui/tracker_icons.py (modified) (8 diffs)
• tests/publicbt.ico (added)
• tests/test_tracker_icons.py (modified) (1 diff)

deluge/ui/tracker_icons.py

@@ -153 +153 @@
 
         self.pending = {}
+        self.redirects = {}
 
     def get(self, host):
@@ -203 +204 @@
         """
         if not url:
-            url = host_to_url(host)
+            url = self.host_to_url(host)
         log.debug("Downloading %s", url)
         return download_file(url, mkstemp()[1], force_filename=True)
@@ -236 +237 @@
         if f.check(error.PageRedirect):
             # Handle redirect errors
-            location = urljoin(host_to_url(host), error_msg.split(" to ")[1])
+            location = urljoin(self.host_to_url(host), error_msg.split(" to ")[1])
+            self.redirects[host] = url_to_host(location)
             d = self.download_page(host, url=location)
             d.addCallbacks(self.on_download_page_complete, self.on_download_page_fail,
@@ -276 +278 @@
         """
         log.debug("Got icons for %s: %s", host, icons)
-        url = host_to_url(host)
+        url = self.host_to_url(host)
         icons = [(urljoin(url, icon), mimetype) for icon, mimetype in icons]
         log.debug("Icon urls: %s", icons)
@@ -346 +348 @@
         if f.check(error.PageRedirect):
             # Handle redirect errors
-            location = urljoin(host_to_url(host), error_msg.split(" to ")[1])
+            location = urljoin(self.host_to_url(host), error_msg.split(" to ")[1])
             d = self.download_icon([(location, extension_to_mimetype(location.rpartition('.')[2]))] + icons, host)
             if not icons:
@@ -355 +357 @@
         elif f.check(IndexError, HTMLParseError):
             # No icons, try favicon.ico as an act of desperation
-            d = self.download_icon([(urljoin(host_to_url(host), "favicon.ico"), extension_to_mimetype("ico"))], host)
+            d = self.download_icon([(urljoin(self.host_to_url(host), "favicon.ico"), extension_to_mimetype("ico"))], host)
             d.addCallbacks(self.on_download_icon_complete, self.on_download_icon_fail,
                            callbackArgs=(host,), errbackArgs=(host,))
@@ -404 +406 @@
         del self.pending[host]
         return icon
+
+    def host_to_url(self, host):
+        """
+        Given a host, returns the URL to fetch
+
+        :param host: the tracker host
+        :type host: string
+        :returns: the url of the tracker
+        :rtype: string
+        """
+        if host in self.redirects:
+            host = self.redirects[host]
+        return "http://%s/" % host
 
 ################################ HELPER CLASSES ###############################
@@ -451 +466 @@
 ############################### HELPER FUNCTIONS ##############################
 
-def host_to_url(host):
-    """
-    Given a host, returns the URL to fetch
-
-    :param host: the tracker host
-    :type host: string
-    :returns: the url of the tracker
-    :rtype: string
-    """
-    return "http://%s/" % host
-
 def url_to_host(url):
     """

tests/test_tracker_icons.py

@@ -53 +53 @@
         d.addCallback(self.assertEquals, icon)
         return d
+
+    def test_get_publicbt_ico(self):
+        icon = TrackerIcon("../publicbt.ico")
+        d = icons.get("publicbt.org")
+        d.addCallback(self.assertNotIdentical, None)
+        d.addCallback(self.assertEquals, icon)
+        return d