vollbremsung 0.0.21 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzVmYjQzOGM0N2ZhOGM3MzJhOTRkNzAzNjg4MmQ5ZjE2N2U0YzlmNw==
-  data.tar.gz: !binary |-
-    Y2VmZDhmYmVmYTU3YTgwZDFmNDYxM2FiZTk4ZGZkMzNlMjExNjQxYg==
+SHA256:
+  metadata.gz: 595920e5ff20374b33dde46862c3f4471f2a235d824210cf4f4f589e467c2d77
+  data.tar.gz: ea371f735bf0436f77639c9c15ad732417d5e2fd6f16cb03d569475d329ad8da
 SHA512:
-  metadata.gz: !binary |-
-    NWY0MGM2MTE3MTJmNDg2MTgyOTA1ZWIyOTEyYmFiYzcwNmZlNzRhMTVkMjU4
-    ZDU0ZWI2MWE2ZTM0ZGJmOWRjNGIyZDUzMDhiM2VlMjI3NjU5ZTNhNGNlOTBm
-    MDBlMjU1MDc5YWYzYzRhNjJlZmJhYWM2ODFiNDI0MGYwZWI4MWU=
-  data.tar.gz: !binary |-
-    YmE4ZDdhZThkYTJlMjZlNDQ4NWNhZjI5NzliYzliNzM2MDYzZDAxMzI4ZTNk
-    ZGFhYjhjNzI0MGI1NTVjOWI2NDYzNmE1NzAxYmFmMDFhZTZhZTQxZDNjNDdj
-    MjJkYWZjYzFkNDE0ZmQ1NDg2MmFjYmM3MDg0NDE2OGZkZGFhMjY=
+  metadata.gz: bb67f20d7c6bc9c84ce3b8b7356850a5be5a0ffe6d07f676045fb2bc8a2c21bf5241b841a91c056c296c23ec0ac4aad8cc02a868335ef045b337c2cc436a7cc0
+  data.tar.gz: 88b6a687a1f5822fc298e89f5cf6f7570dd0ed99d20f4ebbbc63959b6dffddb75a8f70ec1fa2ca3776fa6a2f207f691ad8727e9671d71ecc3c156c9b87e2b1ad

data/.gitignore

@@ -1,6 +1,10 @@
 *.gem
 *.rbc
 /.config
+/.bundle/
+/.yardoc
+/Gemfile.lock
+/_yardoc/
 /coverage/
 /InstalledFiles
 /pkg/
@@ -32,3 +36,6 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# rspec failure tracking
+.rspec_status

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/.travis.yml

@@ -0,0 +1,5 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.4.1
+before_install: gem install bundler -v 1.15.1

data/CHANGELOG.md

@@ -0,0 +1,72 @@
+# Changelog
+
+**1.0.0**
+
++ Total refactoring of the codebase, new project structure
++ Support for transcoding to HEVC with the `--x265` flag
++ Support for passing quality value to Handbrake, with the `-q` option
+
+**0.0.21**
+
++ Added the `--match` option.
+
+**0.0.20**
+
++ Added `webm` to the matching file extensions.
+
+**0.0.19**
+
++ Fixed a bug where temporary files were not deleted when their 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` argument 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.15**
+
++ Fixed another case of the bug of **0.0.13**.
+
+**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 audio streams will no longer be passed through 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/{LICENSE → LICENSE.txt}

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2015 Maximilian Irro
+Copyright (c) 2014-2018 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

data/README.md

@@ -2,7 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/vollbremsung.svg)](http://badge.fury.io/rb/vollbremsung)
 
-`vollbremsung` is a [Handbrake](https://handbrake.fr) bulk encoding tool, desigend to reencode a file structure to a DLNA enabled TV compatible format comfortably.
+`vollbremsung` is a [Handbrake](https://handbrake.fr) bulk encoding tool, designed to reencode a file structure to a DLNA enabled TV compatible format comfortably.
 
 ## Installation
 
@@ -16,7 +16,7 @@ You need to have `ffmpeg`, `ffprobe` and `HandbrakeCLI` (on FreeBSD it's `HandBr
 
 	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 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.
+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.
 
@@ -36,12 +36,14 @@ In order to only match a given range of file extensions, the `--match` option ac
 
     -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
+        --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
+    -q, --quality VALUE              Set quality value to use (default is: 22)
     -r, --recursive                  Process subdirectories recursively as well
     -t, --title                      Set the MP4 metadata title tag to the filename
-        --x264-preset PRESET         Set the x264-preset. Default is: veryfast
+        --preset PRESET              Set the x264/x265 preset. Default is: veryfast
+        --x265                       Use x265 encoder for HEVC conversion
         --version                    Show program version information
     -h, --help                       Show this message
 
@@ -51,63 +53,4 @@ In order to only match a given range of file extensions, the `--match` option ac
 
 ## 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.
+see [CHANGELOG.md](CHANGELOG.md)

data/Rakefile

@@ -1,4 +1,6 @@
-task :pushall do
-  sh 'git push --all bitbucket'
-  sh 'git push --all github'
-end
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "vollbremsung"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/bin/vollbremsung

@@ -5,33 +5,11 @@ require 'mkmf' # part of stdlib
 require 'open3'
 require 'json'
 require 'optparse'
-require 'handbrake'
 require 'vollbremsung'
 
-def log(msg)
-  puts Time.new.strftime("%Y-%m-%d %H:%M:%S") +  " #{msg}"
-end
-
-def ffprobe(file)
-  stdout,stderr,status = Open3.capture3("ffprobe -v quiet -print_format json -show_format -show_streams \"#{file}\"")
-  if status.success?
-    return JSON.parse(stdout)
-  else
-    STDERR.puts stderr
-    return nil
-  end
-end
-
-# square brackets have a special meaning in the context of shell globbing
-# --> escape them in order to find files in directories with [, ], {, }
-# symbols in their path
-def escape_glob(s)
-  s.gsub(/[\\\{\}\[\]\*\?]/) { |x| "\\"+x }
-end
-
 options = {
     :extension => "m4v",
-    :match_list => Vollbremsung::CONVERT_TYPES
+    :match_extensions => Vollbremsung::CONVERT_TYPES
 }
 
 OptionParser.new do |opts|
@@ -57,7 +35,7 @@ OptionParser.new do |opts|
   end
 
   opts.on("--match ext1,ext2,ext3", String, "Match only specific file extensions") do |es|
-      options[:match_list] = es.split(',')
+      options[:match_extensions] = es.split(',')
   end
 
   opts.on("--mp4-ext", "Use 'mp4' as file extension instead of 'm4v'") do |flag|
@@ -68,6 +46,16 @@ OptionParser.new do |opts|
     options[:move] = true
   end
 
+  opts.on("-q", "--quality VALUE", "Set quality value to use (default is: #{Vollbremsung::DEFAULT_QUALITY})") do |quality|
+    # TODO check if quality is an integer value in the range of acceptable values
+    begin
+      options[:quality] = quality.to_i
+    rescue
+      puts "Not a numer provided for option --quality value: #{quality}"
+      exit 6
+    end
+  end
+
   opts.on("-r", "--recursive", "Process subdirectories recursively as well") do |flag|
     options[:recursive] = true
   end
@@ -76,8 +64,12 @@ OptionParser.new do |opts|
     options[:title] = true
   end
 
-  opts.on("--x264-preset PRESET", String, "Set the x264-preset. Default is: #{Vollbremsung::X264_DEFAULT_PRESET}") do |preset|
-    options[:x264_preset] = preset
+  opts.on("--preset PRESET", String, "Set the x264/x265 preset. Default is: #{Vollbremsung::DEFAULT_PRESET}") do |preset|
+    options[:preset] = preset
+  end
+
+  opts.on("--x265", "Use x265 encoder for HEVC conversion") do |flag|
+    options[:encoder] = "x265".freeze
   end
 
   opts.on("--version", "Show program version information") do
@@ -96,8 +88,10 @@ if options[:version]
   exit
 end
 
-
-options[:x264_preset] = Vollbremsung::X264_DEFAULT_PRESET if options[:x264_preset].nil?
+# TODO move this to the top to the options[] init
+options[:encoder] = Vollbremsung::DEFAULT_QUALITY if options[:encoder].nil?
+options[:quality] = Vollbremsung::DEFAULT_QUALITY if options[:quality].nil?
+options[:preset] = Vollbremsung::DEFAULT_PRESET if options[:preset].nil?
 
 
 if ARGV[0].nil?
@@ -111,14 +105,14 @@ end
 ARGV.each do |target|
   unless File.exists?(target)
     puts "The target #{target} does not exist."
