dvdvrconv 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bf1dfd9c27d75f1664127479eaf4480b30a2a9647c0552af036b05a95fe557d
-  data.tar.gz: 5ef2ab78adcdf97048764088ec49905d3cfac14ff7dadf1ece60c66bf54860a4
+  metadata.gz: 60c712bd8767cdb73ae5d0049e5f5a82dde6ca4e8e82ec53747f2a772db5ffed
+  data.tar.gz: 72d7400f331b064ddb1530427c8c7257736223c6c38b3872ea0c46f708b36363
 SHA512:
-  metadata.gz: 1a1de9101fb6bb101ed1190b854bde53442541a2b4eae24d4de663bc73fcf7ef3debc2c1df547d569968fcf1ba9093b1a4e23acbb5cccc52913dfe716220f953
-  data.tar.gz: e065e1429ce5b36b30c0247ee1d56409b804f36f52255b593303389bf896da5c5093c826e3ad70ed3aedb47c95ff6587c74e00bf4e27ec3819fbc0369be0987f
+  metadata.gz: 22c9af9efb48ef68efd27cf859fc7243a6ec8e7817df89f18d6dc3e05d1bbcc7ad5cdba103e55027af491dbbb9bc2e1f6208eff798bd64b159ed76864478e98a
+  data.tar.gz: 6e4735ab98426feea6d4fcd3b3862742e4688322e56af7b2dc2dbd49ac0383fdd413ea522dcd04da50f2dcf23279043020f48bdd03c97c512daccd364d05bb01

data/README.md

