Merge pull request #630 from kmyk/fix/update-hr

fix for HackerRank
online-judge-tools · Dec 4, 2019 · 973f1a8 · 973f1a8
2 parents 7a8c94a + be365d7
commit 973f1a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/onlinejudge/_implementation/utils.py b/onlinejudge/_implementation/utils.py
@@ -73,7 +73,8 @@ def parse_content(parent: Union[bs4.NavigableString, bs4.Tag, bs4.Comment]) -> b
 
 def new_session_with_our_user_agent() -> requests.Session:
     session = requests.Session()
-    session.headers['User-Agent'] += ' (+{})'.format(version.__url__)
+    session.headers['User-Agent'] = '{}/{} (+{})'.format(version.__package_name__, version.__version__, version.__url__)
+    log.debug('User-Agent: %s', session.headers['User-Agent'])
     return session
 
 

diff --git a/onlinejudge/service/hackerrank.py b/onlinejudge/service/hackerrank.py
@@ -87,10 +87,10 @@ def from_url(cls, url: str) -> Optional['HackerRankProblem']:
         result = urllib.parse.urlparse(url)
         if result.scheme in ('', 'http', 'https') \
                 and result.netloc in ('hackerrank.com', 'www.hackerrank.com'):
-            m = re.match(r'^/contests/([0-9A-Za-z-]+)/challenges/([0-9A-Za-z-]+)$', utils.normpath(result.path))
+            m = re.match(r'^/contests/([0-9A-Za-z-]+)/challenges/([0-9A-Za-z-]+)(/problem)?/?$', utils.normpath(result.path))
             if m:
                 return cls(contest_slug=m.group(1), challenge_slug=m.group(2))
-            m = re.match(r'^/challenges/([0-9A-Za-z-]+)$', utils.normpath(result.path))
+            m = re.match(r'^/challenges/([0-9A-Za-z-]+)(/problem)?/?$', utils.normpath(result.path))
             if m:
                 return cls(contest_slug='master', challenge_slug=m.group(1))
         return None