dvdvrconv 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74bc4490abb3e80d289162b91a05912e2075421531f888205f10051a7930c22d
-  data.tar.gz: fa54458ff8f4bb490aaaaa0bb87e5690831b28ed198ef1538df385d51528323c
+  metadata.gz: c5f0218e853e4af5210eb7b85aeba67f2cd8dc5a42485488034f44bb76677bb7
+  data.tar.gz: ba57fbddc4615b81228f2d4f22ffb86f849c343ef6d18d8c7184a66e7baf566c
 SHA512:
-  metadata.gz: 94ae2207fdf720be7625ba638c2a1a800f43ece291a0129fec40acb7746c1a8619cf438909aba2c67f8d81d4cc7bbfc60071c6e075131d72c71b4b9e4ab29b38
-  data.tar.gz: 0fbe5892000ca58a9a977d9637cd03ad3ce6106424027c6e54397142ddf3b3ab917e5102b3ef221d5b4d1aa3c1681ad77f9ab415c688f31e05cedde5fdc99eaf
+  metadata.gz: 126e3d8909f423585538bdc2daee2e01b5d664cb15d3ee756fbf312580ba725b8808a71ec00d30f8814bccb132930d20d0652b5503676ede2e443d3160d4415b
+  data.tar.gz: 6c4295f3f3aa90db8e67b36448dbaa99caf84bcf21c1c1719484aa56d0276cf402235be237bcaa8e87f2441f021c6e6db8b6589323c4ef351d4f0a013446eac7

data/lib/dvdvrconv/command.rb

@@ -62,6 +62,12 @@ module Dvdvrconv
         dvd.vrdisc.hardware_encode = @options[:hardware_encode]
       end
 
+      if @options[:global_quality].nil?
+        dvd.vrdisc.global_quality = Dvdvrconv::DEFAULT_GLOBAL_QUALITY
+      else
+        dvd.vrdisc.global_quality = @options[:global_quality]
+      end
+
       # View the path of each files
       puts '== Use these paths =='
       puts "  => VR_MANGR.IFO:        #{dvd.vrdisc.opts_ifo}"
@@ -73,6 +79,7 @@ module Dvdvrconv
       puts "  => number_list:         #{@options[:number_list]}"
       puts "  => concat_mode:         #{@options[:concat_mode]}"
       puts "  => hardware_encode:     #{@options[:hardware_encode]}"
+      puts "  => global_quality:      #{@options[:global_quality]}"
 
       dvd.read_info
 
@@ -182,6 +189,12 @@ module Dvdvrconv
       else
         @options[:hardware_encode] = config['hardware_encode']
       end
+
+      if config['global_quality'].nil?
+        @options[:global_quality] = Dvdvrconv::DEFAULT_GLOBAL_QUALITY
+      else
+        @options[:global_quality] = config['global_quality']
+      end
     end
 
     def dvdpath

data/lib/dvdvrconv/dvdvr.rb

@@ -19,13 +19,15 @@ module Dvdvrconv
     :default_opts_vro,  # @param [String]
     :default_cmd,       # @param [String]
     :concat_mode,       # @param [Boolean]
-    :hardware_encode    # @param [String]
+    :hardware_encode,   # @param [String]
+    :global_quality     # @param [Integer]
   )
 
   BASE_NAME = 'DVD'
   DEFAULT_CONFIG_FILE = 'default_dvdvrconv.yml'
   DEFAULT_CONCAT_MODE = true
   DEFAULT_HARDWARE_ENCODE = 'normal'
+  DEFAULT_GLOBAL_QUALITY = 25
 
   # Default DVD drive is "d".
   # If you want to use a different drive, you need to set up a "default_dvdvrconv.yml" file.
@@ -57,31 +59,24 @@ module Dvdvrconv
       @vrdisc.default_cmd = @vrdisc.cmd
       @vrdisc.concat_mode = Dvdvrconv::DEFAULT_CONCAT_MODE
       @vrdisc.hardware_encode = Dvdvrconv::DEFAULT_HARDWARE_ENCODE
+      @vrdisc.global_quality = Dvdvrconv::DEFAULT_GLOBAL_QUALITY
     end
 
     # Read VRO file from dvd-ram disc in dvd-vr format, and output vob files.
     def str_dvdvr_cmd
