mkv 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.0.3
+------
+* Added subtitle extraction options to filter by language (by alxbrun)
+* Some fixes (by alxbrun)
+* More information provided by the extract method
+
 v0.0.2
 ------
 * Added default value for some of track's properties

data/lib/mkv.rb

@@ -27,9 +27,9 @@ module MKV
   # @return [Logger]
   def self.logger
     return @logger if @logger
-    logger = Logger.new(STDOUT)
-    logger.level = Logger::INFO
-    @logger = logger
+    log = Logger.new(STDOUT)
+    log.level = Logger::INFO
+    @logger = log
   end
 
   # Set the path of the mkvinfo binary.

data/lib/mkv/movie.rb

@@ -26,7 +26,7 @@ module MKV
         MKV::Track.new track_data
       end
 
-      @invalid = true if @tracks.any?
+      @invalid = true unless @tracks.any?
       @invalid = true if output.include?("is not supported")
       @invalid = true if output.include?("could not find codec parameters")
     end
@@ -39,23 +39,40 @@ module MKV
     def has_video? ; tracks.select { |t| t.type == 'video' }.any? ; end
     def has_audio? ; tracks.select { |t| t.type == 'audio' }.any? ; end
 
-    def extract_subtitles(destination_dir)
-      tracks.select { |t| t.type == 'subtitles' }.each do |track|
-        destination_filename = File.basename(@path).gsub(/\.mkv$/i, %Q[.#{track.language}.srt])
-        command = %Q[#{MKV.mkvextract_binary} tracks "#{@path}" #{track.mkv_info_id}:"#{File.join(destination_dir, destination_filename)}"]
+    def has_subtitles?(language)
+      tracks.any? { |t| t.type == 'subtitles' && t.language == language}
+    end
+
+    def extract_subtitles(options={})
+      # Compatibility with legacy method accepting a String for destination_dir (deprecated)
+      if options.class == String
+        options = { :destination_dir => options }
+      end
 
-        MKV.logger.debug "Executing command: #{command}"
+      options[:language] ||= []
+      options[:language] = [options[:language]].flatten.map(&:to_sym) if options[:language]
+
+      track_filter = lambda { |t| t.type == 'subtitles' && (options[:language].include?(t.language.to_sym) || options[:language].empty?) }
+
+      tracks.select(&track_filter).each do |track|
+        destination_fileextension = (options[:language].count == 1 ? "" : ".#{track.mkv_info_id}.#{track.language}") + ".srt"
+        destination_filename = File.basename(@path).gsub(/\.mkv$/i, destination_fileextension)
+        destination_dir = options[:destination_dir] || File.dirname(@path)
+
+        command = %Q[#{MKV.mkvextract_binary} tracks "#{@path}" #{track.mkv_info_id}:"#{File.join(destination_dir, destination_filename)}"]
+        MKV.logger.info(command)
 
         output = ""
+        start_time = Time.now.to_i
         Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
           begin
-            yield(0.0) if block_given?
+            yield(0.0, 0, destination_filename) if block_given?
             next_line = Proc.new do |line|
               output << line
               if line =~ /(\d+)%/
                 progress = $1.to_i
 
-                yield(progress) if block_given?
+                yield(progress, Time.now.to_i - start_time, destination_filename) if block_given?
               end
 
               if line =~ /Unsupported codec/

data/lib/mkv/track.rb

@@ -10,7 +10,7 @@ module MKV
     attr_reader :language, :enabled, :default, :forced
 
     def initialize(data)
-      (@number, @mkv_info_id) = data.match(/track number:\s(\d+)\s\(track ID for mkvmerge & mkvextract: (\d+)\)/i)[1..2] 
+      (@number, @mkv_info_id) = data.match(/track number:\s(\d+)\s\(track ID for mkvmerge & mkvextract: (\d+)\)/i)[1..2]
       @uid = data.match(/track uid: (\d+)/i)[1]
       @lacing = (data.match(/lacing flag: (\d+)/i) || [0, 0])[1] != '0'
       @type = data.match(/track type: (\w+)/i)[1]
@@ -23,16 +23,27 @@ module MKV
 
       if @type == 'audio'
         @sampling_frequency = data.match(/sampling frequency: (\d+)/i)[1].to_i
-        @channels = data.match(/channels: (\d+)/i)[1].to_i
+        @channels = (data.match(/channels: (\d+)/i) || [nil, '2'])[1].to_i
       end
 
       if @type == 'audio' || @type == 'subtitles'
-        @language = data.match(/language: (\w+)/i)[1]
+        @language = (data.match(/language: (\w+)/i) || [nil, 'eng'])[1]
         @enabled = (data.match(/enabled: (\d+)/i) || [0, 1])[1] != '0'
         @default = (data.match(/default flag: (\d+)/i) || [0, 0])[1] != '0'
         @forced = (data.match(/forced flag: (\d+)/i) || [0, 0])[1] != '0'
       end
     end
 
+    def is_video?
+      @type == 'video'
+    end
+
+    def is_audio?
+      @type == 'audio'
+    end
+
+    def is_subtitle?
+      @type =~ /subtitles?/
+    end
   end
 end

data/lib/mkv/version.rb

@@ -1,3 +1,3 @@
 module MKV
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mkv
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-20 00:00:00.000000000 Z
+date: 2013-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec