modularize urltosite - avoid manual ifs

Author: raj454raj

modules/sites/atcoder.py

@@ -32,12 +32,18 @@ class Profile(object):
     # -------------------------------------------------------------------------
     def __init__(self, handle=""):
         """
-            @param handle (String): Spoj handle
+            @param handle (String): AtCoder handle
         """
 
         self.site = Profile.site_name
         self.handle = handle
 
+    # -------------------------------------------------------------------------
+    @staticmethod
+    def is_valid_url(url):
+        return url.__contains__("kenkoooo.com/") or \
+               url.__contains__("atcoder.jp/")
+
     # -------------------------------------------------------------------------
     @staticmethod
     def is_website_down():
@@ -74,8 +80,6 @@ def get_problem_setters():
     def get_editorial_link(problem_link):
         """
         """
-        # @Todo fill this
-
         try:
             contest_id = re.search("contests/.*/tasks",
                                    problem_link).group().split("/")[1]
@@ -118,7 +122,7 @@ def is_invalid_handle(handle):
     # -------------------------------------------------------------------------
     @staticmethod
     def rating_graph_data(handle):
-        url = "https://atcoder.jp/users/%s/history" % handle
+        url = "%susers/%s/history" % (current.SITES["AtCoder"], handle)
 
         response = get_request(url)
         if response in REQUEST_FAILURES:
@@ -151,7 +155,7 @@ def rating_graph_data(handle):
     def get_submissions(self, last_retrieved,
                         atcoder_problem_dict, is_daily_retrieval):
         """
-            Retrieve Spoj submissions after last retrieved timestamp
+            Retrieve AtCoder submissions after last retrieved timestamp
 
             @param last_retrieved (DateTime): Last retrieved timestamp for the user
             @param atcoder_problem_dict (Dict): Problem ID to name mapping

modules/sites/codechef.py

@@ -57,6 +57,11 @@ def __init__(self, handle=""):
         self.is_daily_retrieval = False
         self.last_retrieved_reached = False
 
+    # -------------------------------------------------------------------------
+    @staticmethod
+    def is_valid_url(url):
+        return url.__contains__("codechef.com/")
+
     # -------------------------------------------------------------------------
     @staticmethod
     def is_website_down():

modules/sites/codeforces.py

@@ -38,6 +38,12 @@ def __init__(self, handle=""):
         self.site = Profile.site_name
         self.handle = handle
 
+
+    # -------------------------------------------------------------------------
+    @staticmethod
+    def is_valid_url(url):
+        return url.__contains__("codeforces.com/")
+
     # -------------------------------------------------------------------------
     @staticmethod
     def is_website_down():

modules/sites/hackerearth.py

@@ -38,6 +38,11 @@ def __init__(self, handle=""):
         self.site = Profile.site_name
         self.handle = handle
 
+    # -------------------------------------------------------------------------
+    @staticmethod
+    def is_valid_url(url):
+        return url.__contains__("hackerearth.com/")
+
     # -------------------------------------------------------------------------
     @staticmethod
     def is_website_down():

modules/sites/hackerrank.py

@@ -40,6 +40,11 @@ def __init__(self, handle=""):
 
     # -------------------------------------------------------------------------
     @staticmethod
+    def is_valid_url(url):
+        return url.__contains__("hackerrank.com/")
+
+    # --------------------------------------------------------------------------
+    @staticmethod
     def is_website_down():
         """
             @return (Boolean): If the website is down

modules/sites/spoj.py

@@ -40,6 +40,11 @@ def __init__(self, handle=""):
         self.submissions = []
         self.retrieval_failure = None
 
+    # -------------------------------------------------------------------------
+    @staticmethod
+    def is_valid_url(url):
+        return url.__contains__("spoj.com/") or url == current.spoj_lambda_url
+
     # -------------------------------------------------------------------------
     @staticmethod
     def is_website_down():

modules/sites/timus.py

@@ -38,6 +38,11 @@ def __init__(self, handle=""):
         self.site = Profile.site_name
         self.handle = handle
 
+    # -------------------------------------------------------------------------
+    @staticmethod
+    def is_valid_url(url):
+        return url.__contains__("acm.timus.ru/")
+
     # -------------------------------------------------------------------------
     @staticmethod
     def is_website_down():

modules/sites/uva.py

@@ -38,6 +38,12 @@ def __init__(self, handle=""):
         self.site = Profile.site_name
         self.handle = handle
 
+    # -------------------------------------------------------------------------
+    @staticmethod
+    def is_valid_url(url):
+        return url.__contains__("uva.onlinejudge.org") or \
+               url.__contains__("uhunt.felix-halim.net")
+
     # -------------------------------------------------------------------------
     @staticmethod
     def is_website_down():

modules/utilities.py

@@ -640,33 +640,13 @@ def urltosite(url):
 
         @param url (String): Site URL
         @return url (String): Site
-
-        @Todo: Move this to individual sites?
     """
-    if url.__contains__("uva.onlinejudge.org") or url.__contains__("uhunt.felix-halim.net"):
-        return "uva"
-    if url.__contains__("acm.timus.ru"):
-        return "timus"
-    if url.__contains__("codechef.com"):
-        return "codechef"
-    if url.__contains__("spoj.com"):
-        return "spoj"
-    if url.__contains__("codeforces.com"):
-        return "codeforces"
-    if url == current.spoj_lambda_url:
-        return "spoj"
-    if url.__contains__("kenkoooo.com/") or \
-       url.__contains__("atcoder.jp"):
-        return "atcoder"
-
-    # Note: try/except is not added because this function is not to
-    #       be called for invalid problem urls
-    site = re.search(r"www\..*?\.com", url).group()
-
-    # Remove www. and .com from the url to get the site
-    site = site[4:-4]
-
-    return site
+    import sites
+    for site in current.SITES:
+        if getattr(sites, site.lower()).Profile.is_valid_url(url):
+            return site.lower()
+
+    return "unknown_site"
 
 # -----------------------------------------------------------------------------
 def problem_widget(name,