@@ -6,7 +6,7 @@ See `examples/check_doctor_who.rb` for an example. You need the brand pid for the show you want. This can be found by visiting: -http://bbc.co.uk/programmes +<http://bbc.co.uk/programmes> You can provide a different strategy to execute, by default it will tweet to the twitter account of your choice. @@ -14,4 +14,4 @@ You can provide a different strategy to execute, by default it will tweet to the - Allow multiple strategies # License -See LICENSE \ No newline at end of file +See `LICENSE` \ No newline at end of file README.markdown @@ -12,8 +12,10 @@ module Snowblink def initialize(series_name, details) @series_name = series_name @details = details - set_end_time - set_name_and_pid + unless details.nil? + set_end_time + set_name_and_pid + end @updated = false end @@ -55,9 +57,9 @@ module Snowblink end end - def iplayer_available? - !@details.search('div.availability').empty? - end + # def iplayer_available? + # !@details.search('div.availability').empty? + # end def aired? Time.now > Time.local(*ParseDate.parsedate(@end_time)) lib/snowblink/iplay/episode.rb @@ -16,24 +16,36 @@ module Snowblink def initialize(pid, strategy=Strategy::Twitter.new) @pid = pid || 'b006q2x0' # default to Doctor Who! @programme_url = BBC_PROGRAMMES_URL + @pid - @comingup_url = @programme_url + '/comingup' + @comingup_url = @programme_url # this is no longer consistent, so set it to the same as programme_url for the time being @episodes = [] doc = Hpricot(open(@programme_url)) @name = doc.at('h1').inner_text @strategy = strategy - get_coming_up end def get_episodes(url) doc = Hpricot(open(url)) + return if doc.nil? # create episodes and push into @episodes - doc.search("ol.episodes").each do |episode_list| - episode_list.search("li").each do |episode_list_item| - episode = Episode.new(@name, episode_list_item) - @episodes << episode unless @episodes.any?{|ep| ep.pid == episode.pid} - end + # for tv shows + doc.search("a").each do |potential_episode| + pid_href = potential_episode.get_attribute('href') + next if pid_href.nil? + pid = pid_href.match(%r{^http://www.bbc.co.uk/iplayer/episode/([^/]+)$}) + next if pid.nil? + episode = Episode.new(@name, nil) + episode.pid = pid[1] + @episodes << episode unless @episodes.any?{|ep| ep.pid == episode.pid} + end + + # for radio shows + doc.search("a.aod-link").each do |episode_link| + pid = episode_link.get_attribute('href').match(/[^\/]+$/)[0] + episode = Episode.new(@name, nil) + episode.pid = pid + @episodes << episode unless @episodes.any?{|ep| ep.pid == episode.pid} end end @@ -71,3 +83,4 @@ module Snowblink end end end + lib/snowblink/iplay/programme.rb 9fbc050ef69b3668bbcb1b26c7c0dd1711727d17 Jonathan Lim snowblink@gmail.com http://github.com/snowblink/iplay/commit/40f1584ea3a814223cc6a201e4dd5c212702ae8e 40f1584ea3a814223cc6a201e4dd5c212702ae8e 2009-04-17T01:04:47-07:00 2009-04-17T01:04:47-07:00 Updating as BBC have changed their programmes site. ebe94b177f41e8a4577ef25fc4258c63d9c326d3 Jonathan Lim snowblink@gmail.com