vollbremsung 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmFlZDEyNzA5YWQ0NTdlZWQyMzc2ODA0ODkyMGY5NDQzZDE1NjBkNQ==
+    YWY1NjRkYzg4YzQ0MjA3MmQ3NmZkZDVhYWEwYWY4NTczODgwNDIzYw==
   data.tar.gz: !binary |-
-    ODVmMDRiNTkwMDlmOTg4OWNkNDUxNzgxY2UxMDhjMTQ4NDE2ZGFiNw==
+    NmU3ZjYzNDIyYjk4MGQ2NjhmYmQ5MWMyMWViZTM3YjZhZWM3MTkzNw==
 SHA512:
   metadata.gz: !binary |-
-    NDQzYTk3NzllODgzNjdkNzNiZDQ2NTVmNWY3MDZkNTY2YzI2NmQxNmMzYmU1
-    MzA0YWU0OTQwNTJlMWJlOTg5ZWJhZWZiZTg1YjBjYzg4Y2U1ODQ3NzE4ODI1
-    ZGI4NWYwMDZkZDI4MzYxNTYzNGU3MDIzNjkxYTFmMDdjNjViMjM=
+    Yjg2MWViYzg0NGRhZjczZjQ4ZmY2ZGZhZjZhMjM4N2FkYmRlMDk5NjM2MTFi
+    MjdjNDE0NWI3Mzg0MjhjYjhiMmY0Y2Y0MTZlODgwZDE0YWI3OWM4ZjcwZmU3
+    NjYxYjZjMWM1YzBkNWZlYTE4OWU5M2NkY2M0MTY0NzIxYTFjZGM=
   data.tar.gz: !binary |-
-    NDVhOTNkMGI1NDgxM2U3ZDA1NmY0NWQ1NjI3YmY1M2IzYThhODJiOWIxNjVh
-    ZGM1MzIwNTFlYjk5ZmYyZmJjZjQyOTNkNjA1MjM3NmQ0Yzg1N2RmOTgyMDVl
-    NjhmZTVlYjMxMWVmODhiOTI0ZDIzMDMyYTExZDliODdjNjc3ZDg=
+    MzNlYjM0Y2E2ZGMxOTE1ZmNlOWExOTI0M2ZjNDhjMDE3YmUwYmEwNDUzMmRj
+    NDNhZmQ2NzcyMmY5M2Y5YTQyNmYwMGZlYTAzYmIwYTM4ODBkZmViZDBjOTIz
+    ZTdiNzdkMzljZDI5MWQwN2QxYjYyYTE3NzgzMzBmMmI4YjBjZTQ=

data/README.md

@@ -1,4 +1,5 @@
-vollbremsung
-============
+# vollbremsung
+
+[![Gem Version](https://badge.fury.io/rb/vollbremsung.svg)](http://badge.fury.io/rb/vollbremsung)
 
 Handbrake bulk encoding tool

data/bin/vollbremsung

@@ -4,6 +4,7 @@
 require 'mkmf' # part of stdlib
 require 'open3'
 require 'json'
+require 'optparse'
 require 'handbrake'
 require 'vollbremsung'
 
@@ -22,45 +23,47 @@ def ffprobe(file)
 end
 
 options = {}
-begin 
-  require 'optparse'
-  OptionParser.new do |opts|
-    opts.banner = Vollbremsung::USAGE
-    opts.separator ""
-
-    opts.on("-d", "--delete", "Delete source files after successful encoding") do |flag|
-      options[:delete]  = true
-    end
 
-    opts.on("-m", "--move", "Move source files to <FILENAME>.old after successful encoding") do |flag|
-      options[:move] = true
-    end
+OptionParser.new do |opts|
+  opts.banner = Vollbremsung::USAGE
+  opts.separator ""
 
-    opts.on("-r", "--recursive", "Process all file in subdirectories recursively as well") do |flag|
-      options[:recursive] = true
-    end
+  opts.on("-d", "--delete", "Delete source files after successful encoding") do |flag|
+    options[:delete]  = true
+  end
 
-    opts.on("-t", "--title", "Set the mp4 title to the filename") do |flag|
-      options[:title] = true
-    end
+  opts.on("--list-only", "List matching files only. Do not run processing") do |flag|
+    options[:list_only]  = true
+  end
 
-    opts.on_tail("-h", "--help", "Show this message") do
-      puts opts
-      exit
-    end
-  end.parse! # do the parsing. do it now!
-rescue LoadError
-  puts "Option parsing not supported on your system. All options will be ignored."
-  puts "To enable support run 'gem install optparse'"
-  options[:delete] = false
-  options[:move] = false
-  options[:recursive] = false
-  options[:title] = false
-end
+  opts.on("-m", "--move", "Move source files to <FILENAME>.old after successful encoding") do |flag|
+    options[:move] = true
+  end
+
+  opts.on("-r", "--recursive", "Process all file in subdirectories recursively as well") do |flag|
+    options[:recursive] = true
+  end
+
+  opts.on("-t", "--title", "Set the mp4 title to the filename") do |flag|
+    options[:title] = true
+  end
+  
+  opts.on("--x264-preset [PRESET]", "Set the x264-preset. Default is: #{Vollbremsung::X264_DEFAULT_PRESET}") do |preset|
+    options[:x264_preset] = preset
+  end
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts opts
+    exit
+  end
+end.parse! # do the parsing. do it now!
+
+
+options[:x264_preset] = Vollbremsung::X264_DEFAULT_PRESET if options[:x264_preset].nil?
 
 
 if ARGV[0].nil? 
-  puts "No target directory provided."
+  puts "No target provided."
   puts Vollbremsung::USAGE
   exit 1
 end
@@ -78,21 +81,24 @@ if options[:move] && options[:delete]
   exit 1
 end
 
-unless find_executable('HandbrakeCLI') || find_executable('HandBrakeCLI')
-  puts "It seems you do not have HandbrakeCLI installed or it is not available in your $PATH."
-  puts "Install it an run again"
-  exit 1
-end
+# probe for required executable
+# only do this if not in list-only mode
+unless options[:list_only]
+  unless find_executable('HandbrakeCLI') || find_executable('HandBrakeCLI')
+    puts "It seems you do not have HandbrakeCLI installed or it is not available in your $PATH."
+    puts "You can get the executable from http://handbrake.fr/downloads.php"
+    exit 1
+  end
 
-unless find_executable 'ffprobe'
-  puts "It seems you do not have ffprobe installed or it is not available in your $PATH."
-  puts "ffprobe is part of ffmpeg. Install it for your system and run again."
-  exit 1
+  unless find_executable 'ffprobe'
+    puts "It seems you do not have ffprobe installed or it is not available in your $PATH."
+    puts "ffprobe is part of ffmpeg. Install it for your system and run again."
+    exit 1
+  end
 end
 
-File.delete 'mkmf.log' # find_executable seems to create such file in case executable is not found
 
-#StreamStruct = Struct.new(:count,:names)
+File.delete 'mkmf.log' rescue nil# find_executable seems to create such file in case executable is not found
 
 #HANDBRAKE_OPTIONS = "--encoder x264 --quality 20.0 --aencode faac -B 160 --mixdown dpl2 --arate Auto -D 0.0 --format mp4 --markers --audio-copy-mask aac,ac3,dtshd,dts,mp3 --audio-fallback ffac3 --x264-preset veryfast --loose-anamorphic --modulus 2"
 
@@ -117,6 +123,8 @@ else
   target_files << File.absolute_path(TARGET_PATH)
 end
 
+exit if options[:list_only]
+
 target_files.each do |infile|
   
   metadata = ffprobe(infile)
@@ -163,7 +171,7 @@ target_files.each do |infile|
   begin
     HandBrake::CLI.new.input(infile).encoder('x264').quality('20.0').aencoder('faac').
     ab('160').mixdown('dpl2').arate('Auto').drc('0.0').format('mp4').markers.
-    audio_copy_mask('aac,ac3,dtshd,dts,mp3').audio_fallback('ffac3').x264_preset('veryfast').
+    audio_copy_mask('aac,ac3,dtshd,dts,mp3').audio_fallback('ffac3').x264_preset(options[:x264_preset]).
     loose_anamorphic.modulus('2').audio((1..astreams.count).to_a.join(',')).aname(astreams.names.join(',')).
     subtitle((1..sstreams.count).to_a.join(',')).output(outfile)
     
@@ -181,7 +189,7 @@ target_files.each do |infile|
     log "compression ratio: %.2f" % (outfile_size.to_f / infile_size.to_f)
       
     if options[:title]
-      log "setting mp4 title"
+      log "setting MP4 title"
     
       infile_noext = File.join( File.dirname(infile), File.basename(infile,File.extname(infile)))
       tmpfile = infile_noext + ".tmp.mp4"
@@ -196,7 +204,7 @@ target_files.each do |infile|
           log "ERROR: moving #{tmpfile} to #{outfile}"
         end
       else
-        log "ERROR: mp4 title could not be changed"
+        log "ERROR: MP4 title could not be changed"
       end
     end # if options[:title]
     

data/lib/vollbremsung.rb

@@ -1,9 +1,10 @@
 module Vollbremsung
   
   USAGE   = "Usage: vollbremsung [options] <target>"
-  VERSION = '0.0.8'
-  CONVERT_TYPES = ['mkv','avi','mov','flv','mpg','wmv']
+  VERSION = '0.0.9'
+  CONVERT_TYPES = ['mkv','avi','mov','flv','mpg','wmv','ogm']
   FFMPEG_OPTIONS = "-map 0 -acodec copy -vcodec copy -scodec copy"
+  X264_DEFAULT_PRESET = "veryfast"
   
   class StreamDescr < Struct.new(:count,:names)
     def initialize

data/vollbremsung.gemspec

@@ -19,5 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   
   spec.required_ruby_version = '>= 1.9.3'
-  spec.add_dependency 'handbrake', '~> 0'
+  spec.add_dependency 'handbrake', '~> 0.4'
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vollbremsung
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Maximilian Irro
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 description: Handbrake bulk encoding tool
 email: max@disposia.org
 executables: