tracksperanto 2.3.0 → 2.3.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.3.1 / 2011-08-05
+
+* Fixed support for curly braces in Shake scripts
+* Added checks to prevent exports with empty trackers or exports which contain no data at all
+
 === 2.3.0 / 2011-17-04
 
 * Fixed issue#1 (Last tracker in some Flame exports receives an empty shift channel)

data/Manifest.txt

@@ -40,6 +40,7 @@ lib/middleware/flop.rb
 lib/middleware/golden.rb
 lib/middleware/length_cutoff.rb
 lib/middleware/lerp.rb
+lib/middleware/lint.rb
 lib/middleware/prefix.rb
 lib/middleware/reformat.rb
 lib/middleware/scaler.rb
@@ -112,10 +113,12 @@ test/import/samples/pftrack4/sourcefile_pftrack.2dt
 test/import/samples/pftrack5/apft.2dt
 test/import/samples/pftrack5/empty_trackers.2dt
 test/import/samples/pftrack5/garage.2dt
+test/import/samples/shake_script/REDACTED_shake_file.shk
 test/import/samples/shake_script/designated_global_range_starting_at_negative_frame.shk
 test/import/samples/shake_script/four_tracks_in_one_matchmove.shk
 test/import/samples/shake_script/four_tracks_in_one_stabilizer.shk
 test/import/samples/shake_script/from_matchmover.shk
+test/import/samples/shake_script/ofx_vardefs.shk
 test/import/samples/shake_script/oldTrackerNode.shk
 test/import/samples/shake_script/shake_script_from_boujou.shk
 test/import/samples/shake_script/shake_tracker_nodes.shk
@@ -151,6 +154,7 @@ test/middleware/test_flop_middleware.rb
 test/middleware/test_golden_middleware.rb
 test/middleware/test_length_cutoff_middleware.rb
 test/middleware/test_lerp_middleware.rb
+test/middleware/test_lint_middleware.rb
 test/middleware/test_prefix.rb
 test/middleware/test_reformat_middleware.rb
 test/middleware/test_scaler_middleware.rb

data/bin/tracksperanto

@@ -38,7 +38,7 @@ end
 
 options = {}
 $middlewares = []
-writer_klass_name = nil
+writer_class_name = nil
 readers = Tracksperanto.importer_names
 writers = Tracksperanto.exporter_names
 
@@ -63,7 +63,7 @@ end
 op.on(" -f", "--from TRANSLATOR", String, "Use the specific import translator") { |f| options[:importer] = f }
 op.on(" -w", "--width WIDTH_IN_PIXELS", Integer, "Absolute input comp width in pixels (will try to autodetect)") { |w| options[:width] = w }
 op.on(" -h", "--height HEIGHT_IN_PIXELS", Integer, "Absolute input comp height in pixels (will try to autodetect)") {|w| options[:height] = w }
-op.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, format must be one of #{writers.join(", ")}") { |f| writer_klass_name = f }
+op.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, format must be one of #{writers.join(", ")}") { |f| writer_class_name = f }
 
 op.on(" -xs", "--xscale X_SCALING_FACTOR", Float, "Scale the result in X by this factor (1.0 is the default)", &mw("Scaler", :x_factor))
 op.on(" -ys", "--yscale Y_SCALING_FACTOR", Float, "Scale the result in Y by this factor (1.0 is the default)", &mw("Scaler", :y_factor))
@@ -107,7 +107,7 @@ end
 
 pbar = Tracksperanto::PBar.new("Converting", 100, $stderr)
 pipe = Tracksperanto::Pipeline::Base.new(:progress_block => lambda{|p,m| pbar.set_with_message(p, m) }, :middleware_tuples => $middlewares)
-pipe.exporters = [Tracksperanto.get_exporter(writer_klass_name)] if writer_klass_name
+pipe.exporters = [Tracksperanto.get_exporter(writer_class_name)] if writer_class_name
 pipe.run(input_file, options)
 pbar.finish
 

data/lib/import/shake_grammar/lexer.rb

@@ -34,7 +34,7 @@ module Tracksperanto::ShakeGrammar
     def consume_comment(c)
       if c == "\n" # Comment
         push [:comment, @buf.gsub(/(\s+?)\/\/{1}/, '')]
-        @buf = ''
+        erase_buffer
       else
         @buf << c
       end
@@ -55,14 +55,23 @@ module Tracksperanto::ShakeGrammar
       return consume_comment(c) if in_comment? 
       
       if !@buf.empty? && (c == "(") # Funcall
-        push([:funcall, @buf.strip] + self.class.new(@io, @sentinel, false, @stack_depth + 1).stack)
-        @buf = ''
+        push([:funcall, @buf.strip] + self.class.new(@io, @sentinel, limit_to_one_stmt = false, @stack_depth + 1).stack)
+        erase_buffer
+      elsif c == '{' # OFX curly braces or a subexpression in a node's knob
+        # Discard subexpr
+        substack = self.class.new(@io, @sentinel, limit_to_one_stmt = true, @stack_depth + 1).stack
+        push(:expr)
       elsif c == "[" # Array, booring
         push([:arr, self.class.new(@io).stack])
+      elsif c == "}"# && @limit_to_one_stmt
+        throw STOP_TOKEN
       elsif (c == "]" || c == ")" || c == ";" && @limit_to_one_stmt)
         # Bailing out of a subexpression
         consume_atom!
         throw STOP_TOKEN
+      elsif (c == "," && @limit_to_one_stmt)
+        consume_atom!
+        throw STOP_TOKEN
       elsif (c == ",")
         consume_atom!
       elsif (c == "@")
@@ -71,8 +80,10 @@ module Tracksperanto::ShakeGrammar
       elsif (c == ";" || c == "\n")
         # Skip these - the subexpression already is expanded anyway
       elsif (c == "=")
-        push [:assign, vardef(@buf.strip), self.class.new(@io, @sentinel, to_semicolon = true, @stack_depth + 1).stack.shift]
-        @buf = ''
+        vardef_atom = vardef(@buf.strip)
+        push [:assign, vardef_atom, self.class.new(@io, @sentinel, limit_to_one_stmt = true, @stack_depth + 1).stack.shift]
+        
+        erase_buffer
       else
         @buf << c
       end
@@ -85,7 +96,8 @@ module Tracksperanto::ShakeGrammar
     
     # Grab the minimum atomic value
     def consume_atom!
