flvedit 0.6.2 → 0.6.3

data/Rakefile

@@ -39,7 +39,7 @@ begin
     gem.authors = ["Marc-André Lafortune"]
     gem.rubyforge_project = "flvedit"
     gem.add_dependency "packable", ">=1.2"
-    gem.add_dependency "backports"
+    gem.add_dependency "backports", ">=1.6.8"
     gem.has_rdoc = true
     gem.rdoc_options << '--title' << 'FLV::Edit' <<
                            '--main' << 'README.rdoc' <<

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 6
-:patch: 2
+:patch: 3

data/bin/flvedit

@@ -6,9 +6,13 @@
 #++
  
 begin
-  require 'flv/edit'
+  require 'flvedit'
 rescue LoadError
-  require 'rubygems'
-  require 'flv/edit'
+  begin
+    require 'rubygems'
+    require 'flvedit'
+  rescue LoadError
+    require 'lib/flvedit'
+  end
 end
 FLV::Edit::Runner.new(ARGV).run

data/lib/{flv → flvedit/flv}/audio.rb

@@ -6,7 +6,7 @@ module FLV
   class Audio < String
     include Body
 
-    FORMATS = Hash.new{|h, key| "Unknown audio format: #{key}"}.merge(
+    FORMATS = Hash.new{|h, key| "Unknown audio format: #{key}"}.merge!(
       0  => :"Linear PCM, platform endian"  ,
       1  => :ADPCM                          ,
       2  => :MP3                            ,
@@ -29,7 +29,10 @@ module FLV
       :"MP3 8-kHz"              => {:rate => 8000}
     ).freeze
     
-    CHANNELS = { 0 => :mono, 1 => :stereo}.freeze
+    CHANNELS = {
+      0 => :mono,
+      1 => :stereo
+    }.freeze
 
     def codec_id
       read_bits(0..3)

data/lib/{flv → flvedit/flv}/base.rb

@@ -13,15 +13,17 @@ module FLV
     def getters(of=self)
       of.class.ancestors.
         map{|k| k.instance_methods(false)}.
-        inject{|proper, methods| proper -= methods}.  # tricky: first ancestor is of.class, so that's what we start with
+        inject(:-).  # cute and tricky! remember that the first ancestor is of.class itself, so that's what we start with
         select{|m| of.class.instance_method(m).arity.between?(-1,0)}
     end
     
-    def to_h(attributes = getters)
-      Hash[attributes.map do |a|
-        a = a.to_s.delete("@").to_sym
-        [a, send(a)]
-      end]
+    def to_hash(attributes = getters)
+      Hash[
+        attributes.map do |a|
+          a = a.to_s.delete("@").to_sym
+          [a, send(a)]
+        end
+      ]
     end
     
     def is?(what)

data/lib/{flv → flvedit/flv}/body.rb

@@ -11,9 +11,9 @@ module FLV
       end
     end
     
-    module InstanceMethods # :nodoc:
+    module InstanceMethods
       def debug(format, *) #:nodoc
-        format.values(to_h)
+        format.values(to_hash)
       end
 
       def is?(what)
@@ -35,11 +35,12 @@ module FLV
       end
     end 
     
-    module InstanceMethodsWhenString # :nodoc:
+    module InstanceMethodsWhenString
       # Returns an +Integer+ computed from bits specified by +which+.
       # The 0th bit is the most significant bit of the first character.
       # +which+ can designate a range of bits or a single bit
       def read_bits(which)
+        # :reading_this => :headache, sorry
         which = which..which if which.is_a? Integer
         first_byte, last_byte = which.first >> 3, which.max >> 3
         return (getbyte(first_byte) >> (7 & ~which.max)) & ~(~1 << which.max-which.first) if(first_byte == last_byte)

data/lib/{flv → flvedit/flv}/header.rb

@@ -31,7 +31,7 @@ module FLV
     
     def debug(format, *)
       format.header("Header", path)
-      format.values(to_h.tap{|h| [:path, :timestamp, :body].each{|key| h.delete(key)}})
+      format.values(to_hash.tap{|h| [:path, :timestamp, :body].each{|key| h.delete(key)}})
     end
     
     def timestamp

data/lib/{flv → flvedit/flv}/packing.rb

@@ -26,11 +26,13 @@ module FLV
        8 => [Hash, :flv_with_size],
        9 => EndOfList ,
       10 => Array     ,
-      11 => Time
+      11 => Time      ,
+      nil => NilClass
     ).freeze
     
     CLASS_TO_TYPE = Hash.new do |h, klass|
-      h[klass] = h[klass.superclass] # Makes it such that CLASS_TO_TYPE[Fixnum] = CLASS_TO_TYPE[Integer]
+      # Makes it such that CLASS_TO_TYPE[Fixnum] = CLASS_TO_TYPE[Integer], etc.
+      h[klass] = h[klass.superclass]
     end.merge!(TYPE_TO_CLASS.invert).merge!(
       Event => TYPE_TO_CLASS.key([Hash, :flv_with_size]), # Write Events as hashes with size
       FalseClass => TYPE_TO_CLASS.key(TrueClass)
@@ -40,6 +42,7 @@ module FLV
     Object.packers.set(:flv_value) do |packer|
       packer.write do |io|
         type_nb = CLASS_TO_TYPE[self.class]
+        raise "Trying to write #{self.inspect}" unless type_nb
         klass, format = TYPE_TO_CLASS[type_nb]
         io << [type_nb, :char] << [self, format || :flv]
       end
@@ -100,7 +103,7 @@ module FLV
     Hash.packers.set(:flv) do |packer|
       packer.write do |io|
         each do |key, value|
-          io << [key.to_s, :flv] << [value, :flv_value]
+          io << [key.to_s, :flv] << [value, :flv_value] rescue raise "Hash[#{key}] is set to #{value.inspect}"
         end
         io << ["", :flv] << [EndOfList.instance, :flv_value]
       end

data/lib/{flv/edit → flvedit}/options.rb

@@ -40,7 +40,8 @@ module FLV
           parser.separator "Switches:"
           [
             [:keyframe_mode,      "Keyframe mode slides on_cue_point(navigation) tags added by the",
-                                  "add command to nearest keyframe position"]
+                                  "add command to nearest keyframe position"],
+            [:trace,              "Show backtrace for errors"]
           ].each do |switch, *desc|
             shortcut = desc.first.is_a?(Symbol) ? desc.shift.to_s : switch.to_s[0..0]
             full = desc.first.is_a?(Class) ? "--#{switch.to_s} N" : "--#{switch.to_s}"

data/lib/{flv/edit → flvedit}/processor/base.rb

@@ -44,7 +44,11 @@ module FLV
       
         # Simple utility going through each chunk of each source
         def process_all
-          each_source{each{}}
+          each_source{ each{} }
+        end
+
+        def clone
+          self.class.new(source.try(:clone), options)
         end
 
       protected

data/lib/{flv/edit → flvedit}/processor/cut.rb

@@ -5,7 +5,7 @@ module FLV
       # Cut is a Processor class (see Base and desc)
       class Cut < Base
         desc ["Cuts selects the tags within RANGE.",
-              "The timestamps are offset so that the first tag as timestamp 0"],
+              "The timestamps are offset so that the first tag has timestamp 0"],
               :param => {:class => TimestampRange, :name => "RANGE"}, :shortcut => "x"
 
         include Filter

data/lib/{flv/edit → flvedit}/processor/meta_data_maker.rb

@@ -95,7 +95,7 @@ module FLV
             :canSeekToEnd           => @info[Video].last.frame_type == :keyframe,
             :lastkeyframetimestamp  => @key_frames.last.first || 0
           ) if meta[:hasVideo]
