svt-recorder 1.0.0 → 1.0.1

data/ChangeLog

@@ -1,3 +1,16 @@
+2012-09-09 Björn Andersson <ba@sanitarium.se>, v1.0.1
+
+	User request for a better progress bar, so I've obliged with the
+	excellent `progress_bar` gem by Paul Sadauskas.
+	https://github.com/paul/progress_bar
+
+	* svt-recorder uses a new progress bar that estimates time to
+	  completion, shows how long the download has been going on and
+	  also displays how many chunks that has been downloaded together
+	  with the total number of chunks.
+	* SVT::Recorder.fetch_playlist doesn't need to be called with
+	  a block anymore.
+
 2012-06-04 Björn Andersson <ba@sanitarium.se>, v1.0.0
 
 	SVT has changed their website and thus the way data is fetched.

data/Gemfile

@@ -2,8 +2,8 @@ source "http://rubygems.org/"
 
 gem 'json_pure', '~> 1.0'
 gem 'nokogiri', '~> 1.0'
+gem 'progress_bar', '~> 0.4'
 
 group :development do
   gem 'rspec', '~> 2.0'
 end
-

data/bin/svt-recorder

@@ -12,6 +12,7 @@ end
 require 'tempfile'
 require 'readline'
 require 'ostruct'
+require 'progress_bar'
 
 if ARGV.empty? or ARGV[0].match(/\A(-h)|((--)?help)\Z/i)
   puts "Usage: #{$0.split(/\//)[-1]} <SVT Play URL> [name of output file]"
@@ -31,7 +32,6 @@ class HTTPDownload
     @downloader = downloader
     @headers = {'User-Agent' => 'Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.2.10) Gecko/20100914 Firefox/3.6.10'}
     @file = output
-
     @server = Net::HTTP.start(@base_url.host, @base_url.port)
 
     if block_given?
@@ -53,15 +53,8 @@ class HTTPDownload
         begin
           @server.request_get(File.join(@base_url.path, part),
                               @headers) do |res|
-
             res.read_body do |body|
               file.write body
-              downloaded += body.size
-
-              if downloaded >= megabyte
-                downloaded -= megabyte
-                yield mb_down += 1
-              end
             end
           end # /@server
         rescue Timeout::Error
@@ -69,7 +62,9 @@ class HTTPDownload
           @server = Net::HTTP.start(@base_url.host, @base_url.port)
           retry
         end
-      end # /@list
+
+        yield part
+      end # /parts
     end # /File
   end
 
@@ -102,8 +97,8 @@ if File.exists? output_file
   exit 1 unless overwrite.match(/Y/i)
 end
 
+progress = ProgressBar.new(downloader.parts?, :bar, :elapsed, :eta, :counter)
 HTTPDownload.new(downloader, output_file) do |down|
-  print "Progress: "
-  down.fetch_all {|part| print (part > 0)? '.': 'r' }
+  down.fetch_all {|part| progress.increment! }
   puts "\nFinished recording: #{output_file}"
 end

data/lib/svt/recorder.rb

@@ -33,6 +33,6 @@ module SVT #:nodoc:
       end
     end
 
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/svt/recorder/base.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
+require 'cgi'
 
 module SVT
   module Recorder
@@ -16,6 +17,7 @@ module SVT
     #   url :: The URL from data-json-href, Play have to add modify the URL
     #          to make it absolute. So the caller makes any modifications
     #          before the JSON-file gets fetched.
+    #          Not required to work.
     #
     # Returns:
     #   A hash with these keys:
@@ -24,18 +26,18 @@ module SVT
     def self.fetch_playlist(url, css_path)
       doc = Nokogiri::HTML(open(url).read)
       player = doc.at_css(css_path)
-      stream = player['data-json-href']
-      stream = yield stream
+      stream = CGI.unescape(player['data-json-href'])
+      stream = yield stream if block_given?
 
       js = JSON.parse(open(stream).read)
       if not js['video']['availableOnMobile']
-        raise ArgumentError, "The passed in URL is not available for mobile, non-rtmp"
+        raise ArgumentError, "The passed in URL is not available for mobile"
       end
 
       title = js['context']['title']
       v = js['video']['videoReferences'].find({}) {|v| v['playerType'] == 'ios' }
 