-      at, @buf = @buf.strip, ''
+      at = @buf.strip
+      erase_buffer
       return if at.empty?
       
       the_atom = case at
@@ -120,7 +132,18 @@ module Tracksperanto::ShakeGrammar
     end
     
     def vardef(var_specifier)
-      [:vardef] + var_specifier.split
+      # Since we can have two-word pointers as typedefs (char *) we only use the last
+      # part of the thing as varname. Nodes return the :image type implicitly.
+      varname_re = /\w+$/
+      varname = var_specifier.scan(varname_re).to_s
+      typedef = var_specifier.gsub(varname_re, '').strip
+      typedef = :image if typedef.empty?
+      
+      [:vardef, typedef, varname]
+    end
+    
+    def erase_buffer
+      @buf = ''
     end
   end
 end

data/lib/import/shake_script.rb

@@ -53,8 +53,28 @@ class Tracksperanto::Import::ShakeScript < Tracksperanto::Import::Base
       end
     end
     
+    # Find whether the passed atom includes a [:trk] on any level
+    def deep_include?(array_or_element, atom_name)
+      return true if array_or_element == atom_name
+      if array_or_element.is_a?(Array)
+        array_or_element.each do | elem |
+           if elem == atom_name
+             return true
+           elsif elem.is_a?(Array)
+             return true if deep_include?(elem, atom_name)
+           end
+        end
+      end
+      
+      false
+    end
+    
+    # An atom that is a tracker node will look like this
+    # [:assign, [:vardef, "Stabilize2"], [:retval, [:trk, <T "track1" with 116 keyframes>, <T "track2" with 116 keyframes>, <T "track3" with 116 keyframes>, <T "track4" with 89 keyframes>]]]
+    # a Stabilize though will look like this
+    # [:assign, [:vardef, "Stabilize1"], [:retval, [:trk, <T "track1" with 116 keyframes>, <T "track2" with 116 keyframes>, <T "track3" with 116 keyframes>]]]
     def atom_is_tracker_assignment?(a)
-      (a.is_a?(Array)) && (a[0] == :assign) && (a[2][0] == :retval) && (a[2][1][0] == :trk)
+      deep_include?(a, :trk)
     end
     
     # For Linear() curve calls. If someone selected JSpline or Hermite it's his problem.

data/lib/middleware/lint.rb

@@ -0,0 +1,61 @@
+# Prevents you from exporting invalid trackers
+class Tracksperanto::Middleware::Lint < Tracksperanto::Middleware::Base
+  class NoTrackersExportedError < RuntimeError
+    def message
+      "There were no trackers exported"
+    end
+  end
+  
+  class EmptyTrackerSentError < RuntimeError
+    def initialize(name)
+      @name  = name
+    end
+    
+    def message
+      "The tracker #{@name} contained no keyframes. Probably there were some filtering ops done and no keyframes have been exported"
+    end
+  end
+
+  class TrackerRestartedError < RuntimeError
+    def initialize(name)
+      @name  = name
+    end
+    
+    def message
+      "The tracker #{@name} has been sent before the last tracker finished"
+    end
+  end
+  
+  def start_export(w, h)
+    @trackers = 0
+    @keyframes = 0
+    @last_tracker_name = nil
+    super
+  end
+  
+  def start_tracker_segment(name)
+    raise TrackerRestartedError.new(name) if @in_tracker
+    
+    @in_tracker = true
+    @last_tracker_name = name
+    @keyframes = 0
+    super
+  end
+  
+  def export_point(*a)
+    @keyframes += 1
+    super
+  end
+  
+  def end_tracker_segment
+    raise EmptyTrackerSentError.new(@last_tracker_name) if @keyframes.zero?
+    @trackers +=1
+    @in_tracker = false
+    super
+  end
+  
+  def end_export
+    raise NoTrackersExportedError if @trackers.zero?
+    super
+  end
+end

data/lib/pipeline/base.rb

@@ -73,23 +73,26 @@ module Tracksperanto::Pipeline
   # * parser - The parser class, for the case that it can't be autodetected from the file name
   def run(from_input_file_path, passed_options = {}) #:yields: *all_middlewares
     
+    # Check for empty files
+    raise EmptySourceFileError if File.stat(from_input_file_path).size.zero?
+    
     # Reset stats
     @converted_keyframes, @converted_points = 0, 0
     
     # Assign the parser
     importer = initialize_importer_with_path_and_options(from_input_file_path, passed_options)
     
-    # Check for empty files
-    raise EmptySourceFileError if File.stat(from_input_file_path).size.zero?
-    
     # Open the file
     read_data = File.open(from_input_file_path, "rb")
         
     # Setup a multiplexer
     mux = setup_outputs_for(from_input_file_path)
     
+    # Wrap it into a module that will prevent us from exporting invalid trackers
+    lint = Tracksperanto::Middleware::Lint.new(mux)
+    
     # Setup middlewares
-    endpoint = wrap_output_with_middlewares(mux)
+    endpoint = wrap_output_with_middlewares(lint)
     @converted_points, @converted_keyframes = run_export(read_data, importer, endpoint)
   end
   

data/lib/tracksperanto.rb

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

data/lib/tracksperanto/simple_export.rb

@@ -5,15 +5,17 @@ module Tracksperanto::SimpleExport
   # Before calling this, initialize the exporter with the proper
   # IO handle
   def just_export(trackers_array, comp_width, comp_height)
-    start_export(comp_width, comp_height)
+    lint = Tracksperanto::Middleware::Lint.new(self)
+    
+    lint.start_export(comp_width, comp_height)
     trackers_array.each do | t |
-      start_tracker_segment(t.name)
+      lint.start_tracker_segment(t.name)
       t.each do | kf |
-        export_point(kf.frame, kf.abs_x, kf.abs_y, kf.residual)
+        lint.export_point(kf.frame, kf.abs_x, kf.abs_y, kf.residual)
       end
-      end_tracker_segment
+      lint.end_tracker_segment
     end
-    end_export
+    lint.end_export
   end
 end
 

data/test/import/samples/shake_script/REDACTED_shake_file.shk

