@@ -27,10 +27,9 @@ class Metadata def versions versions = {} REXML::XPath.each(metadata, '//playlist/item') do |node| - version_pid = node.attributes['identifier'] - next unless version_pid - alternate = REXML::XPath.first(node, 'alternate') - versions[alternate.attributes['id']] = version_pid + version_pid = node.attributes['identifier'] or next + alternate_id = REXML::XPath.first(node, 'alternate').attributes['id'] rescue 'anonymous' + versions[alternate_id] = version_pid end versions end lib/iplayer/metadata.rb @@ -51,4 +51,25 @@ class MetadataTest < Test::Unit::TestCase expected = {'default' => 'b00ftblc', 'signed' => 'b00fvy5y'} assert_equal expected, metadata.versions end + + def test_should_call_version_anonymous_if_the_beeb_do_not_give_an_alternate_an_id + xml = %{ + <?xml version="1.0" encoding="UTF-8"?> + <playlist xmlns="http://bbc.co.uk/2008/emp/playlist" revision="1"> + <item kind="programme" duration="2700" identifier="b00htg55" group="b00hklrs" publisher="pips"> + <tempav>1</tempav> + <id>tag:bbc.co.uk,2008:pips:b00htg55</id> + <service id="bbc_two" href="http://www.bbc.co.uk/iplayer/bbc_two">BBC Two</service> + <masterbrand id="bbc_one" href="http://www.bbc.co.uk/iplayer/bbc_one">BBC One</masterbrand> + <guidance id="W1">Contains adult humour.</guidance> + <mediator identifier="b00htg55" name="pips"/> + </item> + </playlist> + } + pid = 'abc' + browser = stub(:get => stub(:body => xml)) + metadata = IPlayer::Metadata.new(pid, browser) + expected = {'anonymous' => 'b00htg55'} + assert_equal expected, metadata.versions + end end test/test_metadata.rb eab356ae44a7034c2fcc43aa35c1acf4a47ec164 Paul Battley pbattley@gmail.com http://github.com/threedaymonk/iplayer-dl/commit/c9dd5b0b04d22b1201a60073e0a79490d28d1c3e c9dd5b0b04d22b1201a60073e0a79490d28d1c3e 2009-02-16T12:08:35-08:00 2009-02-16T12:08:35-08:00 The pesky Beeb is giving us alternatives with no ID in the metadata file. 99e638c392a3cf8a2d16ab27cf62064645527d77 Paul Battley pbattley@gmail.com