@@ -6,12 +6,12 @@ dvdvrconv is also a wrapper for [pixelb/dvd-vr](https://github.com/pixelb/dvd-vr
 
 For Windows users, I attached `dvd-vr.exe` for cygwin environment.
 
-## dependent libraries
+# dependent libraries
 
 *  [dvd-vr](https://github.com/pixelb/dvd-vr/)
 *  [FFmpeg](https://www.ffmpeg.org/)
 
-## Installation
+# Installation
 
 Add this line to your application's Gemfile:
 
@@ -29,7 +29,7 @@ $ gem install dvdvrconv
 ```
 
 
-## Usage
+# Usage
 
 View video information from dvd-ram disc in dvd-vr format.
 
@@ -75,7 +75,6 @@ Execute the VRO file to mp4 conversion.
 Command options
 ```
 >dvdvrconv -h
-[ dvd_vr_cmd ] does not exist in default_dvdvrconv.yml file.
 Usage: dvdvrconv [options]
     -v, --version                    Show version
     -i, --info                       Show file information
@@ -83,7 +82,7 @@ Usage: dvdvrconv [options]
     -e, --exec                       Execute the VRO file to mp4 conversion.
 ```
 
-### Configure dvdvrconv
+# Configure dvdvrconv
 
 dvdvrconv reads `default_dvdvrconv.yml` in the current working directory as dvdvrconv's configuration file. It can contain the following settings:
 
@@ -94,7 +93,7 @@ dvdvrconv reads `default_dvdvrconv.yml` in the current working directory as dvdv
 *  base_dst_name
 *  number_list
 
-#### vr_mangr_ifo, vr_movie_vro
+## vr_mangr_ifo, vr_movie_vro
 
 `vr_mangr_ifo` and `vr_movie_vro` specify the path to the dvd-ram disc.
 Drive D is assumed, if different you need to write its path.
@@ -111,14 +110,14 @@ vr_mangr_ifo: "/mnt/d/DVD_RTAV/VR_MANGR.IFO"
 vr_movie_vro: "/mnt/d/DVD_RTAV/VR_MOVIE.VRO"
 ```
 
-#### dvd_vr_cmd
+## dvd_vr_cmd
 
 On Windows, you can use the included dvd-vr command.
 
 On WSL(ubuntu), you can use the dvd-vr command that you have compiled yourself.
 *  See the section below, "install dependent libraries for WSL(ubuntu)"
 
-#### use_customize_title, base_dst_name, number_list
+## use_customize_title, base_dst_name, number_list
 
 customize the title name of vob files.
 
@@ -157,10 +156,31 @@ base_dst_name: []
 number_list: []
 ```
 
+## concat mode
 
-## Install dependent libraries for WSL(ubuntu)
+Allow users to choose to concatenate or not concatenate titles with the same name.
 
-### dvd-vr
+When editing a title on a dvd-vr recorder (e.g., partial cut editing.), the title is split into multiple files.
+
+Enabling "concat_mode" allows you to concatenate multiple split files into one.
+
+If this option is not specified, the default setting is to concatenate titles of the same name.
+```
+concat_mode: true
+```
+
+On the other hand, you may not want to concatenate multiple titles with the same name on a dvd-vr disc.
+In this case, "concat_mode" can be disabled.
+```
+concat_mode: false
+```
+
+
+
+
+# Install dependent libraries for WSL(ubuntu)
+
+## dvd-vr
 
 *  [pixelb/dvd-vr](https://github.com/pixelb/dvd-vr/)
 
@@ -200,15 +220,15 @@ extracted to the current directory or to stdout.
 ```
 
 
-### FFmpeg
+## FFmpeg
 
 ```
 sudo apt install ffmpeg
 ```
 
-## Install dependent libraries for Windows
+# Install dependent libraries for Windows
 
-### dvd-vr
+## dvd-vr
 
 Compile dvd-vr command in Cygwin environment.
 
@@ -260,7 +280,7 @@ After compile success, you will get the following files.
 *  cygiconv-2.dll (c:\cygwin64\bin)
 
 
-### FFmpeg
+## FFmpeg
 
 *  [FFmpeg](https://www.ffmpeg.org/download.html)
 From the Windows EXE Files link above, select the following website.
@@ -270,7 +290,7 @@ As an example, download Auto-Build 2021-09-28 12:22.
 *  [ffmpeg-N-103899-g855014ff83-win64-gpl.zip 100MB](https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2021-09-28-12-22/ffmpeg-N-103899-g855014ff83-win64-gpl.zip)
 
 
-## Development
+# Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
@@ -278,7 +298,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 
 
-## License
+# License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 

data/lib/dvdvrconv/command.rb

@@ -48,6 +48,12 @@ module Dvdvrconv
         dvd.vrdisc.cmd = @options[:dvd_vr_cmd] if @options[:dvd_vr_cmd]
       end
 
+      if @options[:concat_mode].nil?
+        dvd.vrdisc.concat_mode = Dvdvrconv::DEFAULT_CONCAT_MODE
+      else
+        dvd.vrdisc.concat_mode = @options[:concat_mode]
+      end
+
       # View the path of each files
       puts "== Use these paths =="
       puts "  => VR_MANGR.IFO: #{dvd.vrdisc.opts_ifo}"
@@ -57,7 +63,8 @@ module Dvdvrconv
       puts "  => use_customize_title: #{@options[:use_customize_title]}"
       puts "  => base_dst_name: #{@options[:base_dst_name]}"
       puts "  => number_list: #{@options[:number_list]}"
-      
+      puts "  => concat_mode: #{@options[:concat_mode]}"
+
       dvd.read_info
 
       dvd.view_info if options[:opt][:info] || options[:opt].empty?
@@ -72,8 +79,11 @@ module Dvdvrconv
       dvd.rename_vob
 
       # Concatenate Split titles
-      concat_list = dvd.make_concat_list
-      dvd.concat_titles(concat_list)
+      if dvd.vrdisc.concat_mode == true
+        puts "== Concatenate Split titles =="
+        concat_list = dvd.make_concat_list
+        dvd.concat_titles(concat_list)
+      end
 
       # customize title of vob files
       case @options[:use_customize_title]
@@ -115,6 +125,7 @@ module Dvdvrconv
           puts "ERROR: number_list should be an Array."
           exit
         end
+
       else
         puts "No customize file names"
         base_dst_name = dvd.vrdisc.title.uniq.map { |file| file[0].gsub(/\s/, "_") }
@@ -150,6 +161,12 @@ module Dvdvrconv
       @options[:use_customize_title] = config["use_customize_title"] || "no"
       @options[:base_dst_name] = config["base_dst_name"] || []
       @options[:number_list] = config["number_list"] || []
+
+      if config["concat_mode"].nil?
+        @options[:concat_mode] = Dvdvrconv::DEFAULT_CONCAT_MODE
+      else
+        @options[:concat_mode] = config["concat_mode"]  
+      end
     end
 
     def dvdpath

data/lib/dvdvrconv/dvdvr.rb

@@ -16,10 +16,12 @@ module Dvdvrconv
     :default_opts_ifo,# @param [String]
     :default_opts_vro,# @param [String]
     :default_cmd,     # @param [String]
+    :concat_mode,     # @param [Boolean]
   )
 
   BASE_NAME = "DVD"
   DEFAULT_CONFIG_FILE = "default_dvdvrconv.yml"
+  DEFAULT_CONCAT_MODE = true
 
   # Default DVD drive is "d".
   # If you want to use a different drive, you need to set up a "default_dvdvrconv.yml" file.
@@ -49,6 +51,7 @@ module Dvdvrconv
       @vrdisc.default_opts_ifo = @vrdisc.opts_ifo
       @vrdisc.default_opts_vro = @vrdisc.opts_vro
       @vrdisc.default_cmd = @vrdisc.cmd
+      @vrdisc.concat_mode = Dvdvrconv::DEFAULT_CONCAT_MODE
     end
 
     # Read VRO file from dvd-ram disc in dvd-vr format, and output vob files.
@@ -212,18 +215,28 @@ module Dvdvrconv
     def customize_title(base_dst_name, number_list = [])
       vob_titles = []
 
-      base_dst_name.size.times do |x|
-        break if x > @vrdisc.title.uniq.size - 1
-        src = @vrdisc.title.uniq[x][0].gsub(/\s/, "_") + ".vob"
+      if @vrdisc.concat_mode == true
+        titels = @vrdisc.title.uniq.flatten
+      else
+        titels = @vrdisc.output_title
+      end
+
+      titels.each_with_index do |title, idx|      
+        src = title.gsub(/\s/, "_") + ".vob"
 
         case base_dst_name
         when Array
-          dst_name = base_dst_name[x]
+          dst_name = base_dst_name[idx]
         when String
           if number_list.size.zero?
-            dst_name = base_dst_name + format("_%02d", x + 1)
+            dst_name = base_dst_name + format("_%02d", idx + 1)
           else
-            dst_name = base_dst_name + format("_%02d", number_list[x])
+            case number_list[idx]
+            when Numeric
+              dst_name = base_dst_name + format("_%02d", number_list[idx])
+            when String
+              dst_name = base_dst_name + format("_%s", number_list[idx])
+            end
           end
         end
 
@@ -311,6 +324,14 @@ module Dvdvrconv
       end
     end
 
+    def vrdisc_status
+      puts "\n< < < < < @vrdisc status > > > > >"
+      %w(num title output_title duplicate_name vob_titles concat_mode).each do |item|
+        puts "#{item}=> #{@vrdisc[item]}"
+      end
+      puts "< < < < < @vrdisc status > > > > >\n"
+    end
+
     # convert vob to mp4.
     #
     # required Values:

data/lib/dvdvrconv/version.rb

@@ -1,3 +1,3 @@
 module Dvdvrconv
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/test-unit.yml

@@ -1,11 +1,11 @@
-runner: console
-console_options:
-  color_scheme: normal
-color_schemes:
-  normal:
-    success:
-      name: green
-      bold: true
-    failure:
-      name: red
-      bold: true
+runner: console
+console_options:
+  color_scheme: normal
+color_schemes:
+  normal:
+    success:
+      name: green
+      bold: true
+    failure:
+      name: red
+      bold: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dvdvrconv
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - icm7216
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-06 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit