iplayer-dl 0.1.17 → 0.1.18

data/lib/iplayer/browser.rb

@@ -43,20 +43,35 @@ class Browser
     @http_class = http_class
   end
 
+  def post(location, data, headers={}, &blk)
+    request(:post, location, data, headers, &blk)
+  end
+
   def get(location, headers={}, &blk)
+    request(:get, location, nil, headers, &blk)
+  end
+
+  def request(type, location, data, headers, &blk)
     url = URI.parse(location)
     http = @http_class.new(url.host, url.port)
     path = url.path
     if url.query
       path << '?' << url.query
     end
+    headers_to_send = DEFAULT_HEADERS.merge(headers)
     if defined? DEBUG
       puts path
-      DEFAULT_HEADERS.merge(headers).each do |k,v|
+      headers_to_send.each do |k,v|
         puts " -> #{k}: #{v}"
       end
     end
-    response = http.request_get(path, DEFAULT_HEADERS.merge(headers), &blk)
+    response =
+      case type
+      when :get
+        http.request_get(path, headers_to_send, &blk)
+      when :post
+        http.request_post(path, data, headers_to_send, &blk)
+      end
     if defined? DEBUG
       response.each do |k,v|
         puts "<-  #{k}: #{v}"

data/lib/iplayer/downloader.rb

@@ -3,7 +3,6 @@ require 'cgi'
 module IPlayer
 class Downloader
 
-  IPHONE_URL     = 'http://www.bbc.co.uk/mobile/iplayer/'
   EPISODE_URL    = 'http://www.bbc.co.uk/mobile/iplayer/episode/%s'
   SELECTOR_URL   = 'http://www.bbc.co.uk/mediaselector/3/auth/iplayer_streaming_http_mp4/%s?%s'
   MAX_SEGMENT    = 4 * 1024 * 1024
@@ -41,7 +40,17 @@ class Downloader
   def get(url, user_agent, options={}, &blk)
     options['User-Agent'] = user_agent
     options['Cookie'] = cookies if cookies
-    browser.get(url, options, &blk)
+    response = browser.get(url, options, &blk)
+    self.cookies = response.cookies.join('; ')
+    response
+  end
+
+  def post(url, data, user_agent, options={}, &blk)
+    options['User-Agent'] = user_agent
+    options['Cookie'] = cookies if cookies
+    response = browser.post(url, data, options, &blk)
+    self.cookies = response.cookies.join('; ')
+    response
   end
 
   def available_versions
@@ -79,22 +88,20 @@ class Downloader
 
 private
 
-  def request_iphone_page
-    response = get(IPHONE_URL, Browser::IPHONE_UA)
-    raise ProgrammeDoesNotExist unless response.is_a?(Net::HTTPSuccess)
-    self.cookies = response.cookies.join('; ')
-  end
-
   def request_episode_page(pid)
     response = get(EPISODE_URL % pid, Browser::IPHONE_UA)
     raise ProgrammeDoesNotExist unless response.is_a?(Net::HTTPSuccess)
+    if response.body =~ /isOver\d+/
+      data = "form=guidanceprompt&#$&=1"
+      response = post(EPISODE_URL % pid, data, Browser::IPHONE_UA)
+      raise ProgrammeDoesNotExist unless response.is_a?(Net::HTTPSuccess)
+    end
     response.body
   end
 
   def real_stream_location(pid)
-    request_iphone_page
     html = request_episode_page(pid)
-    location = html[%r{http://download\.iplayer\.bbc\.co\.uk/iplayer_streaming[^"']+}]
+    location = html[%r{<embed[^>]*?href="(http://[^"]+)}, 1]
 
     unless location
       raise FileUnavailable

data/lib/iplayer/translations.rb

@@ -6,9 +6,9 @@ module Translations
       :download_button   => "Download ...",
       :about_button      => "About ...",
       :status_waiting    => "Waiting",
+      :status_stopped    => "Stopped",
       :pid_tool_tip      => "Use either the short alphanumeric programme identifier or "+
                             "the URL of the viewing page on the iPlayer website.",
-      :status_waiting    => "Waiting",
       :no_pid_given      => "You must specify a programme ID before I can download it.",
       :save_dialog_title => "Save As",
       :file_types        => "iPlayer programmes",
@@ -52,6 +52,8 @@ module Translations
     [self.class.get_translation_namespace, key.to_s].flatten.compact.join(".").split(".").inject(STRINGS){ |hash, subkey|
       hash[subkey.to_sym]
     }.gsub(/\{\{([^\}]+)\}\}/){ methods[$1.to_sym] }
+  rescue
+    "MISSING TRANSLATION: #{key}"
   end
 
   def self.included(klass)

data/lib/iplayer/version.rb

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

metadata

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