vollbremsung 0.0.20 → 0.0.21

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjE4MzlmZDc2NjZkNTVhZmMwOTMwOWJmZmJjYjIzNDYyYzRiYWI3Mw==
+    YzVmYjQzOGM0N2ZhOGM3MzJhOTRkNzAzNjg4MmQ5ZjE2N2U0YzlmNw==
   data.tar.gz: !binary |-
-    YTExYTMwODFhYzBjZjI3NzQzZDJlMWRmOTgxNTcyZGRlZTBkNzEwZQ==
+    Y2VmZDhmYmVmYTU3YTgwZDFmNDYxM2FiZTk4ZGZkMzNlMjExNjQxYg==
 SHA512:
   metadata.gz: !binary |-
-    ZGNjNWE0NDZlMDU5MTY5NTFkYjIxNzFiOTE4YzdjODk0ODRjMTQ2ODRkNjEy
-    NmI0MDIxNTY3MWIyNTdlYzllOGRhZTczMzllMjIzOWVlOGIzYzFjYWRhYmI0
-    YmMxZWZiOTY1NmZlNmY3ZmM2OGE2MDA2NmU4MTNjZDJlZTVhODk=
+    NWY0MGM2MTE3MTJmNDg2MTgyOTA1ZWIyOTEyYmFiYzcwNmZlNzRhMTVkMjU4
+    ZDU0ZWI2MWE2ZTM0ZGJmOWRjNGIyZDUzMDhiM2VlMjI3NjU5ZTNhNGNlOTBm
+    MDBlMjU1MDc5YWYzYzRhNjJlZmJhYWM2ODFiNDI0MGYwZWI4MWU=
   data.tar.gz: !binary |-
-    ODQ2NzdjMDg2NjMwZWY4ZGU2YTcyZTg0MjYxMjZlYmM3NDM5MWEwYzhmNzdm
-    ZGViNzc2OTI4NzY0NGYzYjJjZGUzMDgyNTRjZDQ4Y2ZiMGM3M2MzNDE3YWUw
-    MDllODBmNzZkY2U2OGJhOTM2ZWQ1MjFkM2Q3NzliMzNlZjNlZDM=
+    YmE4ZDdhZThkYTJlMjZlNDQ4NWNhZjI5NzliYzliNzM2MDYzZDAxMzI4ZTNk
+    ZGFhYjhjNzI0MGI1NTVjOWI2NDYzNmE1NzAxYmFmMDFhZTZhZTQxZDNjNDdj
+    MjJkYWZjYzFkNDE0ZmQ1NDg2MmFjYmM3MDg0NDE2OGZkZGFhMjY=

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014 Maximilian Irro
+Copyright (c) 2014-2015 Maximilian Irro
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ 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.
+SOFTWARE.

data/README.md

@@ -15,25 +15,28 @@ You need to have `ffmpeg`, `ffprobe` and `HandbrakeCLI` (on FreeBSD it's `HandBr
 ## Usage
 
 	vollbremsung [options] target [target [...]]
-	
-It takes target paths and probes them for suited files. If a target path is a file, it is the only match, if it is a directory all containing files with a matching file type (basically all the non MP4 multimedia types like .avi, .flv, .mov, etc.) are taken. The `--recursive` option will extend the search scope to probe the subfiletree as well. It furthermore analyses each file for its structure utilising [ffmpegs](https://www.ffmpeg.org) `ffprobe` tool in order to extend Handbrakes default preset, processing *all* audio and subtitle tracks, not only the first ones.
+
+It takes target paths and probes them for suited files. If a target path is a file, it is the only match, if it is a directory all containing files with a matching file type (basically all the non MP4 multimedia types like .avi, .flv, .mov, etc.) are taken. The `--recursive` option will extend the search scope to probe the sub filetree as well. It furthermore analyses each file for its structure utilising [ffmpegs](https://www.ffmpeg.org) `ffprobe` tool in order to extend Handbrakes default preset, processing *all* audio and subtitle tracks, not only the first ones.
 
 The video streams will be converted to h.264 while audio streams will enjoy the AAC codec. Every DLNA enabled TV should be able to handle these two.
 
 The `x264-preset ` used is `veryfast` which should be a good tradeoff most of the time. If you want to change this manually, use the `--x264-preset [PRESET]` option.
 
-The `--delete` and `--move` option allow post processing actions. `delete` will of course remove the source file upon successfull processing, while `move ` will add a `.old` file extension for archive purposes. This is always a good option, just to be sure.
+The `--delete` and `--move` option allow post processing actions. `delete` will of course remove the source file upon successful processing, while `move ` will add a `.old` file extension for archive purposes. This is always a good option, just to be sure.
 
-Additionally, `vollbremsung` can set the MP4 title tag to the filename via the `--title` option, in case the old file title metadata is somewhat misshampen.
+Additionally, `vollbremsung` can set the MP4 title tag to the filename via the `--title` option, in case the old file title metadata is somewhat misshapen.
 
 Per default the `m4v` file extension is used to indicate that the files contain video content. It turned out that some TVs can't handle this extension and require plain `mp4`. The `--mp4-ext` option will make `vollbremsung` create `mp4` files. You can of course rename the output files manually as well.  
 
-If you only want to know which files would match for a given target, use the `--list-only` option. No processing will be done, just the matches printed. 
-	
+If you only want to know which files would match for a given target, use the `--list-only` option. No processing will be done, just the matches printed.
+
+In order to only match a given range of file extensions, the `--match` option accepts a comma separated list of file extensions which will replace the default match scope. Thereby this can be used to extend the matching extensions in fact by just reusing the list printed from `--help` and adding extensions.
+
 ### Complete list of options
 
     -d, --delete                     Delete source files after successful encoding
         --list-only                  List matching files only. Do not run processing
+		--match ext1,ext2,ext3       Match only specific file extensions
         --mp4-ext                    Use 'mp4' as file extension instead of 'm4v'
     -m, --move                       Move source files to <FILENAME>.old after encoding
     -r, --recursive                  Process subdirectories recursively as well
@@ -41,7 +44,70 @@ If you only want to know which files would match for a given target, use the `--
         --x264-preset PRESET         Set the x264-preset. Default is: veryfast
         --version                    Show program version information
     -h, --help                       Show this message
-	
+
 ## Etymology
 
 "*vollbremsung*" means "*full application of the brake*" in german.
+
+## Changelog
+
+**0.0.21**
+
++ Added the `--match` option.
+
+**0.0.20**
+
++ Added `.webm` to the matching file extensions.
+
+**0.0.19**
+
++ Delete temporary file when mp4 title could not be changed.
+
+**0.0.18**
+
++ Fixed a bug with multiple target directories where all but the first target were not probed correctly.
+
+**0.0.17**
+
++ Added support for multiple targets.
++ Added option for `mp4` as file extension instead of `m4v`.
++ Fixed a bug which made the `PRESET` agrument of `--x264-preset` optional (and the option thereby useless).
+
+**0.0.16**
+
++ Fixed a bug when probing files with square braces in their path.
++ Fixed a bug where file names where not correctly extracted from the files path and the files extension.
+
+**0.0.14**
+
++ Fixed the bug that **0.0.13** should have fixed.
+
+**0.0.13**
+
++ Fixed a bug which did not output the correct relative path of a file based on the target path.
+
+**0.0.12**
+
++ Changed audio codec to AAC only. AC3, DTSHD, DTS and MP3 will no longer be carried on any more.
++ Changed file extension of the output files to `m4v`.
+
+**0.0.11**
+
++ Improved help message.
++ Fixed a bug where target paths ending with a / where not proved correctly.
+
+**0.0.10**
+
++ Added an option to show the program version number.
++ Added a descent help message.
+
+**0.0.9**
+
++ Added `.ogm` to the matching file extensions.
++ Added a specific handbrake gem version to the dependencies.
++ Added `--list-only` option.
++ Added `--x264-preset` option.
+
+**0.0.8**
+
++ Turned the simple ruby script to a RubyGem.

data/bin/vollbremsung

@@ -29,7 +29,10 @@ def escape_glob(s)
   s.gsub(/[\\\{\}\[\]\*\?]/) { |x| "\\"+x }
 end
 
-options = { :extension => "m4v" }
+options = {
+    :extension => "m4v",
+    :match_list => Vollbremsung::CONVERT_TYPES
+}
 
 OptionParser.new do |opts|
   opts.banner = Vollbremsung::USAGE
@@ -52,11 +55,15 @@ OptionParser.new do |opts|
   opts.on("--list-only", "List matching files only. Do not run processing") do |flag|
     options[:list_only]  = true
   end
-  
+
+  opts.on("--match ext1,ext2,ext3", String, "Match only specific file extensions") do |es|
+      options[:match_list] = es.split(',')
+  end
+
   opts.on("--mp4-ext", "Use 'mp4' as file extension instead of 'm4v'") do |flag|
     options[:extension] = "mp4"
   end
-  
+
   opts.on("-m", "--move", "Move source files to <FILENAME>.old after encoding") do |flag|
     options[:move] = true
   end
@@ -68,11 +75,11 @@ OptionParser.new do |opts|
   opts.on("-t", "--title", "Set the MP4 metadata title tag 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|
+
+  opts.on("--x264-preset PRESET", String, "Set the x264-preset. Default is: #{Vollbremsung::X264_DEFAULT_PRESET}") do |preset|
     options[:x264_preset] = preset
   end
-  
+
   opts.on("--version", "Show program version information") do
     options[:version]  = true
   end
@@ -93,7 +100,7 @@ end
 options[:x264_preset] = Vollbremsung::X264_DEFAULT_PRESET if options[:x264_preset].nil?
 
 
-if ARGV[0].nil? 
+if ARGV[0].nil?
   puts "No target provided."
   puts Vollbremsung::USAGE
   exit 1
@@ -120,7 +127,7 @@ 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"
-    
+
     File.delete 'mkmf.log' if File.exists?('mkmf.log') # find_executable seems to create such file in case executable is not found
     exit 1
   end
@@ -128,51 +135,48 @@ unless options[:list_only]
   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."
-    
+
     File.delete 'mkmf.log' if File.exists?('mkmf.log') # find_executable seems to create such file in case executable is not found
     exit 1
   end
-  
+
   File.delete 'mkmf.log' if File.exists?('mkmf.log') # find_executable seems to create such file in case executable is not found
 end
 
 
-
-
 #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"
 
 
 target_files = []
-
 scope = options[:recursive] ? "/**/*" : "/*"
 
 ARGV.each do |target|
 
   if File.directory?(target)
-    
+
     log "probing for target files in #{File.absolute_path(target) + scope}"
     log "files found:"
-  
+
     Dir[escape_glob(File.absolute_path(target)) + scope].sort.each do |file|
       unless File.directory?(file)
-        if Vollbremsung::CONVERT_TYPES.include?(File.extname(file).downcase[1..-1]) 
-          puts "* " + File.absolute_path(file)[File.absolute_path(target).length+1..-1] 
-          target_files << [file,target] # file and provided target_dir 
+        if options[:match_list].include?(File.extname(file).downcase[1..-1])
+          puts "* " + File.absolute_path(file)[File.absolute_path(target).length+1..-1]
+          target_files << [file,target] # file and provided target_dir
         end
       end
     end
-  
+
   else
     puts "* " + target
     target_files << [File.absolute_path(target),File.absolute_path(target)]
   end
-  
+
 end
 
 exit if options[:list_only]
 
 target_files.each do |infile, target_dir|
-  
+
   metadata = ffprobe(infile)
   if metadata.nil?
     log "ERROR retrieving metadata -- skipping this file"
@@ -181,38 +185,38 @@ target_files.each do |infile, target_dir|
 
   astreams = Vollbremsung::StreamDescr.new
   sstreams = Vollbremsung::StreamDescr.new
-  
+
   metadata['streams'].each do |stream|
     case stream['codec_type']
-    when 'audio'  
+    when 'audio'
       astreams.count += 1
       astreams.names << stream['tags']['title'] unless stream['tags'].nil? || stream['tags']['title'].nil?
-    when 'subtitle' 
+    when 'subtitle'
       sstreams.count += 1
       sstreams.names << stream['tags']['title'] unless stream['tags'].nil? || stream['tags']['title'].nil?
-    else 
+    else
       # this is attachment stuff, like typefonts --> ignore
     end
   end
 
-  
+
   infile_basename = File.basename(infile)
   infile_basename_noext = File.basename(infile, File.extname(infile)) # without ext
   infile_dirname = File.dirname(infile)
   infile_path_noext = File.join(infile_dirname, infile_basename_noext)
   infile_relative_path = #File.directory?(TARGET_PATH) ? infile[TARGET_PATH.length+1..-1] : File.basename(TARGET_PATH)
     if File.directory?(target_dir)
-      File.absolute_path(infile)[File.absolute_path(target_dir).length+1..-1] 
+      File.absolute_path(infile)[File.absolute_path(target_dir).length+1..-1]
     else
       File.basename(target_dir)
     end
 
   outfile = "#{infile_path_noext}.#{options[:extension]}"
-  
-  log "processing: #{infile_relative_path}" 
+
+  log "processing: #{infile_relative_path}"
 
   #%x( #{HANDBRAKE_CLI} #{HANDBRAKE_OPTIONS} --audio #{(1..astreams.count).to_a.join(',')} --aname #{astreams.names.join(',')} --subtitle #{(1..sstreams.count).to_a.join(',')} -i \"#{infile}\" -o \"#{outfile}\" 2>&1 )
-  
+
   success = false
   begin
     HandBrake::CLI.new.input(infile).encoder('x264').quality('20.0').aencoder('faac').
@@ -220,32 +224,32 @@ target_files.each do |infile, target_dir|
     audio_copy_mask('aac').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)
-    
+
     # if we make it here, encoding went well
     log "SUCCESS: encoding done"
     success = true
-  rescue 
+  rescue
     log "ERROR: Handbrake exited with an error"
   end # HandBrake::CLI
-    
+
   if success
     infile_size = File.size(infile)
     outfile_size = File.size(outfile)
 
     log "compression ratio: %.2f" % (outfile_size.to_f / infile_size.to_f)
-      
+
     if options[:title]
       log "setting MP4 title"
-    
+
       infile_noext = File.join( File.dirname(infile), File.basename(infile,File.extname(infile)))
       tmpfile = infile_noext + ".tmp.mp4"
-    
+
       %x( ffmpeg -i \"#{outfile}\" -metadata title=\"#{infile_basename_noext}\" #{Vollbremsung::FFMPEG_OPTIONS} \"#{tmpfile}\" 2>&1 )
-    
+
       if $?.exitstatus == 0
         begin
           File.delete outfile
-          File.rename tmpfile, outfile 
+          File.rename tmpfile, outfile
         rescue
           log "ERROR: moving #{tmpfile} to #{outfile}"
         end
@@ -254,7 +258,7 @@ target_files.each do |infile, target_dir|
         File.delete tmpfile
       end
     end # if options[:title]
-    
+
     if options[:move]
       log "moving source file to *.old"
       File.rename(infile, "#{infile}.old") rescue log "ERROR: renaming source file"
@@ -262,7 +266,7 @@ target_files.each do |infile, target_dir|
       log "deleting source file"
       File.delete(infile) rescue log "ERROR: deleting source file"
     end
-    
+
   end # if success
 end # target_files.each
 

data/lib/vollbremsung.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vollbremsung
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Maximilian Irro