finally get around to adopting that brand new json api lol

Author: mahmoud

top/common.py

@@ -26,8 +26,7 @@
 TOP_API_URL = 'http://wikimedia.org/api/rest_v1/metrics/pageviews/'\
               'top/{lang}.{project}/all-access/{year}/{month}/{day}'
 MW_API_URL = 'http://{lang}.{project}.org/w/api.php?'
-TOTAL_TRAFFIC_URL = 'https://metrics.wmflabs.org/static/public/'\
-                    'datafiles/Pageviews/{lang}{project}.csv'
+TOTAL_TRAFFIC_URL = 'https://wikimedia.org/api/rest_v1/metrics/pageviews/aggregate/{lang}.{project}.org/all-access/all-agents/daily/{datestr}00/{datestr}00'
 
 
 # Other variables

top/get_data.py

@@ -84,18 +84,20 @@ def is_article(title, wiki_info):
     return True
 
 
-# TODO: switch to new JSON API
+
 def get_project_traffic(date, lang, project):
-    if project == 'wikipedia':
-        project = 'wiki'
-    url = TOTAL_TRAFFIC_URL.format(lang=lang, project=project)
+    datestr = date.strftime('%Y%m%d')
+    url = TOTAL_TRAFFIC_URL.format(lang=lang, project=project, datestr=datestr)
     resp = urllib2.urlopen(url)
-    data = csvDictReader(resp)
-    date_str = date.strftime('%Y-%m-%d')
+    data = json.loads(resp.read())
+    try:
+        date_data = data['items'][0]
+    except IndexError:
+        # backwards compat to the old metrics api which would raise urlerror
+        raise urllib2.URLError('no traffic data available from %r' % url)
+
+    return date_data['views']
 
-    date_total_list = [(d['Date'], d['Total']) for d in data]
-    total_traffic = dict(date_total_list).get(date_str, 0)
-    return total_traffic
 
 
 def get_query(params, lang, project, extractor, default_val):