tracksperanto in tracksperanto-1.9.0

- old
+ new

@@ -10,27 +10,20 @@
 # == Author
 #   Julik <me@julik.nl>
 
 require File.dirname(__FILE__) + '/../lib/tracksperanto'
 require 'optparse'
+require 'rubygems'
+require 'progressbar'
 
 # Sane defaults
 reader_klass = nil
 width = nil
 height = nil
-reformat_w = nil
-reformat_h = nil
-scale_x = 1.0
-scale_y = 1.0
-slip = 0
-golden_tracks = false
-x_shift = 0
-y_shift = 0
-length_gate = 0
-set_prefix = ''
+
+middlewares = []
 sole_format = nil
-lerp = false
 reader_name = "ShakeScript"
 readers = Tracksperanto.importer_names
 writers = Tracksperanto.exporter_names
 
 parser = OptionParser.new do | p |
@@ -40,38 +33,56 @@
  }
  p.on(" -f", "--from TRANSLATOR", String, 
    "Use the specific import translator (will try to autodetect, but can be #{Tracksperanto.importer_names.join(', ')})") do | f |
     reader_name = f
  end
- p.on(" -p", "--prefix PREFIX", String, "A prefix to prepend to tracker names in bulk") { |w| set_prefix = w }
  p.on(" -w", "--width WIDTH_IN_PIXELS", Integer, "Absolute input comp width in pixels (will try to autodetect)") { |w| width = w }
  p.on(" -h", "--height HEIGHT_IN_PIXELS", Integer, "Absolute input comp height in pixels (will try to autodetect)") {|w| height = w }
- p.on(" -xs", "--xscale X_SCALING_FACTOR", Float, "Scale the result in X by this factor (1.0 is the default)") {|sx| scale_x = sx }
- p.on(" -ys", "--yscale Y_SCALING_FACTOR", Float, "Scale the result in Y by this factor (1.0 is the default)") {|sy| scale_y = sy }
- p.on(" -s", "--slip FRAMES", Integer, "Slip the result by this number of frames, positive is 'later'") {|sy| slip = sy }
- p.on(" -g", "--golden", "Reset the residuals of all trackers to 0 (ignore correlation)") {|g_flag| 
-   golden_tracks = g_flag
- }
- p.on(" -rx", "--reformat-x NEW_PIX_WIDTH", Integer, "Reformat the comp to this width and scale all tracks to it") {|rw| 
-   reformat_w = rw
- }
- p.on(" -ry", "--reformat-y NEW_PIX_HEIGHT", Integer, "Reformat the comp to this height and scale all tracks to it") {|rh|
-   reformat_h = rh
- }
- p.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, format must be one of #{writers.join(", ")}") {|f|
+ 
+ p.on(" -xs", "--xscale X_SCALING_FACTOR", Float, "Scale the result in X by this factor (1.0 is the default)") do |sx| 
+   middlewares << ["Scaler", {:x_factor => sx}]
+ end
+ p.on(" -ys", "--yscale Y_SCALING_FACTOR", Float, "Scale the result in Y by this factor (1.0 is the default)") do |sy| 
+   middlewares << ["Scaler", {:y_factor => sx}]
+ end
+ p.on(" -s", "--slip FRAMES", Integer, "Slip the result by this number of frames, positive is 'later'") do |sy| 
+   middlewares << ["Slipper", {:slip => sx}]
+ end
+ p.on(" -g", "--golden", "Reset the residuals of all trackers to 0 (ignore correlation)") do |g_flag| 
+   middlewares << ["Golden", {:enabled => true}]
+ end
+ p.on(" -rx", "--reformat-x NEW_PIX_WIDTH", Integer, "Reformat the comp to this width and scale all tracks to it") do |rw| 
+   middlewares << ["Reformat", {:width => rw}]
+ end
+ p.on(" -ry", "--reformat-y NEW_PIX_HEIGHT", Integer, "Reformat the comp to this height and scale all tracks to it") do |rh|
+   middlewares << ["Reformat", {:height => rh}]
+ end
+ p.on(" -m", "--min-length LENGTH_IN_FRAMES", Integer, "Only export trackers having more than X keyframes") do | min_kf | 
+   middlewares << ["LengthCutoff", {:min_length => min_kf}]
+ end
+ p.on(" -xm", "--xshift X_IN_PIXELS", Float, "Move the points left or right") do |sx|
+   middlewares << ["Shift", {:x_shift => sx}]
+ end
+ p.on(" -ym", "--yshift Y_IN_PIXELS", Float, "Move the points up or down") do |sx| 
+   middlewares << ["Shift", {:y_shift => sx}]
+ end
+ p.on(" -p", "--prefix PREFIX", String, "A prefix to prepend to tracker names in bulk") do |w| 
+   middlewares << ["Prefix", {:prefix => w}]
+ end
+ 
+ p.on("--lerp", "Linearly interpolate missing keyframes") do
+   middlewares << ["Lerp", {:enabled => true}]
+ end
+ 
+ p.on(" -o", "--only EXPORTER_NAME", String, "Only export the selected format, format must be one of #{writers.join(", ")}") do |f|
    sole_format = f
- }
- p.on(" -m", "--min-length LENGTH_IN_FRAMES", Integer, "Only export trackers having more than X keyframes") {|f| 
-   length_gate = f
- }
- p.on(" -xm", "--xshift X_IN_PIXELS", Float, "Move the points left or right") {|sx| x_shift = sx }
- p.on(" -ym", "--yshift Y_IN_PIXELS", Float, "Move the points up or down") {|sx| y_shift = sx }
- p.on("--lerp", "Linearly interpolate missing keyframes") {|v| lerp = true }
+ end
+
  p.on("--version", "Show the version and exit") {|v| 
-    puts "#{Tracksperanto::VERSION} running on Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
+    puts "Tracksperanto v.#{Tracksperanto::VERSION} running on Ruby #{RUBY_VERSION} on #{RUBY_PLATFORM}"
     puts "Copyright 2008-#{Time.now.year} by Guerilla-DI (Julik Tarkhanov and contributors)"
-    puts "For questions and support contact info at guerilla-di.org"
+    puts "For questions and support contact info#{64.chr}guerilla-di.org"
     exit(0)
  }
 end
 
 begin
@@ -89,58 +100,24 @@
   exit(-1)
 end
 
 input_file = ARGV.pop
 if !input_file
-  STDERR.puts "No input file provided - should be the last argument"
+  STDERR.puts "No input file provided - should be the last argument. Also use the --help option."
   exit(-1)
 end
 
-class Spinner
-  RING = ['|', '/', '-', '\\', '|', '/', '-', '\\']
-  
-  def initialize
-    @counter, @last_len = 0, 0
-  end
-  
-  def spin(percent, msg)
-    current = RING[(@counter += 1) % RING.length]
-    output = " [%s %d%%]" % [current, percent]
-    STDOUT.write(output + ("\r" * output.length))
-    STDOUT.flush
-    @last_len = output.length
-  end
-  
-  def finish(with_message = '')
-    STDOUT.write("\r" * @last_len.to_i)
-    STDOUT.flush
-    STDOUT.puts(with_message)
-  end
-end
+pbar = ProgressBar.new("Converting", 100)
+pipe = Tracksperanto::Pipeline::Base.new(:progress_block => lambda{|p,m| pbar.set(p) }, :middleware_tuples => middlewares)
 
-spinner = Spinner.new
-pipe = Tracksperanto::Pipeline::Base.new(:progress_block => spinner.method(:spin).to_proc)
-
 if sole_format
   begin
     pipe.exporters = [Tracksperanto.get_exporter(sole_format)]
   rescue NameError
     STDERR.puts "Unknown exporter #{sole_format}. Available exporters: #{writers.join(", ")}"
     exit(-1)
   end
 end
 
-pipe.run(input_file, :pix_w => width, :pix_h => height, :parser => reader_klass) do | scaler, slipper, golden, reformat, shift, prefix, lerpm, len |
-  slipper.slip = slip
-  scaler.x_factor = scale_x
-  scaler.y_factor = scale_y
-  golden.enabled = golden_tracks
-  reformat.width = reformat_w if reformat_w
-  reformat.height = reformat_h if reformat_h
-  shift.x_shift = x_shift
-  shift.y_shift = y_shift
-  prefix.prefix = set_prefix
-  lerpm.enabled = lerp
-  len.min_length = length_gate
-end
-
-spinner.finish("Converted #{pipe.converted_points} trackers with #{pipe.converted_keyframes} keys")
+pipe.run(input_file, :width => width, :height => height, :parser => reader_klass)
+pbar.finish
+puts ("Converted #{pipe.converted_points} trackers with #{pipe.converted_keyframes} keys")
\ No newline at end of file