iplayer-dl 0.1.18 → 0.1.19

data/README

@@ -12,3 +12,4 @@ Windows users should omit 'sudo' in the second line.
 You can then run the downloader just by typing:
 
   iplayer-dl
+

data/Rakefile

@@ -88,10 +88,6 @@ begin
   # using GitHub, edit as appropriate.
   Rake::GemPackageTask.new(spec) do |pkg|
     pkg.gem_spec = spec
-
-    # Generate the gemspec file for github.
-    file = File.dirname(__FILE__) + "/#{spec.name}.gemspec"
-    File.open(file, "w") {|f| f << spec.to_ruby }
   end
 rescue LoadError
 end

data/bin/iplayer-dl

@@ -89,7 +89,7 @@ if http_proxy = preferences.http_proxy
   http_proxy = 'http://' + http_proxy unless http_proxy =~ %r{^http://}
   u = URI.parse(http_proxy)
   $stderr.puts "Using proxy #{u.host}:#{u.port}"
-  http = Net::HTTP::Proxy(u.host, u.port)
+  http = Net::HTTP::Proxy(u.host, u.port, u.user, u.password)
 else
   http = Net::HTTP
 end

data/lib/iplayer/browser.rb

@@ -3,13 +3,13 @@ require 'uri'
 
 class Net::HTTPResponse # Monkey-patch in some 21st-century functionality
   include Enumerable
-  
+
   def cookies
     inject([]){ |acc, (key, value)|
       key == 'set-cookie' ? acc << value.split(/;/).first : acc
     }
   end
-  
+
   def to_hash
     @to_hash ||= inject({}){ |hash, (key, value)|
       hash[key] = value

data/lib/iplayer/gui/app.rb

@@ -15,7 +15,7 @@ class App < Wx::App
     if http_proxy = @options[:http_proxy]
       http_proxy = 'http://' + http_proxy unless http_proxy =~ %r{^http://}
       u = URI.parse(http_proxy)
-      http = Net::HTTP::Proxy(u.host, u.port)
+      http = Net::HTTP::Proxy(u.host, u.port, u.user, u.password)
     else
       http = Net::HTTP
     end
@@ -31,8 +31,8 @@ class App < Wx::App
     downloader = Downloader.new(@browser, pid)
     available_versions = downloader.available_versions
     raise MP4Unavailable if available_versions.empty?
-    version = available_versions.sort_by{ |v| 
-      @options[:type_preference].index(v.name) || 100 
+    version = available_versions.sort_by{ |v|
+      @options[:type_preference].index(v.name) || 100
     }.first
 
     self.yield

data/lib/iplayer/metadata.rb

@@ -18,7 +18,7 @@ class Metadata
   end
 
   def full_title
-    mixed_title.gsub(/\s*:\s*/, ' - ')
+    dmy_to_ymd(mixed_title).gsub(/\s*:\s*/, ' - ')
   end
 
   def filetype
@@ -36,7 +36,6 @@ class Metadata
   end
 
 private
-
   def metadata
     @metadata ||= REXML::Document.new( @browser.get(METADATA_URL % @pid).body )
   rescue Exception => e
@@ -60,5 +59,9 @@ private
     programme_type == 'radioProgramme'
   end
 
+  # convert UK date format to YYYY-MM-DD so that it can be sorted easily
+  def dmy_to_ymd(s)
+    s.sub(%r[(\d{2})/(\d{2})/(\d{4})], "\\3-\\2-\\1")
+  end
 end
 end

data/lib/iplayer/preferences.rb

@@ -3,7 +3,7 @@ require 'yaml'
 module IPlayer
 class Preferences
 
-  def initialize(env=ENV, platform=PLATFORM)
+  def initialize(env=ENV, platform=RUBY_PLATFORM)
     @env      = env
     @platform = platform
     @hash     = {}

data/lib/iplayer/version.rb

@@ -1,4 +1,4 @@
 module IPlayer
-  VERSION     = '0.1.18'
+  VERSION     = '0.1.19'
   GUI_VERSION = '1.14'
 end

data/test/test_metadata.rb

@@ -72,4 +72,39 @@ class MetadataTest < Test::Unit::TestCase
     expected = {'anonymous' => 'b00htg55'}
     assert_equal expected, metadata.versions
   end
+
+  def test_should_rearrange_DDMMYYYY_dates_to_YYYYMMDD
+    xml = %{
+      <playlist xmlns="http://bbc.co.uk/2008/emp/playlist" revision="1">
+        <config>
+          <plugin name="iPlayerLiveStats"/>
+          <plugin name="spacesReporting"/>
+        </config>
+        <id>tag:bbc.co.uk,2008:pips:b00769ss:playlist</id>
+        <link rel="self" href="http://www.bbc.co.uk/iplayer/playlist/b00769ss/"/>
+        <link rel="alternate" href="http://www.bbc.co.uk/iplayer/episode/b00769ss/That_Reminds_Me_01_10_2002/"/>
+        <link rel="holding" href="http://node2.bbcimg.co.uk/iplayer/images/episode/b00769ss_640_360.jpg" height="360" width="640" type="image/jpeg" />
+        <title>That Reminds Me: 01/10/2002</title>
+        <summary>The late Ludovic Kennedy reminisces about his life. He remembers a very Eton schoolboy prank involving hiring a plane, and shares memories of his favourite interviewees.</summary>
+        <updated>2009-12-10T00:05:48Z</updated>
+        <rights>
+          <right name="embed">unset</right>
+        </rights>
+        <item kind="radioProgramme" duration="1800" identifier="b001x3rr" group="b00769ss" publisher="pips">
+          <title>That Reminds Me: 01/10/2002</title>
+          <broadcast>2009-12-24T20:00:00Z</broadcast>
+          <service id="bbc_radio_four" href="http://www.bbc.co.uk/iplayer/bbc_radio_four">BBC Radio 4</service>
+          <masterbrand id="bbc_radio_four" href="http://www.bbc.co.uk/iplayer/bbc_radio_four">BBC Radio 4</masterbrand>
+          <passionSite href="http://www.bbc.co.uk/programmes/b00dzkk0/microsite">That Reminds Me</passionSite>
+          <alternate id="default" />
+          <mediator identifier="b001x3rr" name="pips"/>
+        </item>
+      </playlist>
+    }
+    pid = 'abc'
+    browser = stub(:get => stub(:body => xml))
+    metadata = IPlayer::Metadata.new(pid, browser)
+    assert_match /2002-10-01/, metadata.full_title
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: iplayer-dl
 version: !ruby/object:Gem::Version 
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors: 
 - Paul Battley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-19 00:00:00 +00:00
+date: 2010-02-20 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,33 +35,37 @@ files:
 - README
 - setup.rb
 - Rakefile
-- lib/iplayer/.version.rb.swp
-- lib/iplayer/version.rb
-- lib/iplayer/browser.rb
-- lib/iplayer/downloader.rb
+- lib/.iplayer.rb.swp
+- lib/iplayer/errors.rb
+- lib/iplayer/.metadata.rb.swp
 - lib/iplayer/preferences.rb
-- lib/iplayer/gui/frame.rb
+- lib/iplayer/.downloader.rb.swp
+- lib/iplayer/.subtitles.rb.swp
+- lib/iplayer/subtitles.rb
+- lib/iplayer/downloader.rb
+- lib/iplayer/constants.rb
+- lib/iplayer/.constants.rb.swp
 - lib/iplayer/gui/app.rb
+- lib/iplayer/gui/.app.rb.swp
+- lib/iplayer/gui/frame.rb
 - lib/iplayer/gui/main_frame.rb
-- lib/iplayer/subtitles.rb
-- lib/iplayer/errors.rb
 - lib/iplayer/.browser.rb.swp
-- lib/iplayer/.downloader.rb.swp
-- lib/iplayer/translations.rb
 - lib/iplayer/metadata.rb
-- lib/iplayer/constants.rb
+- lib/iplayer/browser.rb
+- lib/iplayer/translations.rb
+- lib/iplayer/version.rb
 - lib/iplayer.rb
+- test/test_subtitles.rb
 - test/test_preferences.rb
+- test/.test_metadata.rb.swp
 - test/test_metadata.rb
-- test/test_subtitles.rb
 - bin/iplayer-dl
 - bin/iplayer-dl-gui
-- bin/.iplayer-dl.swp
-- share/pixmaps/iplayer-dl/icon128.png
+- share/pixmaps/iplayer-dl/icon64.png
+- share/pixmaps/iplayer-dl/icon32.png
 - share/pixmaps/iplayer-dl/icon48.png
 - share/pixmaps/iplayer-dl/icon16.png
-- share/pixmaps/iplayer-dl/icon32.png
-- share/pixmaps/iplayer-dl/icon64.png
+- share/pixmaps/iplayer-dl/icon128.png
 has_rdoc: true
 homepage: http://po-ru.com/projects/iplayer-downloader
 licenses: []