codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename mimetype helper methods and rewrite to use a common dict

This commit is contained in:
John Garland 2010-05-05 02:31:05 +10:00
parent 452656e09d
commit d28cf93686
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
deluge/ui/tracker_icons.py
View File

@ -67,7 +67,7 @@ class TrackerIcon(object):
:type filename: string :type filename: string
""" """
self.filename = os.path.abspath(filename) self.filename = os.path.abspath(filename)
self.mimetype = ext_to_mimetype(self.filename.rpartition('.')[2]) self.mimetype = extension_to_mimetype(self.filename.rpartition('.')[2])
self.data = None self.data = None
def __eq__(self, other): def __eq__(self, other):
@ -346,7 +346,7 @@ class TrackerIcons(Component):
if f.check(error.PageRedirect): if f.check(error.PageRedirect):
# Handle redirect errors # Handle redirect errors
location = error_msg.split(" to ")[1] location = error_msg.split(" to ")[1]
d = self.download_icon([(location, ext_to_mimetype(location.rpartition('.')[2]))] + icons, host) d = self.download_icon([(location, extension_to_mimetype(location.rpartition('.')[2]))] + icons, host)
if not icons: if not icons:
d.addCallbacks(self.on_download_icon_complete, self.on_download_icon_fail, d.addCallbacks(self.on_download_icon_complete, self.on_download_icon_fail,
callbackArgs=(host,), errbackArgs=(host,)) callbackArgs=(host,), errbackArgs=(host,))
@ -354,7 +354,7 @@ class TrackerIcons(Component):
d = self.download_icon(icons, host) d = self.download_icon(icons, host)
elif f.check(IndexError): elif f.check(IndexError):
# No icons, try favicon.ico as an act of desperation # No icons, try favicon.ico as an act of desperation
d = self.download_icon([(urljoin(host_to_url(host), "favicon.ico"), ext_to_mimetype("ico"))], host) d = self.download_icon([(urljoin(host_to_url(host), "favicon.ico"), extension_to_mimetype("ico"))], host)
d.addCallbacks(self.on_download_icon_complete, self.on_download_icon_fail, d.addCallbacks(self.on_download_icon_complete, self.on_download_icon_fail,
callbackArgs=(host,), errbackArgs=(host,)) callbackArgs=(host,), errbackArgs=(host,))
else: else:
@ -476,7 +476,7 @@ def host_to_icon_name(host, mimetype):
:returns: the icon's filename :returns: the icon's filename
:rtype: string :rtype: string
""" """
return host+'.'+mimetype_to_ext(mimetype) return host+'.'+mimetype_to_extension(mimetype)
def icon_name_to_host(icon): def icon_name_to_host(icon):
""" """
@ -490,9 +490,19 @@ def icon_name_to_host(icon):
return icon.rpartition('.')[0] return icon.rpartition('.')[0]
MIME_MAP = { MIME_MAP = {
"image/gif" : "gif",
"image/jpeg" : "jpg",
"image/png" : "png",
"image/vnd.microsoft.icon" : "ico",
"image/x-icon" : "ico",
"gif" : "image/gif",
"jpg" : "image/jpeg",
"jpeg" : "image/jpeg",
"png" : "image/png",
"ico" : "image/vnd.microsoft.icon",
} }
def mimetype_to_ext(mimetype): def mimetype_to_extension(mimetype):
""" """
Given a mimetype, returns the appropriate filename extension Given a mimetype, returns the appropriate filename extension
@ -502,28 +512,16 @@ def mimetype_to_ext(mimetype):
:rtype: string :rtype: string
:raises KeyError: if given an invalid mimetype :raises KeyError: if given an invalid mimetype
""" """
return { return MIME_MAP[mimetype.lower()]
"image/gif" : "gif",
"image/jpeg" : "jpg",
"image/png" : "png",
"image/vnd.microsoft.icon" : "ico",
"image/x-icon" : "ico"
}[mimetype]
def ext_to_mimetype(ext): def extension_to_mimetype(extension):
""" """
Given a filename extension, returns the appropriate mimetype Given a filename extension, returns the appropriate mimetype
:param ext: the filename extension :param extension: the filename extension
:type ext: string :type extension: string
:returns: the mimetype for the given filename extension :returns: the mimetype for the given filename extension
:rtype: string :rtype: string
:raises KeyError: if given an invalid filename extension :raises KeyError: if given an invalid filename extension
""" """
return { return MIME_MAP[extension.lower()]
"gif" : "image/gif",
"jpg" : "image/jpeg",
"jpeg" : "image/jpeg",
"png" : "image/png",
"ico" : "image/vnd.microsoft.icon"
}[ext.lower()]