tracksperanto 3.2.0 → 3.2.1

data/Gemfile

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 source :rubygems
 
-gem "tickly", "~> 0.0.2"
+gem "tickly", "~> 0.0.4"
 gem "obuf", "~> 1.1.0"
 gem "progressive_io", "~> 1.0"
 gem "flame_channel_parser", "~> 4.0"

data/History.txt

@@ -1,3 +1,7 @@
+=== 3.2.1
+
+* Improve Nuke 7 import support with the new version of Tickly
+
 === 3.2.0
 
 * Add Nuke 7 import support

data/lib/import/nuke_grammar/utils.rb

@@ -6,6 +6,7 @@ class Tracksperanto::NukeGrammarUtils
   # Scan a TCL curve expression into a number of tuples of [frame, value]
   def parse_curve(atoms)
     # Replace the closing curly brace with a curly brace with space so that it gets caught by split
+    atoms.shift # remove the :c curly designator
     atoms.shift # remove the "curve" keyword
     tuples = []
     # Nuke saves curves very efficiently. x(keyframe_number) means that an uninterrupted sequence of values will start,

data/lib/import/nuke_script.rb

@@ -1,7 +1,6 @@
 # -*- encoding : utf-8 -*-
-require 'delegate'
-require File.expand_path(File.dirname(__FILE__)) + "/nuke_grammar/utils"
 require 'tickly'
+require File.expand_path(File.dirname(__FILE__)) + "/nuke_grammar/utils"
 
 class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
   
@@ -17,18 +16,29 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     'The only supported nodes that we can extract tracks from are Reconcile3D, PlanarTracker and Tracker (supported Nuke versions are 5, 6 and 7)'
   end
   
+  class Tickly::Parser
+  end
+  
+  class Levaluator < Tickly::Evaluator
+    def evaluate(expr)
+      s = super
+      yield(s) if s
+    end
+  end
+  
   def each
+    parser = Tickly::NodeExtractor.new("Tracker3", "Tracker4", "PlanarTracker1_0", "Reconcile3D")
     script_tree = Tickly::Parser.new.parse(@io)
-    evaluator = Tickly::Evaluator.new
+    
+    evaluator = Levaluator.new
     evaluator.add_node_handler_class(Tracker3)
     evaluator.add_node_handler_class(Reconcile3D)
     evaluator.add_node_handler_class(PlanarTracker1_0)
     evaluator.add_node_handler_class(Tracker4)
     
     script_tree.each do | node |
-      result = evaluator.evaluate(node)
-      if result
-        result.trackers.each do | t |
+      evaluator.evaluate(node) do | node_object |
+        node_object.trackers.each do | t |
           report_progress("Scavenging tracker #{t.name}")
           yield t
         end
@@ -71,8 +81,9 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
     
     def extract_curves_from_channel(point_channel)
       u = Tracksperanto::NukeGrammarUtils.new
-      point_channel.to_a.map do | curve_argument | 
-        if curve_argument[0] == "curve"
+      # First element is the :c curly identifier
+      point_channel[1..-1].map do | curve_argument | 
+        if curve_argument[1] == "curve"
           u.parse_curve(curve_argument.to_a)
         else
           nil
@@ -105,12 +116,10 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
       @name = options["name"]
       @trackers = []
       tracks = options["tracks"]
-      preamble = tracks[0]
-      headers = tracks[1]
-      values = tracks[2]
+      preamble = tracks[1]
+      headers = tracks[2]
+      values = tracks[3]
       
-      table_headers = headers[0].map{|header| header[0][-1]}
-      #puts table_headers.inspect
       # When this was written, this was the order of the columns in the table:
       # le("e", "name", "track_x", "track_y", "offset_x", "offset_y", "T", "R", "S", "error", 
       #  "error_min", "error_max", "pattern_x", "pattern_y", "pattern_r", "pattern_t", "search_x",
@@ -120,10 +129,12 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
       
       u = Tracksperanto::NukeGrammarUtils.new
       