-      {:title => title, :url => v['url']}
+      return({:title => title, :url => CGI.unescape(v['url'])}) if not v.empty?
     end
 
     class Base
@@ -115,6 +117,16 @@ module SVT
         end
       end
 
+      # Returns the number of parts this recording got
+      #
+      # Returns:
+      #   int the numbers of parts, 0 index
+      def parts?
+        part_urls() if @last_part == 0
+
+        return @last_part
+      end
+
       # Yields all +parts+ concatenated with base_url
       def all_parts
         parts do |part|
@@ -124,6 +136,7 @@ module SVT
 
       #--
       # A naïve parser, but until it turns out to be a problem it'll do.
+      # 2012=09-09: If a FQDN address is given only return the basename
       #
       # The format is:
       #   EXT-X-.... BANDWIDTH=<bitrate>
@@ -132,9 +145,10 @@ module SVT
         bitrate = nil
         open(@stream).each do |row|
           row.strip!
+          row = File.basename(row) if row.match(/^http/)
 
           if bitrate
-            @bitrates[bitrate] = row
+            @bitrates[bitrate] = CGI.escape(row)
             bitrate = nil
           end
 

data/lib/svt/recorder/rapport.rb

@@ -15,7 +15,7 @@ module SVT
     # Usage is the same as for SVT::Recorder::Play.
     class Rapport < Base
       def initialize(url)
-        video = SVT::Recorder.fetch_playlist(url, '.svtplayer') {|url| url }
+        video = SVT::Recorder.fetch_playlist(url, '.svtplayer')
 
         super(video)
       end

data/spec/spec_helper.rb

@@ -3,3 +3,4 @@ require 'svt/recorder'
 $play_html        = 'spec/support/example-page.html'
 $faulty_play_html = 'spec/support/faulty-example-page.html'
 $rapport_url      = 'spec/support/rapport.html'
+$stream_http      = 'spec/support/streams-with-http.m3u8'

data/spec/support/rapport.html

@@ -415,7 +415,7 @@ data-title=""Jag var jättestressad i finalen" - SVT.se"
 data-length="535"
 data-id="113083"
 data-popout-href="http://svt.se/wd?widgetId=32050&sectionId=532&articleId=113083&type=embed&contextSectionId=532"
-data-json-href="http://svt.se/wd?widgetId=32050&sectionId=532&articleId=113083&position=0&format=json&type=embed&contextSectionId=532"
+data-json-href="spec/support/rapport.json"
 data-embed-href="http://svt.se/wd?widgetId=32050&sectionId=532&articleId=113083&type=embed&contextSectionId=532"
 data-disabled="end">
 <img class="svtJsReplaceImage svtPlayerImage" alt=" " src="/svts/article113082.svt/ALTERNATES/large/default_title" />
