Module: deluge Branch: master Commit: a8ac98bb37e4373000d8a4d7c2d2d6d8ad88018a
Author: John Garland <[email protected]> Date: Tue May 4 03:42:11 2010 +1000 Update web ui to use new TrackerIcons --- deluge/ui/web/server.py | 43 +++++++++++++------------------------------ 1 files changed, 13 insertions(+), 30 deletions(-) diff --git a/deluge/ui/web/server.py b/deluge/ui/web/server.py index 6050f08..261836c 100644 --- a/deluge/ui/web/server.py +++ b/deluge/ui/web/server.py @@ -46,13 +46,6 @@ import tempfile import mimetypes import pkg_resources -try: - import PIL.Image as Image - import cStringIO - import deluge.ui.Win32IconImagePlugin -except ImportError: - Image = None - from twisted.application import service, internet from twisted.internet import reactor, defer, error from twisted.internet.ssl import SSL @@ -202,31 +195,21 @@ class Tracker(resource.Resource): return self def render(self, request): - headers = {} - filename = self.tracker_icons.get(request.tracker_name) - if filename: - request.setHeader("cache-control", - "public, must-revalidate, max-age=86400") - if Image: - im = Image.open(filename) - if im.size > (16, 16): - im = im.resize((16, 16), Image.ANTIALIAS) - fp = cStringIO.StringIO() - im.save(fp, "png") - request.setHeader("content-type", "image/png") + def on_get_icon(icon): + headers = {} + if icon: + request.setHeader("cache-control", + "public, must-revalidate, max-age=86400") + request.setHeader("content-type", icon.get_mimetype()) request.setResponseCode(http.OK) - return fp.getvalue() + return icon.get_data() else: - if filename.endswith(".ico"): - request.setHeader("content-type", "image/x-icon") - elif filename.endswith(".png"): - request.setHeader("content-type", "image/png") - data = open(filename, "rb") - request.setResponseCode(http.OK) - return data.read() - else: - request.setResponseCode(http.NOT_FOUND) - return "" + request.setResponseCode(http.NOT_FOUND) + return "" + + d = self.tracker_icons.get(request.tracker_name) + d.addCallback(on_get_icon) + return d class Flag(resource.Resource): def getChild(self, path, request): -- You received this message because you are subscribed to the Google Groups "deluge-commit" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/deluge-commit?hl=en.
