tracksperanto 3.5.2 → 3.5.4

data/History.txt

@@ -1,3 +1,8 @@
+=== 3.5.4
+
+* Fix parsing Nuke scripts with Tracker4 where some tracks were expression-only
+* Fix parsing Nuke scripts with Tracker4 nodes having empty or no tracks at all
+
 === 3.5.0
 
 * Add early bailout if unsupported formats are fed in. Because some people just can't read.

data/lib/import/nuke_script.rb

@@ -125,6 +125,9 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
       @name = options["name"]
       @trackers = []
       tracks = options["tracks"]
+      
+      return unless tracks # For linked Tracker nodes that have no tracks
+      
       preamble = tracks[1]
       headers = tracks[2]
       values = tracks[3]
@@ -142,12 +145,15 @@ class Tracksperanto::Import::NukeScript < Tracksperanto::Import::Base
         
         # For offsets see above
         point_name = row_content[2]
-        x_curve = Tickly::Curve.new(row_content[3])
-        y_curve = Tickly::Curve.new(row_content[4])
-        
-        full_name = [options["name"], point_name].join('_')
-        tracker = package_tracker(full_name, x_curve, y_curve)
-        @trackers << tracker
+        begin
+          x_curve = Tickly::Curve.new(row_content[3])
+          y_curve = Tickly::Curve.new(row_content[4])
+          full_name = [options["name"], point_name].join('_')
+          tracker = package_tracker(full_name, x_curve, y_curve)
+          @trackers << tracker
+        rescue Tickly::Curve::InvalidCurveError
+          # $stderr.puts "Failed to recover a tracker, it probably contained expressions"
+        end
       end
     end
   end

data/lib/tracksperanto.rb

@@ -5,7 +5,7 @@ require 'tempfile'
 
 module Tracksperanto
   PATH = File.expand_path(File.dirname(__FILE__))
-  VERSION = '3.5.2'
+  VERSION = '3.5.4'
   
   module Import; end
   module Export; end

data/lib/tracksperanto/blacklist.rb

@@ -21,6 +21,9 @@ class Tracksperanto::Blacklist
       /\.(pfb|pfmp)/ => 'We cannot directly open PFTrack projects, export .2dt files instead',
       '.mmf' => 'We cannot directly open MatchMover projects, please export your tracks as .rz2 instead',
       /\.(doc(x?)|xls(x?)|ppt(x?))/ => 'You really think we can process Microsoft Office files? You need a drink.',
+      /\.(abc|fbx)$/ => 'We cannot import 3D scenes such as Alembic or FBX.',
+      '.3de' => 'We cannot handle 3DE project files directly, please export your 2D tracks in a compatible format instead.',
+      '.bpj' => "We cannot handle Boujou projects directly, please export your feature tracks from Boujou as a text file",
     }
   end
 end

data/test/import/test_nuke_import.rb

@@ -257,6 +257,28 @@ class NukeImportTest < Test::Unit::TestCase
     assert_in_delta 510.107, sec_tracker.keyframes[-1].abs_y, DELTA
   end
   
+  def test_no_failure_with_one_tracker4_having_empty_tracks_knob
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/tracker4_with_empty_tracks_knob.nk')
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
+    parser.width = 2088
+    parser.height = 1231
+    
+    trackers = parser.to_a
+    assert_equal 22, trackers.length
+    assert_equal 217, trackers[0].length
+  end
+  
+  def test_no_failure_with_tracker4_having_expressions_in_tracks
+    # Tickly::Curve::InvalidCurveError
+    fixture = File.open(File.dirname(__FILE__) + '/samples/nuke/skip_invalid_curve_expressions.nk')
+    parser = Tracksperanto::Import::NukeScript.new(:io => fixture)
+    parser.width = 960
+    parser.height = 540
+    
+    trackers = parser.to_a
+    assert_equal 5, trackers.length
+  end
+  
   def test_zip_channels
     tuples_x = [[1, 125], [3, 234], [5, 456], [9,876]]
     tuples_y = [[2, 437], [3, 123], [6, 432], [9, 430]]

data/test/test_blacklist.rb

@@ -33,6 +33,10 @@ class TestBlacklist < Test::Unit::TestCase
       file.pptx
       file.xls
       file.xlsx
+      file.fbx
+      file.abc
+      file.3de
+      file.bpj
     ).each do | filename |
       error = assert_raise(Tracksperanto::UnsupportedFormatError, "Should fail for #{filename.inspect}") do
         Tracksperanto::Blacklist.raise_if_format_unsupported(filename)

data/tracksperanto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tracksperanto}
-  s.version = "3.5.2"
+  s.version = "3.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julik Tarkhanov"]
-  s.date = %q{2014-06-28}
+  s.date = %q{2014-11-08}
   s.default_executable = %q{tracksperanto}
   s.description = %q{Converts 2D track exports between different apps like Flame, MatchMover, PFTrack...}
   s.email = %q{me@julik.nl}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 27
   prerelease: 
   segments: 
   - 3
   - 5
-  - 2
-  version: 3.5.2
+  - 4
+  version: 3.5.4
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-28 00:00:00 +02:00
+date: 2014-11-08 00:00:00 +01:00
 default_executable: tracksperanto
 dependencies: 
 - !ruby/object:Gem::Dependency