digitalfilmtree 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 340bc00f2fc3fbb7667daec4f228c0d5df3b73b8
-  data.tar.gz: e482bdbd73597334808b3817e713831e3e165ba3
+  metadata.gz: 83bf81173f76ca7aca351a01dcebf7d49d62ea33
+  data.tar.gz: 197b192ebe198df2355082158c95f2d9e44d78bf
 SHA512:
-  metadata.gz: fc100047d646cf7298423c994db3019dfc3bc148ab77a0156014004c64e060f55a9a3da982f1e55139e7a498a4e372583fbc748baf61f9248a77bcf034f3a614
-  data.tar.gz: 7d775dba1daa3f9612b8bf783bcf8fbd5b396f5c1f3bdeca18c7bd03ba72d305bada8b4fad8c75ef80c2f4131e4b7ad549d9bca622fecdba0892768b421ea95f
+  metadata.gz: abdfa1d8c95bbfadc6d0d30fe485fc4c5477b1bb2fedb40c02fcc25c46bd1a575635c614ce08cafaa1b7f70f5ef23eefd71416473a0725a3c9f86212654dd804
+  data.tar.gz: c08d08e78fe085e937faf92f01e4d13172823abf0784e45d0c63de18d23153379baedb4f6595d3d10844dd61656990df08611e10270dbeb359a8b5b0215aad99

data/lib/digitalfilmtree/version.rb

@@ -1,3 +1,3 @@
 module Digitalfilmtree
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/digitalfilmtree/vfx/edl_ml_renamer.rb

@@ -4,7 +4,7 @@ require 'edl'
 module Digitalfilmtree
   module VFX
     class EDLMLRenamer
-      attr_accessor :ml, :edl, :movs
+      attr_accessor :ml, :edl, :movs, :ml_name_column
       attr_reader :folder, :count
 
       def folder=(path)
@@ -22,8 +22,9 @@ module Digitalfilmtree
 
       def execute
         raise "Not Ready" unless ready?
-        @count = 0
         parse_marker_list
+        get_marker_list_name_column
+        @count = 0
         EDL::Parser.new.parse(File.open(self.edl)).each do |e|
           find_clip(e.reel) do |path|
             timeline_tc_in = e.rec_start_tc.to_s
@@ -39,9 +40,25 @@ module Digitalfilmtree
 
       protected
 
+      def get_marker_list_name_column
+        row = @ml_data.first
+        loop do
+          if self.ml_name_column && row[self.ml_name_column]
+            puts "Using marker list column index #{self.ml_name_column} for the Name"
+            break
+          else
+            puts "Please enter the number mapping to the Name column in the marker list:"
+            row.each_with_index do |e,i|
+              puts "#{i}) #{e}"
+            end
+            self.ml_name_column = STDIN.gets.strip.to_i
+          end
+        end
+      end
+
       def get_vfx_name timeline_tc_in, &block
         row = @ml_data.select{|r| r.include? timeline_tc_in }
-        name = row.flatten.first
+        name = row.flatten[self.ml_name_column]
         block.call(name) if name
       end
 
@@ -58,7 +75,7 @@ module Digitalfilmtree
         entries = Dir.entries(self.folder).select do |i|
           i.include? patt
         end
-        if sep = File::ALT_SEPARATOR
+        if sep = File::ALT_SEPARATOR # Windows support
           entries.map do |entry|
             File.join self.folder, sep, entry
           end

data/spec/lib/digitalfilmtree/vfx/edl_ml_renamer_spec.rb

@@ -11,14 +11,24 @@ describe Digitalfilmtree::VFX::EDLMLRenamer do
 
     context "required files exist" do
       let(:target) { fixture('vfx/edl_ml_renamer') }
+      let(:originals) { subject.movs.map{|i| Pathname.new(i)} }
       before do
+        STDIN.stub(:gets).and_return "0"
         subject.folder = target.path
-        @originals = subject.movs.map{|i| Pathname.new(i)}
       end
-      it "renames .mov files in the folder" do
-        @originals.each {|i| i.should exist }
-        subject.execute
-        @originals.each {|i| i.should_not exist }
+      shared_examples_for 'rename' do
+        it "renames .mov files in the folder" do
+          originals.each {|i| i.should exist }
+          subject.execute
+          originals.each {|i| i.should_not exist }
+        end
+      end
+      context 'name column is not defined' do
+        it_behaves_like 'rename'
+      end
+      context 'name column is predefined' do
+        before { subject.ml_name_column = 0 }
+        it_behaves_like 'rename'
       end
       after { target.clean.reset }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: digitalfilmtree
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Keyvan Fatehi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler