Update iPlayer grabber for BBC Site changes.

I can't test this, but this is based on some changes made by Muzer in IRC on .24, which he reported to work with the older version. Grabbing, minimally, seems to work again.
MythTV · Jun 18, 2011 · 6eaa653 · 6eaa653
1 parent c4bc3e9
commit 6eaa653
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py b/mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
@@ -355,11 +355,11 @@ def searchTitle(self, title, pagenumber, pagelen):
             urlType = u'fullscreen'
 
         # Translate the search results into MNV RSS item format
-        audioFilter = etree.XPath('./@class="audio"')
-        linkFilter = etree.XPath(u".//div[@class='episode-info']//a")
-        titleFilter = etree.XPath(u".//div[@class='episode-info']//a")
-        descFilter = etree.XPath(u".//div[@class='episode-info']//p[@class='episode-synopsis']")
-        thumbnailFilter = etree.XPath(u".//div[@class='episode-image']//img")
+        audioFilter = etree.XPath('contains(./@class,"audio") or contains(./../../@class,"audio")')
+        linkFilter = etree.XPath(u".//div[@class='episode-info ']//a")
+        titleFilter = etree.XPath(u".//div[@class='episode-info ']//a")
+        descFilter = etree.XPath(u".//div[@class='episode-info ']//p[@class='episode-synopsis']")
+        thumbnailFilter = etree.XPath(u".//span[@class='episode-image cta-play']//img")
         itemDict = {}
         for result in searchResults:
             tmpLink = linkFilter(result)

diff --git a/mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/bbciplayer.html b/mythtv/programs/scripts/internetcontent/nv_python_libs/configs/HTML/bbciplayer.html
@@ -31,7 +31,7 @@
 
             var embedPage = "http://www.bbc.co.uk/iplayer/episode/";
             embedPage = embedPage.concat(video_id);
-            embedPage = embedPage.concat("/Top_Gear_Series_13_Episode_1_(new_series)/?t=00m01s");
+<!--            embedPage = embedPage.concat("/Top_Gear_Series_13_Episode_1_(new_series)/?t=00m01s");-->
 
             var pl = "http://www.bbc.co.uk/iplayer/playlist/";
             pl = pl.concat(video_id);
@@ -95,7 +95,7 @@
 
             var attributes = { id: "mybbcplayer" };
 
-            swfobject.embedSWF("http://www.bbc.co.uk/emp/9player.swf?revision=10344_10570", "myth_player", window.innerWidth, window.innerHeight, "9.0.0", "expressInstall.swf", flashvars, params, attributes);
+            swfobject.embedSWF("http://www.bbc.co.uk/emp/10player.swf?revision=10344_10570", "myth_player", window.innerWidth, window.innerHeight, "9.0.0", "expressInstall.swf", flashvars, params, attributes);
 
             function onPlayerReady(playerId) {
                 myth_player = document.getElementById("mybbcplayer");