-      %(#{@vrdisc.cmd} --name=#{Dvdvrconv::BASE_NAME} #{@vrdisc.opts_ifo} #{@vrdisc.opts_vro})
+      Shellwords.shellsplit(%("#{@vrdisc.cmd}" --name="#{Dvdvrconv::BASE_NAME}" "#{@vrdisc.opts_ifo}" "#{@vrdisc.opts_vro}"))
     end
 
     # Make a concatenation command string for FFmpeg.
     def str_concat_cmd(file_name, base_name)
-      %(ffmpeg -f concat -safe 0 -i #{file_name} -c copy #{base_name}.vob)
+      Shellwords.shellsplit(%(ffmpeg -f concat -safe 0 -i "#{file_name}" -c copy "#{base_name}.vob"))
     end
 
     # File convert command, vob to mp4 for FFmpeg.
     # * Change the aspect ratio to 16:9.
     # * Delete a closed caption.
     def ffmeg_normal_cmd(file_name)
-      cmd = 'ffmpeg '
-      cmd += "-i #{file_name}.vob "
-      cmd += '-filter:v "crop=704:474:0:0" '
-      cmd += '-vcodec libx264 '
-      cmd += '-b:v 500k '
-      cmd += '-aspect 16:9 '
-      cmd += '-acodec copy '
-      cmd += '-bsf:v "filter_units=remove_types=6" '
-      cmd + "#{file_name}.mp4"
+      Shellwords.shellsplit(%(ffmpeg -i "#{file_name}.vob" -filter:v "crop=704:474:0:0" -vcodec libx264 -b:v 500k -aspect 16:9 -acodec copy -bsf:v "filter_units=remove_types=6" "#{file_name}.mp4"))
     end
 
     # File convert command, vob to mp4 for FFmpeg.
@@ -89,18 +84,7 @@ module Dvdvrconv
     # * Change the aspect ratio to 16:9.
     # * Delete a closed caption.
     def ffmpeg_qsv_cmd(file_name)
-      cmd = 'ffmpeg '
-      cmd += '-hwaccel qsv '
-      cmd += '-hwaccel_output_format qsv '
-      cmd += "-i #{file_name}.vob "
-      cmd += '-filter:v "crop=704:474:0:0" '
-      cmd += '-c:v h264_qsv '
-      cmd += '-global_quality:v 35 '
-      cmd += '-look_ahead 1 '
-      cmd += '-aspect 16:9 '
-      cmd += '-acodec copy '
-      cmd += '-bsf:v "filter_units=remove_types=6" '
-      cmd + "#{file_name}.mp4"
+      Shellwords.shellsplit(%(ffmpeg  -hwaccel qsv -hwaccel_output_format qsv -i "#{file_name}.vob" -filter:v "crop=704:474:0:0" -c:v h264_qsv -global_quality "#{@vrdisc.global_quality}" -look_ahead 1 -aspect 16:9 -acodec copy -bsf:v "filter_units=remove_types=6" "#{file_name}.mp4"))
     end
 
     # File convert command, vob to mp4 for FFmpeg.
@@ -151,7 +135,7 @@ module Dvdvrconv
       puts @vrdisc.header
       [@vrdisc.num, @vrdisc.title, @vrdisc.date, @vrdisc.size].transpose.each do |x|
         %w[num title date size].each_with_index do |item, idx|
-          line = format('%-5s', item) + ": #{x.flatten[idx].to_s}\n"
+          line = format('%-5s', item) + ": #{x.flatten[idx]}\n"
           puts line
         end
         puts '-'
@@ -202,8 +186,8 @@ module Dvdvrconv
     def vro2vob
       cmd = str_dvdvr_cmd
       puts '----- convert file VRO to VOB -----'
-      puts "> cmd:\n  #{cmd}"
-      system(cmd)
+      puts "> cmd:\n  #{cmd.join(' ')}"
+      system(*cmd)
       puts ''
     end
 
@@ -326,7 +310,10 @@ module Dvdvrconv
         file_name = "concat_#{base_name}.txt"
 
         names = @vrdisc.output_title.select { |x| x.match(/#{base_name}_\d\d/) }
-        names.each { |line| contents += "file '#{line}.vob'\n" }
+        names.each do |line|
+          escaped_line = "#{line}.vob".gsub("'") {"'\\''"}
+          contents += "file '#{escaped_line}'\n"
+        end
         concat_list << [file_name, contents, base_name]
       end
 
@@ -356,8 +343,8 @@ module Dvdvrconv
 
         cmd = str_concat_cmd(file_name, base_name)
         puts '----- concat vob files -----'
-        puts "run cmd:\n  #{cmd}"
-        system(cmd)
+        puts "run cmd:\n  #{cmd.join(' ')}"
+        system(*cmd)
 
         begin
           File.delete(file_name)
@@ -369,7 +356,7 @@ module Dvdvrconv
 
     def vrdisc_status
       puts "\n< < < < < @vrdisc status > > > > >"
-      %w[num title output_title duplicate_name vob_titles concat_mode hardware_encode].each do |item|
+      %w[num title output_title duplicate_name vob_titles concat_mode hardware_encode global_quality].each do |item|
         puts "#{item}=> #{@vrdisc[item]}"
       end
       puts "< < < < < @vrdisc status > > > > >\n"
@@ -393,8 +380,8 @@ module Dvdvrconv
         else
           cmd = str_convert_cmd(file_name)
           puts "----- convert #{file_name}.vob to mp4 file -----"
-          puts "run cmd:\n  #{cmd}"
-          system(cmd)
+          puts "run cmd:\n  #{cmd.join(' ')}"
+          system(*cmd)
         end
       end
     end

data/lib/dvdvrconv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dvdvrconv
-  VERSION = '1.3.0'
+  VERSION = '1.3.2'
 end

data/lib/dvdvrconv.rb

@@ -3,6 +3,7 @@
 require 'open3'
 require 'optparse'
 require 'yaml'
+require 'shellwords'
 
 require_relative 'dvdvrconv/command'
 require_relative 'dvdvrconv/options'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dvdvrconv
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - icm7216
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 4.0.15
 specification_version: 4
 summary: DVD-VR utility
 test_files: []