mkv2m4v 0.1.2 → 0.2.0

data/lib/mkv2m4v.rb

@@ -10,7 +10,7 @@ module Mkv2m4v
 
     def run
       if @options[:info]
-        each_file(&:print)
+        each_file(&:print_info)
       else
         each_file(&:transcode)
       end
@@ -25,17 +25,20 @@ module Mkv2m4v
     end
 
     def parse_options
-      usage = usage
       @options = Trollop::options do
         version Mkv2m4v::VersionDescription
         banner [Mkv2m4v::Description, Mkv2m4v::Usage].join("\n")
         opt :info, "Print media info only"
-        opt :lang, "Preferred languages", :type => :strings, :default => ["English"]
+        opt :lang, "Preferred languages, comma separated", :type => :string, :default => "English"
         opt :dir, "Destination directory", :type => :string
-        opt :verbose, "More output", :type => :boolean
       end
-      @options[:languages] = @options[:lang].map { |lang| Iso639[lang] }.compact
+      parse_languages
       @filenames = ARGV
     end
+
+    def parse_languages
+      @options[:languages] =
+        @options[:lang].split(/\s*,\s*/).map { |lang| Iso639[lang] }.compact
+    end
   end
 end

data/lib/mkv2m4v/file.rb

@@ -11,7 +11,8 @@ module Mkv2m4v
     extend Forwardable
 
     attr_reader :info, :video_tracks, :audio_tracks, :text_tracks
-    attr_reader :ideal_video_track, :ideal_audio_track
+    attr_reader :info, :filtered_video_tracks, :filtered_audio_tracks, :filtered_text_tracks
+    attr_reader :ideal_video_track, :ideal_audio_track, :ideal_text_track
     def_delegator :info, :filename, :name
     def_delegator :info, :full_filename, :filename
 
@@ -26,19 +27,17 @@ module Mkv2m4v
       info.general.format
     end
 
-    def print
-      puts "#{format}: #{name}".black.on_yellow
-      video_tracks.filter.each(&:print) if @options[:verbose]
-      audio_tracks.filter.each(&:print) if @options[:verbose]
-      text_tracks.filter.each(&:print)  if @options[:verbose]
-      print_ideal_tracks
-      puts
+    def print_info
+      process do
+        print_filtered_tracks
+      end
     end
 
     def transcode
-      puts "#{format}: #{name}".black.on_yellow
-      Transcoder.new(self, @options).run
-      puts
+      process do
+        print_ideal_tracks
+        Transcoder.new(self, @options).run
+      end
     end
 
     def self.each(filenames, options = {})
@@ -53,20 +52,59 @@ module Mkv2m4v
 
     private
 
+    def process
+      preamble
+      yield
+      postamble
+    end
+
+    def preamble
+      print "#{format}: #{name}".black.on_yellow
+      langs = @languages.empty? ? "all languages" : @languages.join(", ")
+      puts " (matching #{langs})".yellow.on_black
+    end
+
+    def postamble
+      puts
+    end
+
+    def print_all_tracks
+      video_tracks.each(&:print)
+      audio_tracks.each(&:print)
+      text_tracks.each(&:print)
+    end
+
+    HIGHLIGHT_COLOR = { :background => :cyan }
+
+    def print_filtered_tracks
+      filtered_video_tracks.each do |t|
+        t.print t == ideal_video_track && HIGHLIGHT_COLOR
+      end
+      filtered_audio_tracks.each do |t|
+        t.print t == ideal_audio_track && HIGHLIGHT_COLOR
+      end
+      filtered_text_tracks.each do |t|
+        t.print t == ideal_text_track && HIGHLIGHT_COLOR
+      end
+    end
+
     def print_ideal_tracks
-      puts "==> Ideal video track"
-      @ideal_video_track.print
-      puts "==> Ideal audio track"
-      @ideal_audio_track.print
+      ideal_video_track.print HIGHLIGHT_COLOR
+      ideal_audio_track.print HIGHLIGHT_COLOR
     end
 
     def init_tracks
-      @video_tracks = tracks_by_type(:video)
-      @audio_tracks = tracks_by_type(:audio)
-      @text_tracks  = tracks_by_type(:text)
+      @video_tracks = tracks_by_type(:video).rank
+      @audio_tracks = tracks_by_type(:audio).rank
+      @text_tracks  = tracks_by_type(:text).rank
+
+      @filtered_video_tracks = video_tracks.filter
+      @filtered_audio_tracks = audio_tracks.filter
+      @filtered_text_tracks  = text_tracks.filter
 
-      @ideal_video_track = video_tracks.filter.rank.first
-      @ideal_audio_track = audio_tracks.filter.rank.first
+      @ideal_video_track = filtered_video_tracks.first
+      @ideal_audio_track = filtered_audio_tracks.first
+      @ideal_text_track  = filtered_text_tracks.first
     end
 
     def tracks_by_type(type)

data/lib/mkv2m4v/track.rb

@@ -32,8 +32,8 @@ module Mkv2m4v
       "#{frame_size}#{interlaced? ? "i" : "p"}"
     end
 
-    def print
-      puts "Track #{id}: (video)"
+    def print(color = nil)
+      puts "Video Track ##{id}:".colorize(color)
       puts "  Format:     #{format_description}"
       puts "  Resolution: #{resolution}"
       puts "  FPS:        #{fps}"
@@ -61,8 +61,8 @@ module Mkv2m4v
       "#{bit_rate_kbps}k (#{info.bit_rate_mode})"
     end
 
-    def print
-      puts "Track #{id}: (audio)"
+    def print(color = nil)
+      puts "Audio Track ##{id}:".colorize(color)
       puts "  Format:     #{format_description}"
       puts "  Channels:   #{channel_description}"
       puts "  Bit rate:   #{bit_rate_description}"
@@ -76,8 +76,8 @@ module Mkv2m4v
       "#{format} (#{info.codec_id})"
     end
 
-    def print
-      puts "Track #{id}: (text)"
+    def print(color = nil)
+      puts "Text Track ##{id}:".colorize(color)
       puts "  Format:     #{format_description}"
       puts "  Language:   #{language}"
       puts "  Title:      #{title}"

data/lib/mkv2m4v/track_ranker.rb

@@ -17,7 +17,7 @@ module Mkv2m4v
     end
 
     def rank
-      ranked_tracks = @tracks.sort_by { |t| score(t) }.reverse
+      ranked_tracks = @tracks.sort_by { |t| -score(t) }
       self.class.new(ranked_tracks, @options)
     end
 
@@ -57,8 +57,11 @@ module Mkv2m4v
   end
 
   class TextRanker < TrackRanker
-    # scoring not implemented yet
-    # def score(track)
-    # end
+    def score(track)
+      score = 0
+      score += 3 if track == first
+      score += 4 if language_match?(track)
+      score
+    end
   end
 end

data/lib/mkv2m4v/version.rb

@@ -1,5 +1,5 @@
 module Mkv2m4v
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 
   VersionDescription = "mkv2m4v #{VERSION} (c) 2012 Ryan McGeary"
   Description = <<EOS

metadata

@@ -2,14 +2,14 @@
 name: mkv2m4v
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement