sequencer 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.0.2 / 2010-05-06
+
+* Add Sequence#from_glob for scavenging all sequences from all subdirs
+* Add Sequence#first_frame_no and Sequence#last_frame_no for first and last frame offset
+* Add Sequence#to_sequences that returns the whole subsequences contained within a sequence
+
 === 1.0.1 / 2010-02-10
 
 * Add Sequence#length, Sequence#to_a, Sequence#directory and Sequence#to_paths

data/Manifest.txt

@@ -3,6 +3,6 @@ History.txt
 Manifest.txt
 README.txt
 Rakefile
-bin/seqls
+bin/rseqls
 lib/sequencer.rb
 test/test_sequencer.rb

data/lib/sequencer.rb

@@ -1,5 +1,5 @@
 module Sequencer
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   NUMBERS_AT_END = /(\d+)([^\d]+)?$/
   
   extend self
@@ -11,6 +11,8 @@ module Sequencer
     groups = {}
     
     actual_files.each do | e |
+      next if File.directory?(File.join(of_dir, e))
+      
       if e =~ NUMBERS_AT_END
         base = e[0...-([$1, $2].join.length)]
         key = [base, $2]
@@ -37,6 +39,12 @@ module Sequencer
     end
   end
   
+  # Detect multiple sequences from a glob result
+  def from_glob(glob_pattern)
+    dirs_of_matched_files = Dir.glob(glob_pattern).map(&File.method(:dirname)).uniq
+    dirs_of_matched_files.map(&method(:entries)).flatten
+  end
+  
   # Get a glob pattern and padding offset for a file in a sequence
   def glob_and_padding_for(path)
     plen = 0
@@ -105,6 +113,23 @@ module Sequencer
       '#<%s>' % to_s
     end
     
+    # If this Sequence has gaps, this method will return an array of all subsequences that it contains
+    #     s # => #<broken_seq.[123..568, 578..702].tif>
+    #     s.to_sequences # => [#<broken_seq.[123..568].tif>, #<broken_seq.[578..702].tif>]
+    def to_sequences
+      return [self] unless gaps?
+      
+      last_offset = 0
+      
+      @ranges.map do | frame_range |
+        frames_in_seg = frame_range.end - frame_range.begin
+        seg_filenames = @filenames[last_offset..(last_offset + frames_in_seg)]
+        last_offset = last_offset + frames_in_seg + 1
+        s = self.class.new(@directory, seg_filenames)
+      end
+    end
+    
+    
     def to_s
       return @filenames[0] if (!numbered? || single_file?)
       
@@ -126,6 +151,10 @@ module Sequencer
       @ranges.length - 1
     end
     
+    def segment_count
+      @ranges.length
+    end
+    
     # Returns the number of frames that the sequence should contain to be continuous
     def missing_frames
       expected_frames - file_count
@@ -162,6 +191,16 @@ module Sequencer
       @filenames.map{|f| File.join(@directory, f) }
     end
     
+    # Returns the number of the first frame in the sequence
+    def first_frame_no
+      @ranges[0].begin
+    end
+
+    # Returns the number of the last frame in the sequence
+    def last_frame_no
+      @ranges[-1].end
+    end
+    
     private
     
     def natural_sort(ar)

data/test/test_sequencer.rb

@@ -47,7 +47,12 @@ def emit_test_dirs
     FileUtils.touch(TEST_DIR + "/many_seqs/anotherS %d.tif" % i)
   end
   FileUtils.touch(TEST_DIR + "/many_seqs/single.tif")
-  $emitted = true
+  
+  FileUtils.mkdir_p(TEST_DIR + "/many_seqs/subdir")
+  (445..471).each do | i |
+    FileUtils.touch(TEST_DIR + "/many_seqs/subdir/in_subdir %d.tif" % i)
+  end
+  
 end
 
 def teardown_test_dirs
@@ -145,12 +150,34 @@ context "A Sequence created from pad-numbered files should" do
     
     @with_gaps.should.be.gaps?
     @with_gaps.gap_count.should.equal 1
+    @with_gaps.segment_count.should.equal 2
     @with_gaps.missing_frames.should.equal(9)
     @with_gaps.inspect.should.blaming("inspect itself").equal('#<broken_seq.[123..568, 578..702].tif>')
     @with_gaps.should.include("broken_seq.000123.tif")
     @with_gaps.should.not.include("bogus.123.tif")
   end
   
+  specify "return subsequences without gaps" do
+    subseqs = @with_gaps.to_sequences
+    subseqs[0].should.be.kind_of(Sequencer::Sequence)
+    subseqs[1].should.be.kind_of(Sequencer::Sequence)
+    
+    first_seq, second_seq = subseqs
+    first_seq.first_frame_no.should.equal 123
+    first_seq.last_frame_no.should.equal 568
+    second_seq.first_frame_no.should.equal 578
+    second_seq.last_frame_no.should.equal 702
+    
+    first_seq.directory.should.equal second_seq.directory
+    first_seq.directory.should.equal @with_gaps.directory
+  end
+  
+  specify "list all sequences in directory and subdirectories using the pattern" do
+    s = Sequencer.from_glob(TEST_DIR + "/**/*.tif")
+    inspected = '[#<single.tif>, #<seq1.[458..512].tif>, #<anotherS [228..312].tif>, #<in_subdir [445..471].tif>, #<seq1.[123..568].tif>, #<somefile.tif>, #<single_file.002123154.tif>, #<broken_seq.[123..568, 578..702].tif>]'
+    s.inspect.should.equal inspected
+  end
+  
   specify "initialize itself from a single file" do
     @single.should.be.single_file?
     @single.inspect.should.equal '#<single_file.002123154.tif>'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sequencer
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 +01:00
+date: 2010-05-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,13 +30,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.6.0
     version: 
 description: Simplifies working with image sequences
 email: 
 - me@julik.nl
 executables: 
-- seqls
+- rseqls
 extensions: []
 
 extra_rdoc_files: 
@@ -49,7 +49,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
-- bin/seqls
+- bin/rseqls
 - lib/sequencer.rb
 - test/test_sequencer.rb
 has_rdoc: true