-        
+          
           meta.merge!(
             :stereo                 => @info[Audio].first.channel == :stereo,
             :audiosamplerate        => @info[Audio].first.rate,

data/lib/{flv/edit → flvedit}/processor/printer.rb

@@ -17,7 +17,7 @@ module FLV
 
         # Prints out a hash (or any list of key-value pairs) in two columns
         def values(hash)
-          hash.map{|k,v| [k.to_s, v] }.sort.each do |key, value|
+          hash.each do |key, value|
             @io.puts "#{@margin_left}#{key.to_s.ljust(@options[:column_width])}: #{value.inspect.delete(':"')}"
           end
         end

data/lib/{flv/edit → flvedit}/processor/reader.rb

@@ -10,23 +10,24 @@ module FLV
           raise "Invalid filenames: #{options[:files].inspect}" unless options[:files].all?
           raise "Please specify at least one filename" if options[:files].empty?
           raise NotImplemented, "Reader can't have a source (other than options[:files])" if source
-          rewind
+          rewind_source
         end
 
         def each_source
           return to_enum(:each_source) unless block_given?
-          rewind
+          rewind_source
           yield until @sources.empty?
         end
         
         def each
+          p "Opening #{@sources.first}"
           FLV::File.open(@sources.shift) do |f|
             @source = f
             super
           end
         end
         
-        def rewind
+        def rewind_source
           @sources = options[:files].dup
         end
       end

data/lib/{flv/edit → flvedit}/processor/save.rb

@@ -6,22 +6,17 @@ module FLV
       class Save < Base
         desc "Saves the result to PATH", :param => {:class => String, :name => "PATH"}
         
-        def each_source
-          return to_enum(:each_source) unless block_given?
-          @out = FLV::File::open(options[:save] || (h.path+".temp"), "w+b")
-          super
-        ensure
-          @out.close
-          finalpath = @out.path.sub(/\.temp$/, '')
-          FileUtils.mv(@out.path, finalpath) unless finalpath == @out.path
-        end
-        
         def each
           return to_enum unless block_given?
+          @out = FLV::File::open(options[:save] || (h.path+".temp"), "w+b")
           super do |chunk|
             @out << chunk
             yield chunk
           end
+        ensure
+          @out.close
+          finalpath = @out.path.sub(/\.temp$/, '')
+          FileUtils.mv(@out.path, finalpath) unless finalpath == @out.path          
         end
       end
     end

data/lib/{flv/edit → flvedit}/processor/update.rb

@@ -10,17 +10,19 @@ module FLV
         desc "Updates FLV with an onMetaTag event containing all the relevant information."
         def initialize(source=nil, options={})
           super
-          @meta_data_maker = MetaDataMaker.new(source.dup, options)
+          @meta_data_maker = MetaDataMaker.new(source.clone, options)
         end
       
       
-        def each(&block)
+        def each
           return to_enum unless block_given?
           begin
             @meta_data_maker.each {}
-          ensure  # even if each throws, we better call super otherwise we won't be synchronized anymore!
+          rescue Exception => e  # even if each throws, we better call super otherwise we won't be synchronized anymore!
             super rescue nil
-            raise if $!
+            raise e
+          else
+            super
           end
         end
       

data/lib/{flv/edit → flvedit}/runner.rb

@@ -13,7 +13,7 @@ module FLV
       def run
         commands = [*@commands].map{|c| c.is_a?(Class) ? c : Processor.const_get(c.to_s.camelize)}
         commands.unshift Processor::Reader
-        commands << Processor::CommandLine unless options[:dont_catch_errors]
+        commands << Processor::CommandLine unless options[:trace]
         Processor.chain(commands, @options).process_all
       end
       

data/lib/{flv/edit → flvedit}/version.rb

@@ -1,6 +1,6 @@
 module FLV
   module Edit
-    FILE = ::File.dirname(__FILE__) + '/../../../VERSION.yml'
+    FILE = ::File.dirname(__FILE__) + '/../../VERSION.yml'
     
     class Version < Struct.new(:major, :minor, :patch) # :nodoc:
       def to_s

data/lib/{flv/edit.rb → flvedit.rb}

@@ -1,10 +1,10 @@
 require 'rubygems'
 require 'backports'
-require_relative '../flv'
-require_relative 'edit/version'
-require_relative 'edit/options'
-require_relative 'edit/processor'
-require_relative 'edit/runner'
+require_relative 'flvedit/flv'
+require_relative 'flvedit/version'
+require_relative 'flvedit/options'
+require_relative 'flvedit/processor'
+require_relative 'flvedit/runner'
 
 #todo Change bin/flvedit
 #todo Auto write to files
@@ -17,4 +17,4 @@ require_relative 'edit/runner'
 #todo in|out pipe
 #todo recursive?
 #todo fix offset, both 24bit issue & apparent skips
-#todo bug join & time for audio vs video
+#todo bug join & time for audio vs video

data/test/test_flv_edit.rb

@@ -20,7 +20,7 @@ class TestFlvEdit < Test::Unit::TestCase
     should "save" do
       assert !File.exist?(TEMP_FLV)
       runner = FLV::Edit::Runner.new([SHORT_FLV, "--Update", "--Save", TEMP_FLV])
-      runner.options[:dont_catch_errors] = true
+      runner.options[:trace] = true
       runner.run
       assert File.exist?(TEMP_FLV)
     end

data/test/test_flv_edit_results.rb

@@ -12,7 +12,7 @@ class TestFlvEdit < Test::Unit::TestCase
           Time.stubs(:now).returns(Time.utc(2008,"dec",20))
           @result = ""
           runner = FLV::Edit::Runner.new(args)
-          runner.options[:dont_catch_errors] = true
+          runner.options[:trace] = true
           runner.options[:out] = StringIO.new(@result)
           runner.run
         end

data/test/test_helper.rb

@@ -1,9 +1,9 @@
 require 'test/unit' 
 require 'rubygems'
 require 'backports'
-require_relative '../lib/flv/edit'
 require 'shoulda'
 require 'mocha'
+require_relative '../lib/flvedit'
 
 SHORT_FLV = File.dirname(__FILE__) + "/fixtures/short.flv"
 TEMP_FLV = File.dirname(__FILE__) + "/fixtures/short_temp.flv"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flvedit
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - "Marc-Andr\xC3\xA9 Lafortune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 -04:00
+date: 2009-05-01 00:00:00 -04:00
 default_executable: flvedit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.6.8
     version: 
 description: "flvedit allows you to: * compute metadata for FLV files * merge, split or cut FLVs * insert / remote cue points or other events  flvedit is meant as a replacement for FLVTool2, FLVMeta, FLVTool++ It can be used as a command line tool or as a Ruby library."
 email: github@marc-andre.ca
@@ -48,38 +48,38 @@ files:
 - Rakefile
 - VERSION.yml
 - bin/flvedit
-- lib/flv.rb
-- lib/flv/audio.rb
-- lib/flv/base.rb
-- lib/flv/body.rb
-- lib/flv/edit.rb
-- lib/flv/edit/options.rb
-- lib/flv/edit/processor.rb
-- lib/flv/edit/processor/add.rb
-- lib/flv/edit/processor/base.rb
-- lib/flv/edit/processor/command_line.rb
-- lib/flv/edit/processor/cut.rb
-- lib/flv/edit/processor/debug.rb
-- lib/flv/edit/processor/dispatcher.rb
-- lib/flv/edit/processor/filter.rb
-- lib/flv/edit/processor/head.rb
-- lib/flv/edit/processor/join.rb
-- lib/flv/edit/processor/meta_data_maker.rb
-- lib/flv/edit/processor/print.rb
-- lib/flv/edit/processor/printer.rb
-- lib/flv/edit/processor/reader.rb
-- lib/flv/edit/processor/save.rb
-- lib/flv/edit/processor/update.rb
-- lib/flv/edit/runner.rb
-- lib/flv/edit/version.rb
-- lib/flv/event.rb
-- lib/flv/file.rb
-- lib/flv/header.rb
-- lib/flv/packing.rb
-- lib/flv/tag.rb
-- lib/flv/timestamp.rb
-- lib/flv/util/double_check.rb
-- lib/flv/video.rb
+- lib/flvedit.rb
+- lib/flvedit/flv.rb
+- lib/flvedit/flv/audio.rb
+- lib/flvedit/flv/base.rb
+- lib/flvedit/flv/body.rb
+- lib/flvedit/flv/event.rb
+- lib/flvedit/flv/file.rb
+- lib/flvedit/flv/header.rb
+- lib/flvedit/flv/packing.rb
+- lib/flvedit/flv/tag.rb
+- lib/flvedit/flv/timestamp.rb
+- lib/flvedit/flv/util/double_check.rb
+- lib/flvedit/flv/video.rb
+- lib/flvedit/options.rb
+- lib/flvedit/processor.rb
+- lib/flvedit/processor/add.rb
+- lib/flvedit/processor/base.rb
+- lib/flvedit/processor/command_line.rb
+- lib/flvedit/processor/cut.rb
+- lib/flvedit/processor/debug.rb
+- lib/flvedit/processor/dispatcher.rb
+- lib/flvedit/processor/filter.rb
+- lib/flvedit/processor/head.rb
+- lib/flvedit/processor/join.rb
+- lib/flvedit/processor/meta_data_maker.rb
+- lib/flvedit/processor/print.rb
+- lib/flvedit/processor/printer.rb
+- lib/flvedit/processor/reader.rb
+- lib/flvedit/processor/save.rb
+- lib/flvedit/processor/update.rb
+- lib/flvedit/runner.rb
+- lib/flvedit/version.rb
 - test/fixtures/corrupted.flv
 - test/fixtures/short.flv
 - test/fixtures/tags.xml