@@ -0,0 +1,317 @@
+// REDACTED - (c) Apple Computer, Inc. 1998-2006.  All Rights Reserved.
+// Apple, the Apple logo and Shake are trademarks of Apple Computer, Inc., registered in the U.S. and other countries.
+
+
+SetTimeRange("1");
+SetFieldRendering(0);
+SetFps(23.98);
+SetMotionBlur(1, 1, 0, 0);
+SetMindReader(0);
+SetNewNodeFocusing(0);
+SetQuality(1);
+SetUseProxy("Base");
+SetProxyFilter("box");
+SetPixelScale(1, 1);
+SetUseProxyOnMissing(1);
+SetDefaultWidth(1920);
+SetDefaultHeight(1080);
+SetDefaultBytes(1);
+SetDefaultAspect(1);
+SetDefaultViewerAspect(1);
+SetView(0);
+SetMacroCheck(1);
+SetTimecodeMode("23.98 FPS");
+
+DefineProxyPath("../1920x1080/<base>.<format>", 1, 1, -1, "Auto", -1, 1, 0, "",1);
+DefineProxyPath("../960x540/<base>.<format>", 0.5, 1, 4, "Auto", 0, 1, 1, "");
+DefineProxyPath("../480x270/<base>.<format>", 0.25, 1, 4, "Auto", 0, 1, 2, "");
+DefineProxyPath("../240x135/<base>.<format>", 0.125, 1, 4, "Auto", 0, 1, 3, "");
+SetAudio("100W@E0000qFdsuHW962Dl9BOW0mWa06w7mCJ000000000008");
+image Primatte_v2_(image ofx_Source = 0, image ofx_BG = 0, image ofx_Mask = 0, const char * Poly00dral = "0.0 0.0 0.0", const char * Poly01dral = "0.0 0.0 0.0", const char * Poly02dral = "0.0 0.0 0.0", const char * Poly03dral = "0.0 0.0 0.0", const char * Poly04dral = "0.0 0.0 0.0", const char * Poly05dral = "0.0 0.0 0.0", const char * Poly06dral = "0.0 0.0 0.0", const char * Poly07dral = "0.0 0.0 0.0", const char * Poly08dral = "0.0 0.0 0.0", const char * Poly09dral = "0.0 0.0 0.0", const char * Poly10dral = "0.0 0.0 0.0", const char * Poly11dral = "0.0 0.0 0.0", const char * Poly12dral = "0.0 0.0 0.0", const char * Poly13dral = "0.0 0.0 0.0", const char * Poly14dral = "0.0 0.0 0.0", const char * Poly15dral = "0.0 0.0 0.0", const char * Poly16dral = "0.0 0.0 0.0", const char * Poly17dral = "0.0 0.0 0.0", const char * Poly18dral = "0.0 0.0 0.0", const char * Poly19dral = "0.0 0.0 0.0", const char * Poly20dral = "0.0 0.0 0.0", const char * Poly21dral = "0.0 0.0 0.0", const char * Poly22dral = "0.0 0.0 0.0", const char * Poly23dral = "0.0 0.0 0.0", const char * Poly24dral = "0.0 0.0 0.0", const char * Poly25dral = "0.0 0.0 0.0", const char * Poly26dral = "0.0 0.0 0.0", const char * Poly27dral = "0.0 0.0 0.0", const char * Poly28dral = "0.0 0.0 0.0", const char * Poly29dral = "0.0 0.0 0.0", const char * Poly30dral = "0.0 0.0 0.0", const char * Poly31dral = "0.0 0.0 0.0", const char * Poly32dral = "0.0 0.0 0.0", const char * Poly33dral = "0.0 0.0 0.0", const char * Poly34dral = "0.0 0.0 0.0", const char * Poly35dral = "0.0 0.0 0.0", const char * Poly36dral = "0.0 0.0 0.0", const char * Poly37dral = "0.0 0.0 0.0", const char * Poly38dral = "0.0 0.0 0.0", const char * Poly39dral = "0.0 0.0 0.0", const char * Poly40dral = "0.0 0.0 0.0", const char * Poly41dral = "0.0 0.0 0.0", const char * Poly42dral = "0.0 0.0 0.0", const char * Poly43dral = "0.0 0.0 0.0", const char * Poly44dral = "0.0 0.0 0.0", const char * Poly45dral = "0.0 0.0 0.0", const char * Poly46dral = "0.0 0.0 0.0", const char * Poly47dral = "0.0 0.0 0.0", const char * Poly48dral = "0.0 0.0 0.0", const char * Poly49dral = "0.0 0.0 0.0", const char * Poly50dral = "0.0 0.0 0.0", const char * Poly51dral = "0.0 0.0 0.0", const char * Poly52dral = "0.0 0.0 0.0", const char * Poly53dral = "0.0 0.0 0.0", const char * Poly54dral = "0.0 0.0 0.0", const char * Poly55dral = "0.0 0.0 0.0", const char * Poly56dral = "0.0 0.0 0.0", const char * Poly57dral = "0.0 0.0 0.0", const char * Poly58dral = "0.0 0.0 0.0", const char * Poly59dral = "0.0 0.0 0.0", const char * Poly60dral = "0.0 0.0 0.0", const char * Poly61dral = "0.0 0.0 0.0", const char * Poly62dral = "0.0 0.0 0.0", const char * Poly63dral = "0.0 0.0 0.0", const char * Poly64dral = "0.0 0.0 0.0", const char * Poly65dral = "0.0 0.0 0.0", const char * setu66_ = "0.0 0.0 0.0", const char * setu67_ = "0.0 0.0 0.0", const char * setu68_ = "0.0 0.0 0.0", const char * setu69_ = "0.0 0.0 0.0", const char * setu70_ = "0.0 0.0 0.0", const char * setu71_ = "0.0 0.0 0.0", const char * setu72_ = "0.0 0.0 0.0", const char * setu73_ = "0.0 0.0 0.0", int AutoComputeEval = 0, int AutoComputeEvalBG = 0, int AutoComputeEvalFG = 0, const char * Operation = "Select BG Color", const char * View = "Composite", const char * Mode = "Primatte", float From_TuneR = 0.0000000000, float From_TuneG = 0.0000000000, float From_TuneB = 0.0000000000, float To_TuneR = 0.0000000000, float To_TuneG = 0.0000000000, float To_TuneB = 0.0000000000, int Tune_l = 0, int Tune_m = 0, int Tune_s = 0, const char * Spill = "Complement", float ReplaceR = 0.5000000000, float ReplaceG = 0.5000000000, float ReplaceB = 0.5000000000, float BackingR = 0.0000000000, float BackingG = 0.0000000000, float BackingB = 0.0000000000, int ExtMatte = 0, int Defocus = 0, const char * DefocusDir = "Outward", int Shrink = 0, const char * Pick_Mode = "Bounding Box", const char * Grain_Size = "None", int Grain_Tol = 0, float Crop_Left = "0.0000000000 * width", float Crop_Bottom = "0.0000000000 * height", float Crop_Right = "0.0000000000 * width", float Crop_Top = "0.0000000000 * height", int N3D_Viewer = 0)
+{
+    fx1 = OfxPluginFactory(Primatte_v2_);return fx1;
+}
+
+
+// Processing nodes
+
+Stabilize1 = Stabilize(0, 0, 0, "1 point", Linear(0,1366@1,1365.5@2,1365.02@3,1364.11@4,1363.3@5,1362.62@6,1361.88@7,1361.03@8,1360.37@9,1360@10,1359.41@11,1358.81@12,1358.34@13,1358.09@14,1357.27@15,1356.27@16,1355.21@17,1354.59@18,1354.19@19,1353.61@20,1353.1@21,1352.85@22,1352.71@23,1352.38@24,1352.07@25,1351.74@26,1351.5@27,1351.19@28,1351.01@29,1350.85@30,1350.34@31,1350.2@32,1350.14@33,1350@34,1349.7@35,1349.44@36,1349.36@37,1349.08@38,1348.63@39,1348.35@40,1348.22@41,1348.12@42,1348.11@43,1348.13@44,1347.91@45,1347.76@46,1347.73@47,1347.59@48,1347.3@49,1347.1@50,1347.05@51,1347.04@52,1346.9@53,1346.84@54,1346.72@55,1346.55@56,1346.39@57,1346.33@58,1346.06@59,1345.98@60,1346@61,1345.99@62,1345.79@63,1345.72@64,1345.8@65,1345.71@66,1345.61@67), 
+    Linear(0,606@1,605.67@2,605.746@3,605.78@4,605.857@5,605.872@6,605.901@7,606.006@8,605.795@9,606.011@10,606.027@11,605.943@12,605.925@13,605.907@14,605.786@15,605.869@16,605.672@17,605.636@18,605.663@19,605.605@20,605.465@21,605.526@22,605.47@23,605.563@24,605.65@25,605.566@26,605.66@27,605.688@28,605.694@29,605.942@30,605.687@31,605.782@32,605.654@33,605.817@34,605.77@35,605.656@36,605.761@37,605.805@38,605.89@39,605.907@40,605.909@41,605.728@42,605.891@43,605.808@44,605.813@45,605.698@46,605.599@47,605.768@48,605.743@49,605.939@50,605.762@51,605.716@52,605.719@53,605.637@54,605.704@55,605.642@56,605.63@57,605.825@58,605.894@59,605.712@60,605.744@61,605.625@62,605.519@63,605.437@64,605.59@65,605.762@66,605.851@67), 
+    1, 1, Linear(0,890@1,889.413@2,888.704@3,887.597@4,886.667@5,885.852@6,885.007@7,883.963@8,883.279@9,882.873@10,882.263@11,881.57@12,880.975@13,880.664@14,879.953@15,878.899@16,877.836@17,877.309@18,876.896@19,876.353@20,875.782@21,875.601@22,875.431@23,875.077@24,874.794@25,874.588@26,874.293@27,873.926@28,873.789@29,873.587@30,873.21@31,872.998@32,872.925@33,872.715@34,872.422@35,872.265@36,872.12@37,871.746@38,871.4@39,871.022@40,870.889@41,870.802@42,870.818@43,870.759@44,870.563@45,870.414@46,870.32@47,870.177@48,869.892@49,869.646@50,869.631@51,869.589@52,869.454@53,869.383@54,869.312@55,869.179@56,869.083@57,868.87@58,868.698@59,868.618@60,868.591@61,868.576@62,868.486@63,868.419@64,868.356@65,868.303@66,868.116@67), 
+    Linear(0,580@1,579.934@2,579.999@3,580.134@4,580.261@5,580.311@6,580.322@7,580.248@8,580.298@9,580.355@10,580.343@11,580.249@12,580.341@13,580.34@14,580.45@15,580.399@16,580.22@17,580.332@18,580.173@19,580.119@20,579.968@21,580.083@22,580.154@23,580.233@24,580.38@25,580.244@26,580.346@27,580.202@28,580.219@29,580.234@30,580.275@31,580.324@32,580.413@33,580.628@34,580.562@35,580.607@36,580.51@37,580.446@38,580.474@39,580.462@40,580.507@41,580.524@42,580.719@43,580.65@44,580.685@45,580.671@46,580.58@47,580.621@48,580.589@49,580.705@50,580.709@51,580.735@52,580.753@53,580.689@54,580.682@55,580.664@56,580.645@57,580.757@58,580.8@59,580.707@60,580.734@61,580.699@62,580.618@63,580.684@64,580.638@65,580.739@66,580.755@67), 
+    0, 0, 2*width/3, 2*height/3, width/3, 2*height/3, "box", 
+    xFilter, "trsx", 0, 0.5, -(shutterTiming*script.shutterTiming)/2, 
+    1, 1, 0, 1, "v2.0", 36, "1/64", "luminance", 0.3, 0.59, 0.11, 
+    0.75, "use start frame", 0.5, "stop", 0, 0, 25, "track1", 
+    1349.44-height/25, 1349.44+height/25, 605.656-height/25, 
+    605.656+height/25, 1349.44-height/15, 1349.44+height/15, 
+    605.656-height/15, 605.656+height/15, "track2", 872.265-height/25, 
+    872.265+height/25, 580.607-height/25, 580.607+height/25, 
+    872.265-height/15, 872.265+height/15, 580.607-height/15, 
+    580.607+height/15, "track3", 2*width/3-height/30, 2*width/3+height/30, 
+    2*height/3-height/30, 2*height/3+height/30, 2*width/3-height/15, 
+    2*width/3+height/15, 2*height/3-height/15, 2*height/3+height/15, 
+    "track4", width/3-height/30, width/3+height/30, 2*height/3-height/30, 
+    2*height/3+height/30, width/3-height/15, width/3+height/15, 
+    2*height/3-height/15, 2*height/3+height/15);
+
+
+// User Interface settings
+
+SetKey(
+    "colorPicker.hex", "0",
+    "colorPicker.range", "32",
+    "globals.bufferSelectToggling", "0",
+    "globals.cacheMode", "2",
+    "globals.consoleLineLength", "120",
+    "globals.displayThumbnails", "1",
+    "globals.enhancedNodeView", "0",
+    "globals.fileBrowserExactList", "0",
+    "globals.fileBrowserFilterList", "1",
+    "globals.fileBrowserFullList", "1",
+    "globals.fileBrowserHeight", "540",
+    "globals.fileBrowserImageList", "0",
+    "globals.fileBrowserLC1", "482",
+    "globals.fileBrowserLC2", "70",
+    "globals.fileBrowserLC3", "110",
+    "globals.fileBrowserLC4", "245",
+    "globals.fileBrowserLC5", "175",
+    "globals.fileBrowserLC6", "65",
+    "globals.fileBrowserLC7", "111",
+    "globals.fileBrowserRIntSet", "0",
+    "globals.fileBrowserSC1", "211",
+    "globals.fileBrowserSC2", "211",
+    "globals.fileBrowserSC3", "211",
+    "globals.fileBrowserSeqList", "0",
+    "globals.fileBrowserShortList", "0",
+    "globals.fileBrowserWIntSet", "1",
+    "globals.fileBrowserWidth", "1035",
+    "globals.fileBrowserfullPath", "0",
+    "globals.fontBlue", "1",
+    "globals.fontGreen", "1",
+    "globals.fontRed", "1",
+    "globals.gridBlue", "0.15",
+    "globals.gridEnabled", "0",
+    "globals.gridGreen", "0.15",
+    "globals.gridHeight", "40",
+    "globals.gridRed", "0.15",
+    "globals.gridVisible", "0",
+    "globals.gridWidth", "40",
+    "globals.layoutTightness", "40",
+    "globals.multiPlaneLocatorScale", "1",
+    "globals.noodleABlue", "1",
+    "globals.noodleAGreen", "1",
+    "globals.noodleARed", "1",
+    "globals.noodleAZBlue", "0.4",
+    "globals.noodleAZGreen", "0",
+    "globals.noodleAZRed", "0",
+    "globals.noodleBWABlue", "0.4",
+    "globals.noodleBWAGreen", "0.4",
+    "globals.noodleBWARed", "0.4",
+    "globals.noodleBWAZBlue", "0.4",
+    "globals.noodleBWAZGreen", "0",
+    "globals.noodleBWAZRed", "0",
+    "globals.noodleBWBlue", "0.15",
+    "globals.noodleBWGreen", "0.15",
+    "globals.noodleBWRed", "0.15",
+    "globals.noodleBWZBlue", "0.4",
+    "globals.noodleBWZGreen", "0",
+    "globals.noodleBWZRed", "0",
+    "globals.noodleBlue", "1",
+    "globals.noodleColorCoding", "2",
+    "globals.noodleGreen", "1",
+    "globals.noodleRGBABlue", "0.7",
+    "globals.noodleRGBAGreen", "0.7",
+    "globals.noodleRGBARed", "0.7",
+    "globals.noodleRGBAZBlue", "1",
+    "globals.noodleRGBAZGreen", "0.4",
+    "globals.noodleRGBAZRed", "0.4",
+    "globals.noodleRGBBlue", "0",
+    "globals.noodleRGBGreen", "0.7",
+    "globals.noodleRGBRed", "0.7",
+    "globals.noodleRGBZBlue", "0.8",
+    "globals.noodleRGBZGreen", "0.2",
+    "globals.noodleRGBZRed", "0.2",
+    "globals.noodleRed", "1",
+    "globals.noodleStipple16", "1061109567",
+    "globals.noodleStipple32", "-1",
+    "globals.noodleStipple8", "-1431655766",
+    "globals.noodleTension", "0.25",
+    "globals.noodleZBlue", "0.4",
+    "globals.noodleZGreen", "0",
+    "globals.noodleZRed", "0",
+    "globals.paintFrameMode", "1",
+    "globals.pdfBrowserPath", "",
+    "globals.proxyTog.cycle", "-1,0,0,0,0,-1",
+    "globals.renderModeTog.cycle", "2,0,0,2",
+    "globals.rotoAutoControlScale", "1",
+    "globals.rotoBuildColorBlue", "0.75",
+    "globals.rotoBuildColorGreen", "0.75",
+    "globals.rotoBuildColorRed", "0.375",
+    "globals.rotoControlScale", "1",
+    "globals.rotoFocusColorBlue", "0.9375",
+    "globals.rotoFocusColorGreen", "0.375",
+    "globals.rotoFocusColorRed", "0.5",
+    "globals.rotoFocusSelectColorBlue", "0.5",
+    "globals.rotoFocusSelectColorGreen", "1",
+    "globals.rotoFocusSelectColorRed", "0.5",
+    "globals.rotoKeyedColorBlue", "1",
+    "globals.rotoKeyedColorGreen", "0.65",
+    "globals.rotoKeyedColorRed", "0.45",
+    "globals.rotoNormalColorBlue", "0.125",
+    "globals.rotoNormalColorGreen", "0.75",
+    "globals.rotoNormalColorRed", "0.75",
+    "globals.rotoNormalSelectColorBlue", "0.0625",
+    "globals.rotoNormalSelectColorGreen", "1",
+    "globals.rotoNormalSelectColorRed", "0.0625",
+    "globals.rotoPickRadius", "15",
+    "globals.rotoTangentColorBlue", "0.125",
+    "globals.rotoTangentColorGreen", "0.5625",
+    "globals.rotoTangentColorRed", "0.5625",
+    "globals.rotoTangentCreationRadius", "10",
+    "globals.rotoTempKeyColorBlue", "0",
+    "globals.rotoTempKeyColorGreen", "0.5",
+    "globals.rotoTempKeyColorRed", "1",
+    "globals.rotoTransformIncrement", "5",
+    "globals.showActiveGlows", "2",
+    "globals.showConcatenationLinks", "2",
+    "globals.showExpressionLinks", "2",
+    "globals.showTimeDependency", "2",
+    "globals.textureProxy", "1",
+    "globals.thumbAlphaBlend", "1",
+    "globals.thumbSize", "15",
+    "globals.thumbSizeRelative", "0",
+    "globals.viewerAspectRatio", "script.defaultViewerAspectRatio",
+    "globals.viewerZoom", "1.0/proxyScale/proxyRatio",
+    "globals.virtualSliderMode", "0",
+    "globals.virtualSliderSpeed", "0.25",
+    "globals.warpBoundaryNormalColorBlue", "0",
+    "globals.warpBoundaryNormalColorGreen", "0.5",
+    "globals.warpBoundaryNormalColorRed", "1",
+    "globals.warpConnectionNormalColorBlue", "0.8",
+    "globals.warpConnectionNormalColorGreen", "0",
+    "globals.warpConnectionNormalColorRed", "0.4",
+    "globals.warpDisplacedNormalColorBlue", "1",
+    "globals.warpDisplacedNormalColorGreen", "0",
+    "globals.warpDisplacedNormalColorRed", "1",
+    "globals.warpLockedColorBlue", "0.6",
+    "globals.warpLockedColorGreen", "0.6",
+    "globals.warpLockedColorRed", "0.6",
+    "globals.warpSourceNormalColorBlue", "1",
+    "globals.warpSourceNormalColorGreen", "0.8",
+    "globals.warpSourceNormalColorRed", "0",
+    "globals.warpTargetNormalColorBlue", "0.7",
+    "globals.warpTargetNormalColorGreen", "0.2",
+    "globals.warpTargetNormalColorRed", "0.2",
+    "globals.webBrowserPath", "",
+    "mainQuad.bot", "0.6",
+    "mainQuad.left", "0.29",
+    "mainQuad.right", "0.39795202",
+    "mainQuad.top", "0.6",
+    "mainWin.height", "1080",
+    "mainWin.tabChild1", "0.Image",
+    "mainWin.tabChild10", "0.ThreeD",
+    "mainWin.tabChild11", "0.Flares",
+    "mainWin.tabChild12", "0.Reorders",
+    "mainWin.tabChild13", "0.Curve_Editor_2",
+    "mainWin.tabChild14", "0.Node_View_2",
+    "mainWin.tabChild15", "0.Time_View",
+    "mainWin.tabChild16", "1.Parameters1",
+    "mainWin.tabChild17", "1.Parameters2",
+    "mainWin.tabChild18", "1.Globals",
+    "mainWin.tabChild19", "2.Viewers",
+    "mainWin.tabChild2", "0.Color",
+    "mainWin.tabChild20", "3.Node_View",
+    "mainWin.tabChild21", "3.Curve_Editor",
+    "mainWin.tabChild22", "3.Color_Picker",
+    "mainWin.tabChild23", "3.Console",
+    "mainWin.tabChild24", "3.Audio_Panel",
+    "mainWin.tabChild25", "3.Pixel_Analyzer",
+    "mainWin.tabChild3", "0.Filter",
+    "mainWin.tabChild4", "0.Key",
+    "mainWin.tabChild5", "0.Layer",
+    "mainWin.tabChild6", "0.Transform",
+    "mainWin.tabChild7", "0.Warp",
+    "mainWin.tabChild8", "0.Other",
+    "mainWin.tabChild9", "0.Tinder",
+    "mainWin.width", "1912",
+    "mainWin.xPos", "4",
+    "mainWin.yPos", "99",
+    "nodeView.Stabilize1.t", "0",
+    "nodeView.Stabilize1.x", "526.2155",
+    "nodeView.Stabilize1.y", "458.8213",
+    "nodeView.xPan", "-367.4545",
+    "nodeView.yPan", "-267.3041",
+    "nodeView.zoom", "0.857309759",
+    "pixelAnalyzer1.aStatToggleState", "0",
+    "pixelAnalyzer1.accumulate", "0",
+    "pixelAnalyzer1.bStatToggleState", "0",
+    "pixelAnalyzer1.bit16ToggleState", "0",
+    "pixelAnalyzer1.bit32ToggleState", "1",
+    "pixelAnalyzer1.bit8ToggleState", "0",
+    "pixelAnalyzer1.gStatToggleState", "0",
+    "pixelAnalyzer1.hStatToggleState", "0",
+    "pixelAnalyzer1.hex", "0",
+    "pixelAnalyzer1.imgToggleState", "0",
+    "pixelAnalyzer1.lStatToggleState", "1",
+    "pixelAnalyzer1.offToggleState", "0",
+    "pixelAnalyzer1.pxlToggleState", "1",
+    "pixelAnalyzer1.rStatToggleState", "0",
+    "pixelAnalyzer1.sStatToggleState", "0",
+    "pixelAnalyzer1.vStatToggleState", "0",
+    "spawnedViewerCount", "0",
+    "timeBar.current", "36",
+    "timeBar.high", "67",
+    "timeBar.incr", "1",
+    "timeBar.low", "1",
+    "timeView.ctrls.selGroup", "0",
+    "timeView.wSpace.constDisp", "0",
+    "timeView.wSpace.dispInOut", "1",
+    "timeView.wSpace.endTime", "100",
+    "timeView.wSpace.startTime", "1",
+    "timeView.wSpace.trim", "0",
+    "updater.mode", "2",
+    "vDesk.0.activeBuffer", "0",
+    "vDesk.0.compareMode", "0",
+    "vDesk.0.compareTog.cycle", "-1,0,0,0,-1",
+    "vDesk.0.dodNodeSerial", "Bungle(Select1, 0, 1920, 0, 1080, 0, 0, 0);",
+    "vDesk.0.dodToggle", "0",
+    "vDesk.0.exp", "0",
+    "vDesk.0.g", "1",
+    "vDesk.0.gamma", "1",
+    "vDesk.0.gradeToggle", "0",
+    "vDesk.0.h", "705",
+    "vDesk.0.i", "0",
+    "vDesk.0.ih", "0",
+    "vDesk.0.isActive", "1",
+    "vDesk.0.iw", "0",
+    "vDesk.0.lookupTog.cycle", "1,0,0",
+    "vDesk.0.lookupToggle", "0",
+    "vDesk.0.numViewerLookups", "0",
+    "vDesk.0.numViewerScripts", "8",
+    "vDesk.0.oscAutoKeyOnOff", "0",
+    "vDesk.0.oscLockTog.cycle", "1,0,0,0",
+    "vDesk.0.oscOnOff", "1",
+    "vDesk.0.oscTog.cycle", "1,0,0,1",
+    "vDesk.0.primaryVNode", "0",
+    "vDesk.0.roiOnOff", "1",
+    "vDesk.0.scriptNodeSerial0", "ApertureMarking(riNode, \"Auto\", 0, 0, 1, 1, 1.0, 1.0, 1.0, 1.0, 3, 1, 0.2, academyDefaultRed, academyDefaultGreen, academyDefaultBlue, academyDefaultAlpha, academyDefaultLineWidth, 1, 0.4, academyDefaultRed, academyDefaultGreen, academyDefaultBlue, academyDefaultAlpha, academyDefaultLineWidth, 1, 0.6, academyDefaultRed, academyDefaultGreen, academyDefaultBlue, academyDefaultAlpha, academyDefaultLineWidth, 0, 0.8, academyDefaultRed, academyDefaultGreen, academyDefaultBlue, academyDefaultAlpha, academyDefaultLineWidth, 0, 0.5, academyDefaultRed, academyDefaultGreen, academyDefaultBlue, academyDefaultAlpha, academyDefaultLineWidth, 0, 0.25, academyDefaultRed, academyDefaultGreen, academyDefaultBlue, academyDefaultAlpha, academyDefaultLineWidth, 1.0, 1.0, 1.0, 1.0, 3, 0, 0.2, fullDefaultRed, fullDefaultGreen, fullDefaultBlue, fullDefaultAlpha, fullDefaultLineWidth, 1, 0.4, fullDefaultRed, fullDefaultGreen, fullDefaultBlue, fullDefaultAlpha, fullDefaultLineWidth, 1, 0.6, fullDefaultRed, fullDefaultGreen, fullDefaultBlue, fullDefaultAlpha, fullDefaultLineWidth, 1.0, 1.0, 1.0, 1.0, 1, 1, 20, 0.25, tvDefaultRed, tvDefaultGreen, tvDefaultBlue, tvDefaultAlpha, tvDefaultLineWidth, 1, 10, 0.5, tvDefaultRed, tvDefaultGreen, tvDefaultBlue, tvDefaultAlpha, tvDefaultLineWidth);",
+    "vDesk.0.scriptNodeSerial1", "ViewerScript_2_(riNode, 1, 1, 1, Input.width/2, Input.height/2);",
+    "vDesk.0.scriptNodeSerial2", "ViewerScript_3_(riNode, 3, 0, .5);",
+    "vDesk.0.scriptNodeSerial3", "ViewZ(riNode, 0, 0, 0, 5000000, 1, 100);",
+    "vDesk.0.scriptNodeSerial4", "FloatView_(riNode, 2, 0, 0, 1, 1-red1, 1-green1, 1-blue1);",
+    "vDesk.0.scriptNodeSerial5", "TimeCode_(riNode, \"Timecode\", 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, .5, 20, 20);",
+    "vDesk.0.scriptNodeSerial6", "ApertureMask(riNode, 4, 1, 1, 100, 100);",
+    "vDesk.0.scriptTog.cycle", "-1,0,0,0,0,0,0,0,0,-1",
+    "vDesk.0.scriptToggle", "0",
+    "vDesk.0.secondaryVNode", "1",
+    "vDesk.0.viewerGrade.cycle", "-2,-2,0",
+    "vDesk.0.w", "1141",
+    "vDesk.0.x", "0",
+    "vDesk.0.xPan", "5",
+    "vDesk.0.xliderValue", "0",
+    "vDesk.0.y", "0",
+    "vDesk.0.yPan", "-27",
+    "vDesk.0.zoom", "0.5845361",
+    "vDesk.viewers", "1"
+);

data/test/import/samples/shake_script/ofx_vardefs.shk

@@ -0,0 +1,6 @@
+image Primatte_v2_(image ofx_Source = 0, image ofx_BG = 0, image ofx_Mask = 0, const char * Poly00dral = "0.0 0.0 0.0", int N3D_Viewer = 0)
+{
+    fx1 = OfxPluginFactory(Primatte_v2_);return fx1;
+}
+
+Foo(2);

data/test/import/test_shake_lexer.rb

@@ -2,6 +2,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/../helper'
 
 class ShakeLexerTest < Test::Unit::TestCase
   P = File.dirname(__FILE__) + "/samples/shake_script/shake_tracker_nodes.shk"
+  OFX_CURLY_BRACES = File.dirname(__FILE__) + "/samples/shake_script/ofx_vardefs.shk"
   L = Tracksperanto::ShakeGrammar::Lexer
   WRONG = File.dirname(__FILE__) + "/samples/flame_stabilizer/hugeFlameSetup.stabilizer"
   
@@ -84,7 +85,38 @@ class ShakeLexerTest < Test::Unit::TestCase
       ]],
     s)
   end
-
+  
+  def test_knob_expr
+    s = parse "Foobar(2, 4, {{ 4 * 16 }}, 4, 1)"
+    assert_equal(
+      [[
+        :funcall,
+        "Foobar",
+        2,
+        4,
+        :expr,
+        4,
+        1,
+      ]],
+    s)
+  end
+  
+  def test_lexer_with_ofx_curly_braces
+    s = parse(File.read(OFX_CURLY_BRACES))
+    assert_equal(
+      [[
+        :funcall,
+        "image Primatte_v2_",
+        [:assign, [:vardef, "image", "ofx_Source"], 0],
+        [:assign, [:vardef, "image", "ofx_BG"], 0],
+        [:assign, [:vardef, "image", "ofx_Mask"], 0],
+        [:assign, [:vardef, "const char *", "Poly00dral"], "0.0 0.0 0.0"],
+        [:assign, [:vardef, "int", "N3D_Viewer"], 0],
+        :expr
+      ], [:funcall, "Foo", 2]],
+    s)
+  end
+  
   def test_parse_funcall_with_valueats_at_negframes
     s = parse 'Linear(0,716.08@-1,715.846@2)'
     assert_equal(
@@ -121,12 +153,17 @@ class ShakeLexerTest < Test::Unit::TestCase
   
   def test_parse_varassign
     s = parse 'Foo = Blur(Foo, 1, 2, 3); 1'
-    assert_equal [[:assign, [:vardef, "Foo"], [:funcall, "Blur", [:atom, "Foo"], 1, 2, 3]], 1], s
+    assert_equal [[:assign, [:vardef, :image, "Foo"], [:funcall, "Blur", [:atom, "Foo"], 1, 2, 3]], 1], s
   end
   
   def test_parse_varassign_with_typedef
     s = parse 'curve float focal = Linear(0,2257.552@1,2257.552@2)'
-    assert_equal [[:assign, [:vardef, "curve", "float", "focal"], [:funcall, "Linear", 0, [:value_at, 1, 2257.552], [:value_at, 2, 2257.552]]]], s
+    assert_equal [[:assign, [:vardef, "curve float", "focal"], [:funcall, "Linear", 0, [:value_at, 1, 2257.552], [:value_at, 2, 2257.552]]]], s
+  end
+
+  def test_parse_varassign_with_typedef_charstar
+    s = parse 'char * information = "Ausgezeichnet!";'
+    assert_equal [[:assign, [:vardef, "char *", "information"], "Ausgezeichnet!" ]], s
   end
   
   def test_parse_whole_file_does_not_raise

data/test/import/test_shake_script_import.rb

@@ -116,6 +116,14 @@ class ShakeScriptImportTest < Test::Unit::TestCase
     trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture, :width => 1920, :height => 1080).to_a
     assert_equal 8, trackers.length
   end
+
+  def test_REDACTED_shake_file
+    fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/REDACTED_shake_file.shk")
+    trackers = Tracksperanto::Import::ShakeScript.new(:io => fixture, :width => 1920, :height => 1080).to_a
+    assert_equal 2, trackers.length
+    assert_equal "Stabilize1_track1", trackers[0].name
+    assert_equal "Stabilize1_track2", trackers[1].name
+  end
   
   def test_tracker_node_from_stoneage_shake_version
     fixture = File.open(File.dirname(__FILE__) + "/samples/shake_script/oldTrackerNode.shk")

data/test/middleware/test_lint_middleware.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../helper'
+
+class LintMiddlewareTest < Test::Unit::TestCase
+  def test_empty_export_raises
+    m = flexmock
+    m.should_receive(:start_export).once
+    
+    ex = Tracksperanto::Middleware::Lint.new(m)
+    ex.start_export(100, 100)
+    assert_raise(Tracksperanto::Middleware::Lint::NoTrackersExportedError) do
+      ex.end_export
+    end
+    
+  end
+  
+  def test_exporting_empty_tracker_raises
+    m = flexmock
+    m.should_receive(:start_export).once
+    m.should_receive(:start_tracker_segment).once
+    
+    ex = Tracksperanto::Middleware::Lint.new(m)
+    ex.start_export(100, 100)
+    ex.start_tracker_segment("Foo")
+    
+    assert_raise(Tracksperanto::Middleware::Lint::EmptyTrackerSentError) do
+      ex.end_tracker_segment
+    end
+  end
+  
+
+  def test_exporting_with_two_starts_raises
+    m = flexmock
+    m.should_receive(:start_export).once
+    m.should_receive(:start_tracker_segment).once
+    
+    ex = Tracksperanto::Middleware::Lint.new(m)
+    ex.start_export(100, 100)
+    ex.start_tracker_segment("Foo")
+    
+    assert_raise(Tracksperanto::Middleware::Lint::TrackerRestartedError) do
+      ex.start_tracker_segment("Bar")
+    end
+  end
+  
+end

data/test/test_pipeline.rb

@@ -59,12 +59,15 @@ class PipelineTest < Test::Unit::TestCase
     ]
     
     mock_mux = flexmock("MUX")
+    mock_lint = flexmock("LINT")
     flexmock(Tracksperanto::Export::Mux).should_receive(:new).and_return(mock_mux)
+    flexmock(Tracksperanto::Middleware::Lint).should_receive(:new).with(mock_mux).and_return(mock_lint)
+
     m = flexmock("middleware object")
     mock_middleware_class = flexmock("middleware class")
     
     flexmock(Tracksperanto).should_receive(:get_middleware).with("Bla").once.and_return(mock_middleware_class)
-    mock_middleware_class.should_receive(:new).with(mock_mux, {:foo => 234}).once
+    mock_middleware_class.should_receive(:new).with(mock_lint, {:foo => 234}).once
     
     assert_raise(NoMethodError) { pipeline.run(@stabilizer) }
   end
@@ -95,7 +98,8 @@ class PipelineTest < Test::Unit::TestCase
   end
   
   def test_run_with_unknown_format_raises
-    FileUtils.touch("./input.txt")
+    File.open("./input.txt", "w"){|f| f.write("foo") }
+    
     pipeline = Tracksperanto::Pipeline::Base.new
     assert_raise(Tracksperanto::Pipeline::UnknownFormatError) { pipeline.run("./input.txt") }
     assert_raise(Tracksperanto::Pipeline::UnknownFormatError) { pipeline.run("./input.txt", :width => 100, :height => 100) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tracksperanto
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Julik Tarkhanov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-17 00:00:00 +02:00
+date: 2011-05-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - lib/middleware/golden.rb
 - lib/middleware/length_cutoff.rb
 - lib/middleware/lerp.rb
+- lib/middleware/lint.rb
 - lib/middleware/prefix.rb
 - lib/middleware/reformat.rb
 - lib/middleware/scaler.rb
@@ -190,10 +191,12 @@ files:
 - test/import/samples/pftrack5/apft.2dt
 - test/import/samples/pftrack5/empty_trackers.2dt
 - test/import/samples/pftrack5/garage.2dt
+- test/import/samples/shake_script/REDACTED_shake_file.shk
 - test/import/samples/shake_script/designated_global_range_starting_at_negative_frame.shk
 - test/import/samples/shake_script/four_tracks_in_one_matchmove.shk
 - test/import/samples/shake_script/four_tracks_in_one_stabilizer.shk
 - test/import/samples/shake_script/from_matchmover.shk
+- test/import/samples/shake_script/ofx_vardefs.shk
 - test/import/samples/shake_script/oldTrackerNode.shk
 - test/import/samples/shake_script/shake_script_from_boujou.shk
 - test/import/samples/shake_script/shake_tracker_nodes.shk
@@ -229,6 +232,7 @@ files:
 - test/middleware/test_golden_middleware.rb
 - test/middleware/test_length_cutoff_middleware.rb
 - test/middleware/test_lerp_middleware.rb
+- test/middleware/test_lint_middleware.rb
 - test/middleware/test_prefix.rb
 - test/middleware/test_reformat_middleware.rb
 - test/middleware/test_scaler_middleware.rb
@@ -315,6 +319,7 @@ test_files:
 - test/middleware/test_golden_middleware.rb
 - test/middleware/test_length_cutoff_middleware.rb
 - test/middleware/test_lerp_middleware.rb
+- test/middleware/test_lint_middleware.rb
 - test/middleware/test_prefix.rb
 - test/middleware/test_reformat_middleware.rb
 - test/middleware/test_scaler_middleware.rb