@@ -772,4 +772,4 @@ $(document).ready(function() {
 <img src="http://ld.svt.se/svt/svt/s?svtse.nyheter.nyhetsklipp.nyheter.%22jag-var-j%C3%A4ttestressad-i-finalen%22&amp;svt_section_id=532&amp;svt_program_name=nyheter&amp;svt_section_name=nyheter&amp;svt_article_title=%22jag-var-j%C3%A4ttestressad-i-finalen%22&amp;svt_context_id=532&amp;svt_context_name=nyheter&amp;svt_cat_name=nyheter&amp;svt_article_type=videoklipp&amp;svt_article_id=113083&amp;client=web" width="1" height="1" alt=""/>
 </noscript>
 <script type="text/javascript">if (!NREUMQ.f) { NREUMQ.f=function() {NREUMQ.push(["load",new Date().getTime()]);var e=document.createElement("script");e.type="text/javascript";e.src=(("http:"===document.location.protocol)?"http:":"https:") + "//" + "d1ros97qkrwjf5.cloudfront.net/34/eum/rum.js";document.body.appendChild(e);if(NREUMQ.a)NREUMQ.a();};NREUMQ.a=window.onload;window.onload=NREUMQ.f;};NREUMQ.push(["nrfj","beacon-1.newrelic.com","7aa7765553",908109,"bwdWYRFVV0AEU0BfDlZNfmYzG01WCEBYVxVdTVdaDllWXUtaR0Y=",0,297,new Date().getTime(),"","","","",""]);</script></body>
-</html> 
+</html>

data/spec/support/streams-with-http.m3u8

@@ -0,0 +1,13 @@
+#EXTM3U
+#EXT-X-STREAM-INF:PROGRAM-ID=1, BANDWIDTH=258450
+http://whatever.ding.se/hej/PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer1_vod.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1, BANDWIDTH=697107
+http://whatever.ding.se/hej/PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer2_vod.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1, BANDWIDTH=143234
+http://whatever.ding.se/hej/PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer3_vod.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1, BANDWIDTH=49212
+http://whatever.ding.se/hej/PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer4_vod.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1, BANDWIDTH=1364631
+http://whatever.ding.se/hej/PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer5_vod.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1, BANDWIDTH=2498313, CODECS="avc1.4d001f"
+http://whatever.ding.se/hej/PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer6_vod.m3u8

data/spec/svt_recorder_play_spec.rb

@@ -21,6 +21,14 @@ module SVT
 
           data.title.should == title
         end
+
+        it 'should handle streams with http and just give of the basename' do
+          # An error when fetching Rapport videos, the playlist at times had
+          # a FQDN
+          data = SVT::Recorder::Base.new({:url => $stream_http,
+                                           :title => 'Whatever'})
+          data.parts[0].should == 'PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer6/3512_Period1/segment0.ts'
+        end
       end
 
       let(:title)        { 'Glödlampskonspirationen' }
@@ -87,7 +95,12 @@ module SVT
           recorder.parts[0].should == 'PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer6/3512_Period1/segment0.ts'
         end
       end
+
+      describe '#parts?' do
+        it 'should return the amount of parts in this recording' do
+          recorder.parts?().should == no_parts
+        end
+      end
     end # /Play
   end # /Recorder
 end # /SVT
-

data/svt-recorder.gemspec

@@ -20,6 +20,6 @@ Gem::Specification.new do |s|
   s.rdoc_options << '-x spec --main lib/svt/recorder.rb --line-numbers'
   s.add_dependency('json_pure', '~> 1.0')
   s.add_dependency('nokogiri', '~> 1.0')
+  s.add_dependency('progress_bar', '~> 0.4')
   s.add_development_dependency('rspec', '~> 2.0.0')
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svt-recorder
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-04 00:00:00.000000000 Z
+date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &75889310 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,47 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *75889310
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &76400980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: progress_bar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *76400980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76413220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +69,12 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *76413220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 description: A program that helps you record videos from SVTPlay.se and PlayRapport.se
 email: ba@sanitarium.se
 executables:
@@ -58,21 +89,22 @@ files:
 - Gemfile
 - svt-recorder.gemspec
 - ChangeLog
-- lib/svt/recorder.rb
 - lib/svt/recorder/base.rb
-- lib/svt/recorder/rapport.rb
 - lib/svt/recorder/play.rb
-- spec/svt_recorder_rapport_spec.rb
+- lib/svt/recorder/rapport.rb
+- lib/svt/recorder.rb
 - spec/spec_helper.rb
 - spec/svt_recorder_play_spec.rb
+- spec/svt_recorder_rapport_spec.rb
 - spec/svt_recorder_spec.rb
-- spec/support/109244-nomobile
 - spec/support/109244
+- spec/support/109244-nomobile
 - spec/support/example-page.html
-- spec/support/rapport.json
+- spec/support/faulty-example-page.html
 - spec/support/PG-1279307-001A-DOKUMENTUTIFRAN-02-hts-a-v1_Layer6_vod.m3u8
 - spec/support/rapport.html
-- spec/support/faulty-example-page.html
+- spec/support/rapport.json
+- spec/support/streams-with-http.m3u8
 - spec/support/streams.m3u8
 - bin/svt-recorder
 homepage: http://github.com/gaqzi/svt-recorder
@@ -96,11 +128,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A program that helps you record videos from SVTPlay.se and PlayRapport.se
 test_files:
-- spec/svt_recorder_rapport_spec.rb
 - spec/svt_recorder_play_spec.rb
+- spec/svt_recorder_rapport_spec.rb
 - spec/svt_recorder_spec.rb