svt-recorder 1.0.2 → 1.0.3

data/ChangeLog

@@ -1,3 +1,15 @@
+2012-09-14  Björn Andersson  <ba@sanitarium.se>, v1.0.3
+
+	SVT changed so that the playlists downloaded for a bitrate could be
+	a complete URL instead of just part of a chunk. This new naming scheme
+	changed so that downloads didn't complete fully on new videos.
+
+	So now the script always use the complete URL from the playlist instead
+	of making up its own URL based on off how it ought to be. Thus this
+	should be more future proof.
+
+	Fingers crossed. :)
+
 2012-09-14  Björn Andersson  <ba@sanitarium.se>, v1.0.2
 
 	Oops, typo in the recorder which affected urls with characters that

data/bin/svt-recorder

@@ -51,15 +51,15 @@ class HTTPDownload
     File.open(@file, 'wb+') do |file|
       @downloader.parts do |part|
         begin
-          @server.request_get(File.join(@base_url.path, part),
-                              @headers) do |res|
+          @server.request_get(part, @headers) do |res|
             res.read_body do |body|
               file.write body
             end
           end # /@server
-        rescue Timeout::Error
+        rescue Timeout::Error, EOFError, Errno::ECONNRESET => exception
           yield -1
           @server = Net::HTTP.start(@base_url.host, @base_url.port)
+          STDERR.puts "Connection error..."
           retry
         end
 
@@ -98,6 +98,7 @@ if File.exists? output_file
 end
 
 progress = ProgressBar.new(downloader.parts?, :bar, :elapsed, :eta, :counter)
+puts "Starting recording..."
 HTTPDownload.new(downloader, output_file) do |down|
   down.fetch_all {|part| progress.increment! }
   puts "\nFinished recording: #{output_file}"

data/lib/svt/recorder.rb

@@ -33,6 +33,6 @@ module SVT #:nodoc:
       end
     end
 
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/lib/svt/recorder/base.rb

@@ -48,14 +48,15 @@ module SVT
 
         @bitrates   = {} # bitrate => stream
         @part_base  = ''
-        @first_part = 0
-        @last_part  = 0
+        @parts      = []
       end
 
       attr_reader :title
       attr_reader :base_url
       attr_reader :bitrate
 
+      def last_part ; @parts.size ; end
+
       # All part URL:s for a specific +bitrate+
       #
       # Args:
@@ -72,14 +73,17 @@ module SVT
                      bitrate
                    end
 
-        url = File.join(@base_url, @bitrates[@bitrate])
+        url = @bitrates[@bitrate]
+        unless url.match(/^http/)
+          url = File.join(@base_url, @bitrates[@bitrate])
+        end
 
         open(url).each do |row|
           next if row[0..0] == '#'
           row.strip!
 
           @part_base = File.dirname(row) if @part_base.empty?
-          @last_part += 1
+          @parts << File.basename(row)
         end
 
         self
@@ -101,13 +105,13 @@ module SVT
       #   A complete part download URL
       #
       # Returns:
-      #   All parts in an ordered array, first -> last
+      #   All parts in an ordered array, first -> last, full URL
       def parts
-        part_urls() if @last_part == 0
+        part_urls() if last_part == 0
 
         if block_given?
-          (@first_part...@last_part).each do |i|
-            yield "#{@part_base}/segment#{i}.ts"
+          @parts.each do |i|
+            yield "#{@part_base}/#{i}"
           end
         else
           # I want you Object#tap
@@ -122,15 +126,15 @@ module SVT
       # Returns:
       #   int the numbers of parts, 0 index
       def parts?
-        part_urls() if @last_part == 0
+        part_urls() if last_part == 0
 
-        return @last_part
+        return last_part
       end
 
       # Yields all +parts+ concatenated with base_url
       def all_parts
         parts do |part|
-          yield File.join(base_url, part)
+          yield "#{base_url}/#{part}"
         end
       end
 
@@ -145,7 +149,6 @@ module SVT
         bitrate = nil
         open(@stream).each do |row|
           row.strip!
-          row = File.basename(row) if row.match(/^http/)
 
           if bitrate
             @bitrates[bitrate] = CGI.unescape(row)

data/spec/svt_recorder_play_spec.rb

@@ -21,14 +21,6 @@ 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' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svt-recorder
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: