mkv2m4v 0.2.0 → 0.3.0

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Ryan McGeary
+Copyright (c) 2012-2013 Ryan McGeary
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/mkv2m4v/transcoder.rb

@@ -1,5 +1,7 @@
 require "fileutils"
 require "colorize"
+require "shellwords"
+require "iso639/language"
 
 module Mkv2m4v
   class Transcoder
@@ -26,7 +28,11 @@ module Mkv2m4v
 
     def extract
       puts "==> Extracting #{video_id}:video.#{video_ext} #{audio_id}:audio.#{audio_ext} ".magenta
-      system "mkvextract tracks #{@file.filename.inspect} #{video_id}:#{video_file} #{audio_id}:#{audio_file}"
+      command = "mkvextract tracks"
+      command << " #{escape(@file.filename)}"
+      command << " #{video_id}:#{escape(video_file)}"
+      command << " #{audio_id}:#{escape(audio_file)}"
+      system command
     end
 
     def transcode_avc
@@ -42,7 +48,11 @@ module Mkv2m4v
         puts "==> Assuming pass through for AAC audio track".yellow.on_black
       else
         puts "==> Transcoding #{audio_format} to Stereo AAC audio track".magenta
-        system "ffmpeg -i #{audio_file.inspect} -acodec libfaac -ac 2 -ab 160k #{audio_basename}.aac"
+        command = "ffmpeg"
+        command << " -i #{escape(audio_file)}"
+        command << " -acodec libfaac -ac 2 -ab 160k"
+        command << " #{escape(audio_basename)}.aac"
+        system command
       end
     end
 
@@ -54,19 +64,24 @@ module Mkv2m4v
         @skip_ac3 = true
       else
         puts "==> Transcoding #{audio_format} to Surround AC-3 audio track".magenta
-        system "ffmpeg -i #{audio_file.inspect} -acodec ac3 -ac #{max_audio_channels} -ab #{max_audio_bit_rate}k #{audio_basename}.ac3"
+        command = "ffmpeg"
+        command << " -i #{escape(audio_file)}"
+        command << " -acodec ac3 -ac #{max_audio_channels} -ab #{max_audio_bit_rate}k"
+        command << " #{escape(audio_basename)}.ac3"
+        system command
       end
     end
 
     def remux
       puts "==> Remuxing everything into an M4V container".magenta
       command = "MP4Box"
-      command << " -add #{video_basename.inspect}.h264:lang=en:name=\"AVC Video\" "
-      command << " -add #{audio_basename.inspect}.aac:lang=en:group=1:delay=84:name=\"Stereo\" "
+      command << " -add #{escape(video_basename)}.h264:lang=#{video_language.alpha3_terminology}:name=\"AVC Video\""
+      command << " -add #{escape(audio_basename)}.aac:lang=#{audio_language.alpha3_terminology}:group=1:delay=84:name=\"Stereo\""
       unless @skip_ac3
-        command << " -add #{audio_basename.inspect}.ac3:lang=en:group=1:delay=84:disable:name=\"AC3\" "
+        command << " -add #{escape(audio_basename)}.ac3:lang=#{audio_language.alpha3_terminology}:group=1:delay=84:disable:name=\"AC3\" "
       end
-      command << " -new #{m4v_file.inspect}"
+      command << " -new #{escape(m4v_file)}"
+      puts command
       system command
     end
 
@@ -98,6 +113,10 @@ module Mkv2m4v
       end
     end
 
+    def video_language
+      @file.ideal_video_track.language || @options[:languages].first || UnknownLanguage
+    end
+
     def audio_basename
       ::File.join(tmp_dir, "audio")
     end
@@ -118,6 +137,10 @@ module Mkv2m4v
       audio_format.gsub(/\W/, "").downcase
     end
 
+    def audio_language
+      @file.ideal_audio_track.language || @options[:languages].first || UnknownLanguage
+    end
+
     def max_audio_channels
       [@file.ideal_audio_track.channel_count, 6].min
     end
@@ -137,5 +160,11 @@ module Mkv2m4v
     def m4v_file
       ::File.join(dir, ::File.basename(@file.name, ".*") + ".m4v")
     end
+
+    def escape(str)
+      Shellwords.escape(str)
+    end
+
+    UnknownLanguage = Iso639::Language.new("", "", "", "", "")
   end
 end

data/lib/mkv2m4v/version.rb

@@ -1,7 +1,7 @@
 module Mkv2m4v
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 
-  VersionDescription = "mkv2m4v #{VERSION} (c) 2012 Ryan McGeary"
+  VersionDescription = "mkv2m4v #{VERSION} (c) 2012-2013 Ryan McGeary"
   Description = <<EOS
 mkv2m4v is a command line utility that converts audio and video tracks from a
 MKV (Matroska Media) container into a format compatible with Apple TVs.

data/lib/mkv2m4v.rb

@@ -30,7 +30,7 @@ module Mkv2m4v
         banner [Mkv2m4v::Description, Mkv2m4v::Usage].join("\n")
         opt :info, "Print media info only"
         opt :lang, "Preferred languages, comma separated", :type => :string, :default => "English"
-        opt :dir, "Destination directory", :type => :string
+        opt :dir, "Destination directory (default: same dir as source mkv)", :type => :string
       end
       parse_languages
       @filenames = ARGV

data/mkv2m4v.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "trollop",   "~> 2.0"
   gem.add_dependency "mediainfo", "~> 0.7"
-  gem.add_dependency "iso639",    "~> 1.0", ">= 1.0.5"
+  gem.add_dependency "iso639",    "~> 1.1"
   gem.add_dependency "colorize",  "~> 0.5"
 
   gem.add_development_dependency "minitest",       "~> 4.3"

metadata

@@ -2,117 +2,111 @@
 name: mkv2m4v
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan McGeary
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    none: false
   name: trollop
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
-    none: false
+        version: '2.0'
+- !ruby/object:Gem::Dependency
   name: mediainfo
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-    none: false
+        version: '0.7'
+- !ruby/object:Gem::Dependency
   name: iso639
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-    none: false
-- !ruby/object:Gem::Dependency
+        version: '1.1'
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
-    none: false
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: colorize
   type: :runtime
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
-    none: false
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   name: minitest
   type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.3'
-    none: false
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.0'
-    none: false
+        version: '4.3'
+- !ruby/object:Gem::Dependency
   name: rake
   type: :development
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: ! 'mkv2m4v is a command line utility that converts audio and video tracks
   from a
 
@@ -148,17 +142,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23