-    exit 1
+    exit 2
   end
 end
 
 if options[:move] && options[:delete]
   puts "--delete (-d) and --move (-m) are mutually exclusive - choose one!"
   puts "It is not possible to delete and move the source files at the same time."
-  exit 1
+  exit 3
 end
 
 # probe for required executable
@@ -129,7 +123,7 @@ unless options[:list_only]
     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
+    exit 4
   end
 
   unless find_executable 'ffprobe'
@@ -137,141 +131,10 @@ unless options[:list_only]
     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
+    exit 5
   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 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"
-    next
-  end
-
-  astreams = Vollbremsung::StreamDescr.new
-  sstreams = Vollbremsung::StreamDescr.new
-
-  metadata['streams'].each do |stream|
-    case stream['codec_type']
-    when 'audio'
-      astreams.count += 1
-      astreams.names << stream['tags']['title'] unless stream['tags'].nil? || stream['tags']['title'].nil?
-    when 'subtitle'
-      sstreams.count += 1
-      sstreams.names << stream['tags']['title'] unless stream['tags'].nil? || stream['tags']['title'].nil?
-    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]
-    else
-      File.basename(target_dir)
-    end
-
-  outfile = "#{infile_path_noext}.#{options[:extension]}"
-
-  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').
-    ab('160').mixdown('dpl2').arate('Auto').drc('0.0').format('mp4').markers.
-    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
-    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
-        rescue
-          log "ERROR: moving #{tmpfile} to #{outfile}"
-        end
-      else
-        log "ERROR: MP4 title could not be changed"
-        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"
-    elsif options[:delete]
-      log "deleting source file"
-      File.delete(infile) rescue log "ERROR: deleting source file"
-    end
-
-  end # if success
-end # target_files.each
-
-if target_files.empty?
-  log "nothing to do"
-else
-  log "all items processed"
-end
+Vollbremsung.process(ARGV,options)

data/lib/vollbremsung.rb

@@ -1,10 +1,22 @@
+require "vollbremsung/version"
+require 'logger'
+
 module Vollbremsung
 
-  USAGE   = "Usage: vollbremsung [options] target [target [...]]"
-  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
+  USAGE               = "Usage: vollbremsung [options] target [target [...]]"
+  CONVERT_TYPES       = ['avi','flv','mkv','mpg','mov','ogm','webm','wmv']
+  FFMPEG_OPTIONS      = "-map 0 -acodec copy -vcodec copy -scodec copy"
+  FFPROBE_OPTIONS     = "-v quiet -print_format json -show_format -show_streams"
+  DEFAULT_ENCODER     = "x264".freeze
+  DEFAULT_PRESET      = "veryfast".freeze
+  DEFAULT_QUALITY     = 22
+
+  case RUBY_PLATFORM
+  when /darwin/ then 
+    HANDBRAKE_CLI = "HandBrakeCLI".freeze
+  else 
+    HANDBRAKE_CLI = "HandbrakeCLI".freeze
+  end
 
   class StreamDescr < Struct.new(:count,:names)
     def initialize
@@ -12,4 +24,223 @@ module Vollbremsung
     end
   end
 
-end
+  class Brake
+
+    def initialize
+      @logger = Logger.new STDOUT
+      @logger.level = Logger::INFO
+      #@logger.datetime_format = '%Y-%m-%d %H:%M:%S '
+      @logger.formatter = proc do |severity, datetime, progname, msg|
+        date_format = datetime.strftime("%Y-%m-%d %H:%M:%S")
+        if severity == "INFO" or severity == "WARN"
+            "[#{date_format}] #{severity}  : #{msg}\n"
+        else        
+            "[#{date_format}] #{severity} : #{msg}\n"
+        end
+      end # proc do
+    end # def initialize
+
+    # square brackets have a special meaning in the context of shell globbing
+    # --> escape them in order to find files in directories with [, ], {, }
+    # symbols in their path
+    private
+    def escape_glob(s)
+      s.gsub(/[\\\{\}\[\]\*\?]/) { |x| "\\"+x }
+    end
+
+    private
+    def ffprobe(file)
+      stdout,stderr,status = Open3.capture3("ffprobe #{Vollbremsung::FFPROBE_OPTIONS} \"#{file}\"")
+      if status.success?
+        return JSON.parse(stdout)
+      else
+        STDERR.puts stderr
+        return nil
+      end
+    end # def ffprobe
+
+    private
+    def match_files(targets, match_extensions, recursive)
+      scope = recursive ? "/**/*" : "/*"
+      matches = []
+      targets.each do |target|
+
+        if File.directory?(target)
+
+          @logger.info "probing for target files in #{File.absolute_path(target) + scope}"
+          @logger.info "files found:"
+
+          Dir[escape_glob(File.absolute_path(target)) + scope].sort.each do |file|
+            unless File.directory?(file)
+              if match_extensions.include?(File.extname(file).downcase[1..-1])
+                puts "* " + File.absolute_path(file)[File.absolute_path(target).length+1..-1]
+                matches << [file,target] # file and provided target_dir
+              end
+            end
+          end
+
+        else
+          puts "* " + target
+          matches << [File.absolute_path(target),File.absolute_path(target)]
+        end
+
+      end
+
+      return matches
+    end # def match_files
+
+    private
+    def parse_metadata(metadata)
+      astreams = Vollbremsung::StreamDescr.new
+      sstreams = Vollbremsung::StreamDescr.new
+
+      metadata['streams'].each do |stream|
+        case stream['codec_type']
+        when 'audio'
+          astreams.count += 1
+          astreams.names << stream['tags']['title'] unless stream['tags'].nil? || stream['tags']['title'].nil?
+        when 'subtitle'
+          sstreams.count += 1
+          sstreams.names << stream['tags']['title'] unless stream['tags'].nil? || stream['tags']['title'].nil?
+        else
+          # this is attachment stuff, like typefonts --> ignore
+        end
+      end
+
+      return astreams, sstreams
+    end # def parse_metadata
+
+    private
+    def full_outpath(infile, target_dir, extension)
+      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]
+        else
+          File.basename(target_dir)
+        end
+
+      outfile = "#{infile_path_noext}.#{extension}"
+
+      return outfile, infile_relative_path
+    end # def full_outpath
+
+    private
+    def run_handbrake(infile, outfile, astreams, sstreams, options)
+
+      handbrake_cmd = 
+        %{ #{HANDBRAKE_CLI} \
+          --encoder #{options[:encoder]} \
+          --encoder-preset #{options[:preset]} \
+          --quality #{options[:quality]} \
+          --aencoder faac \
+          --audio-copy-mask aac \
+          --audio-fallback ffac3 \
+          --loose-anamorphic --modulus 2 \
+          --audio #{(1..astreams.count).to_a.join(',')} \
+          --aname #{astreams.names.join(',')} \
+          --subtitle #{(1..sstreams.count).to_a.join(',')} \
+          -i \"#{infile}\" -o \"#{outfile}\" 2>&1 
+        }
+      #@logger.info "running handbrake cmd: #{handbrake_cmd}"
+      %x( #{handbrake_cmd} )
+
+      if $?.exitstatus == 0
+        @logger.info "encoding done"
+        return true
+      else
+        @logger.error "Handbrake exited with error code #{$?.exitstatus}"
+        return false
+      end 
+    end # def run_handbrake
+
+    private
+    def write_mp4_title(infile, outfile)
+
+      @logger.info "setting MP4 title"
+
+      infile_noext = File.join( File.dirname(infile), File.basename(infile,File.extname(infile)))
+      tmpfile = infile_noext + ".tmp.mp4"
+
+      # TODO check if ffmpeg does exists (should if ffprobe is availabe, but just to make sure)
+
+      %x( ffmpeg -i \"#{outfile}\" -metadata title=\"#{infile_basename_noext}\" #{Vollbremsung::FFMPEG_OPTIONS} \"#{tmpfile}\" 2>&1 )
+
+      # if successful, either delete old file and replace with new, or delete the broken tempfile if it exists
+      if $?.exitstatus == 0
+        begin
+          File.delete outfile
+          File.rename tmpfile, outfile
+        rescue
+          @logger.error "moving #{tmpfile} to #{outfile}"
+        end
+      else
+        @logger.error "MP4 title could not be changed"
+        File.delete tmpfile
+      end
+    end # def write_mp4_title    
+
+    public
+    def process(targets, options)
+
+      matches = match_files(ARGV, options[:match_extensions], options[:recursive])
+
+      if options[:list_only]
+        exit 0
+      end
+
+      if matches.empty?
+        @logger.info "no files found to process"
+        exit 0
+      else
+
+        matches.each do |infile, target_dir|
+
+          metadata = ffprobe(infile)
+          if metadata.nil?
+            @logger.error "could not retrieve metadata -- skipping file"
+            next
+          end
+
+          astreams, sstreams = parse_metadata(metadata)
+          outfile, infile_relative_path = full_outpath(infile, target_dir, options[:extension])
+
+          @logger.info "processing: #{infile_relative_path}"
+
+          success = run_handbrake(infile, outfile, astreams, sstreams, options)
+
+          if success
+            @logger.info "compression ratio: %.2f" % (File.size(outfile).to_f / File.size(infile).to_f)
+
+            if options[:title]
+              write_mp4_title(infile, outfile)
+            end # if options[:title]
+
+            if options[:move]
+              @logger.info "moving source file to *.old"
+              File.rename(infile, "#{infile}.old") rescue @logger.error "could not rename source file"
+            elsif options[:delete]
+              @logger.info "deleting source file"
+              File.delete(infile) rescue @logger.error "could not delete source file"
+            end
+
+          end # if success
+        end # target_files.each
+
+        @logger.info "🚗  finally came to a halt"
+      end # items.empty?
+    end # def process
+  end # class Brake
+
+  def process(targets, options)
+
+    brake = Vollbremsung::Brake.new
+    brake.process(targets, options)
+
+  end # def process
+  module_function :process
+
+end # module Vollbremsung

data/lib/vollbremsung/version.rb

@@ -0,0 +1,3 @@
+module Vollbremsung
+  VERSION = "1.0.0"
+end

data/vollbremsung.gemspec

@@ -1,24 +1,34 @@
 # encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vollbremsung'
+require 'vollbremsung/version'
 
 Gem::Specification.new do |spec|
-  spec.name        = 'vollbremsung'
-  spec.version     = Vollbremsung::VERSION
-  spec.date        = '2014-09-21'
-  spec.summary     = "Handbrake bulk encoding tool"
-  spec.description = "vollbremsung is a Handbrake bulk encoding tool, desigend to reencode a file structure to a DLNA enabled TV compatible format comfortably."
-  spec.author      = "Maximilian Irro"
-  spec.email       = 'max@disposia.org'
-  spec.files       = `git ls-files -z`.split("\x0")
-  spec.executables = ['vollbremsung']
-  spec.homepage    = 'https://github.com/mpgirro/vollbremsung'
-  spec.license     = 'MIT'
-  
-  spec.require_paths = ['lib']
-  
-  spec.required_ruby_version = '>= 1.9.3'
-  spec.add_dependency 'handbrake', '~> 0.4'
-  
-end
+  spec.name          = "vollbremsung"
+  spec.version       = Vollbremsung::VERSION
+  spec.platform      = Gem::Platform::RUBY
+  spec.date          = "2018-02-25"
+  spec.author        = "Maximilian Irro"
+  spec.email         = "max@irro.at"
+
+  spec.summary       = "Handbrake bulk encoding tool"
+  spec.description   = "vollbremsung is a Handbrake bulk encoding tool, designed to re-encode a file structure to a DLNA enabled TV compatible format comfortably."
+  spec.homepage      = "https://github.com/mpgirro/vollbremsung"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.executables   = ["vollbremsung"]
+  spec.require_paths = ["lib"]
+
+  spec.required_ruby_version = ">= 2.0.0"
+  spec.add_dependency "logger"
+
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+
+  spec.post_install_message = "🚗 Ready to pull the brake!"
+
+end

metadata

@@ -1,66 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: vollbremsung
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 1.0.0
 platform: ruby
 authors:
 - Maximilian Irro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2018-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: handbrake
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
-description: vollbremsung is a Handbrake bulk encoding tool, desigend to reencode
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: vollbremsung is a Handbrake bulk encoding tool, designed to re-encode
   a file structure to a DLNA enabled TV compatible format comfortably.
-email: max@disposia.org
+email: max@irro.at
 executables:
 - vollbremsung
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
+- _config.yml
+- bin/console
+- bin/setup
 - bin/vollbremsung
 - lib/vollbremsung.rb
+- lib/vollbremsung/version.rb
 - vollbremsung.gemspec
 homepage: https://github.com/mpgirro/vollbremsung
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "\U0001F697 Ready to pull the brake!"
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Handbrake bulk encoding tool