From 56a3a03a590c238f76b73f872777105ef3707e59 Mon Sep 17 00:00:00 2001
From: Martijn Voncken <mvoncken@gmail.com>
Date: Fri, 24 Oct 2008 18:16:12 +0000
Subject: [PATCH] move tracker icon cache folder

---
 deluge/plugins/label/label/core.py |  3 +--
 deluge/tests/test_tracker_icons.py |  4 ++--
 deluge/tracker_icons.py            | 10 +++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/deluge/plugins/label/label/core.py b/deluge/plugins/label/label/core.py
index ff9d12430..59dabe544 100644
--- a/deluge/plugins/label/label/core.py
+++ b/deluge/plugins/label/label/core.py
@@ -43,8 +43,7 @@ from urlparse import urlparse
 import traceback
 import re
 
-RE_VALID = re.compile("[a-z0-9_-]*\Z")
-RE_VALID = re.compile("[a-z0-9_-]*\Z")
+RE_VALID = re.compile("[a-z0-9_\-\.]*\Z")
 
 KNOWN_STATES = ['Downloading','Seeding','Paused','Checking','Queued','Error']
 STATE = "state"
diff --git a/deluge/tests/test_tracker_icons.py b/deluge/tests/test_tracker_icons.py
index 0e4e253bf..d3d2e2bee 100644
--- a/deluge/tests/test_tracker_icons.py
+++ b/deluge/tests/test_tracker_icons.py
@@ -6,12 +6,12 @@ from deluge.tracker_icons import TrackerIcons
 from deluge.common import get_default_config_dir
 
 def del_old():
-    filename = os.path.join(get_default_config_dir("trackers"),"legaltorrents.com.ico")
+    filename = os.path.join(get_default_config_dir("icons"),"legaltorrents.com.ico")
     if os.path.exists(filename):
         os.remove(filename)
 
 def test_get():
-    #del_old()
+    del_old()
     trackericons  = TrackerIcons()
     print trackericons.images
     print trackericons.get("unknown2")
diff --git a/deluge/tracker_icons.py b/deluge/tracker_icons.py
index f8832f578..4090d0e74 100644
--- a/deluge/tracker_icons.py
+++ b/deluge/tracker_icons.py
@@ -40,13 +40,17 @@ from deluge.common import get_default_config_dir, get_pixmap
 import os
 
 #some servers don't have their favicon at the expected location
-RENAMES = {"legaltorrents.com":"beta.legaltorrents.com"}
+RENAMES = {
+    "legaltorrents.com":"beta.legaltorrents.com",
+    "aelitis.com":"www.vuze.com"
+    }
+
 VALID_TYPES = ["octet-stream","x-icon"]
 
 class TrackerIcons(object):
     def __init__(self):
         #set image cache dir
-        self.image_dir = get_default_config_dir("trackers")
+        self.image_dir = get_default_config_dir("icons")
         if not os.path.exists(self.image_dir):
             os.mkdir(self.image_dir)
 
@@ -79,7 +83,7 @@ class TrackerIcons(object):
             log.debug("%s %s %s" % (tracker_host, e, e.message))
             return False
 
-        filename = os.path.join(get_default_config_dir("trackers"),"%s.ico" % tracker_host)
+        filename = os.path.join(get_default_config_dir("icons"),"%s.ico" % tracker_host)
 
         f = open(filename,"wb")
         f.write(icon_data)