-      tracker_rows.each do | row |
-        row_content = row[0][0]
+      # The 0 element is the :c symbol
+      tracker_rows[1..-1].each do | row |
+        row_content = row[0]
+        
         # For offsets see above
-        point_name, x_curve, y_curve = row_content[1], u.parse_curve(row_content[2].to_a), u.parse_curve(row_content[3].to_a)
+        point_name, x_curve, y_curve = row_content[2], u.parse_curve(row_content[3].to_a), u.parse_curve(row_content[4].to_a)
         
         full_name = [options["name"], point_name].join('_')
         tracker = package_tracker(full_name, x_curve, y_curve)

data/lib/tracksperanto.rb

@@ -3,7 +3,7 @@
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
   
   module Import; end
   module Export; end

data/test/import/test_nuke_import.rb

@@ -125,6 +125,21 @@ class NukeImportTest < Test::Unit::TestCase
     assert_equal 9, kf.frame
   end
   
+  
+  def test_parsing_from_nuke7v05_job_1872
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/failing_nuke7_trackers_job_1872.nk')
+    
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
+    parser.width = 2048
+    parser.height = 1556
+    
+    trackers = parser.to_a
+    assert_equal 2, trackers.length
+    assert_equal "Tracker5_track_1", trackers[0].name
+    assert_equal "Tracker5_track_2", trackers[1].name
+    assert_equal 16, trackers[1].length
+  end
+  
   def test_parsing_from_nuke_group
     fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/one_tracker_with_break_in_grp.nk')
     
@@ -143,7 +158,7 @@ class NukeImportTest < Test::Unit::TestCase
   end
   
   def test_parsing_nuke_curve
-    curve = %w( curve x742 888 890.2463989 891.6602783 
+    curve = [:c] + %w( curve x742 888 890.2463989 891.6602783 
 893.5056763 895.6155396 s95 897.2791748 899.1762695 
 x754 912.0731812 x755 913.7190552 916.0959473 918.1025391 920.0751953 922.1898804 )
     p = Tracksperanto::NukeGrammarUtils.new

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "tracksperanto"
-  s.version = "3.2.0"
+  s.version = "3.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = "2013-03-02"
+  s.date = "2013-03-14"
   s.description = "Converts 2D track exports between different apps like Flame, MatchMover, PFTrack..."
   s.email = "me@julik.nl"
   s.executables = ["tracksperanto"]
@@ -212,7 +212,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tickly>, ["~> 0.0.2"])
+      s.add_runtime_dependency(%q<tickly>, ["~> 0.0.4"])
       s.add_runtime_dependency(%q<obuf>, ["~> 1.1.0"])
       s.add_runtime_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_runtime_dependency(%q<flame_channel_parser>, ["~> 4.0"])
@@ -225,7 +225,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<cli_test>, ["~> 1.0"])
       s.add_development_dependency(%q<rake-hooks>, [">= 0"])
     else
-      s.add_dependency(%q<tickly>, ["~> 0.0.2"])
+      s.add_dependency(%q<tickly>, ["~> 0.0.4"])
       s.add_dependency(%q<obuf>, ["~> 1.1.0"])
       s.add_dependency(%q<progressive_io>, ["~> 1.0"])
       s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])
@@ -239,7 +239,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake-hooks>, [">= 0"])
     end
   else
-    s.add_dependency(%q<tickly>, ["~> 0.0.2"])
+    s.add_dependency(%q<tickly>, ["~> 0.0.4"])
     s.add_dependency(%q<obuf>, ["~> 1.1.0"])
     s.add_dependency(%q<progressive_io>, ["~> 1.0"])
     s.add_dependency(%q<flame_channel_parser>, ["~> 4.0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tracksperanto
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-02 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tickly
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: obuf
   requirement: !ruby/object:Gem::Requirement
@@ -411,7 +411,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2047932148332982909
+      hash: -1926493712064861893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: