Merge pull request #8 from return/breaking-news

Updated breaking news ticker

Author: hako

bbcli/bbcapi.py

@@ -4,8 +4,11 @@
 import arrow
 import os
 
+from defusedxml import minidom
+
 API_BASE_URL = "http://trevor-producer-cdn.api.bbci.co.uk"
-BBC_URL = "http://www.bbc.co.uk"
+BBC_URL = "https://www.bbc.co.uk"
+BBC_POLLING_URL = "https://polling.bbc.co.uk"
 
 class BBC():
 
@@ -22,22 +25,29 @@ def get_ticker(self):
         if ticker == None:
             return None
         else:
-            data = json.dumps(ticker.json())
+            data = json.dumps(ticker.json(strict=False))
         return self.parse_ticker_data(data)
 
     def parse_ticker_data(self, ticker_data):
         tickers = []
         data = json.loads(ticker_data)
-        for d in data['entries']:
-            headline = d['headline']
-            prompt = d['prompt']
-            breaking = d['isBreaking']
-            if 'url' in d:
-                url = d['url']
-            else:
-                url = ""
-            ticker = Ticker(headline, prompt, breaking, url)
-            tickers.append(ticker)
+        
+        if len(data["html"]) == 0:
+            return tickers
+            
+        response = data["html"]
+        htmlData = minidom.parseString(response)
+        elements = htmlData.getElementsByTagName("div")
+
+        # Not yet tested to handle multiple breaking news alerts.
+        
+        # Heading
+        headline = elements[0].getElementsByTagName("p")[0].firstChild.nodeValue.replace("\n","")
+        # News Link as in /news/ 
+        url = elements[0].getElementsByTagName("a")[0].getAttribute('href') 
+        
+        ticker = Ticker(headline, "BREAKING NEWS", "true", BBC_URL + url)
+        tickers.append(ticker)
         return tickers
 
     def parse_news(self, stories):
@@ -84,7 +94,7 @@ def get_bbc_ticker(self):
            'User-Agent': 'Mozilla/5.0 (Windows NT 6.2) AppleWebKit/5311 (KHTML, like Gecko) Chrome/13.0.837.0 Safari/5311'
         }
         try:
-            res = requests.get(BBC_URL + "/news/10284448/ticker.sjson", data=None, headers=ua)
+            res = requests.get(BBC_POLLING_URL + "/news/latest_breaking_news?audience=Domestic", data=None, headers=ua)
         except requests.ConnectionError as e:
             if hasattr(e, 'reason'):
                 print 'We failed to reach a server.'
@@ -93,7 +103,7 @@ def get_bbc_ticker(self):
                 print 'The server couldn\'t fulfill the request.'
                 print 'Error code: ', e.code
         return res
-                
+
 class News():
 
     def __init__(self, title, link, subtext):

setup.py

@@ -12,7 +12,7 @@
     author_email='wesley@hakobaito.co.uk',
     url='https://github.com/hako/bbcli',
     packages=['bbcli'],
-    install_requires=['urwid', 'requests', 'arrow'],
+    install_requires=['urwid', 'requests', 'arrow', 'defusedxml'],
     classifiers=[
         'Environment :: Console',
         'License :: OSI Approved :: MIT License',