Method _key_from_url() now returns case sensitive results for special…

… domains (e.g. imgur.com, youtube.com). They are defined as case_sensitive_domains in the .ini file
phektus · Jun 20, 2011 · 51bcbfb · 51bcbfb
1 parent 1b030c3
commit 51bcbfb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/r2/example.ini b/r2/example.ini
@@ -375,6 +375,9 @@ share_reply = [email protected]
 # feedback email 
 feedback_email = [email protected]
 
+# Special case sensitive domains
+case_sensitive_domains = i.imgur.com, youtube.com
+
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0

diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py
@@ -110,7 +110,8 @@ class Globals(object):
                    'authorized_cnames',
                    'hardcache_categories',
                    'proxy_addr',
-                   'allowed_pay_countries']
+                   'allowed_pay_countries',
+                   'case_sensitive_domains']
 
     choice_props = {'cassandra_rcl': {'ONE':    CL_ONE,
                                       'QUORUM': CL_QUORUM},

diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py
@@ -538,7 +538,13 @@ class LinksByUrl(tdb_cassandra.View):
 
     @classmethod
     def _key_from_url(cls, url):
-        keyurl = _force_utf8(UrlParser.base_url(url.lower()))
+        if not utils.domain(url) in g.case_sensitive_domains:
+            keyurl = _force_utf8(UrlParser.base_url(url.lower()))
+        else:
+            # Convert only hostname to lowercase
+            up = UrlParser(url)
+            up.hostname = up.hostname.lower()
+            keyurl = _force_utf8(UrlParser.base_url(up.unparse()))
         return keyurl
 
 # Note that there are no instances of PromotedLink or LinkCompressed,