dvdvrconv 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd0b6b68888121b16c1922584806cf3243004a6ad4266fe566fa214b24ec879
-  data.tar.gz: ca80cd76a741a472b620e6bf4b719eda1c19c71c0fd4520bbd272c0ea2fc6bd0
+  metadata.gz: 3c37a9a062aa1d69e7074aa2440dacc4fe879b3a7a67655e00d1d17419a2eb64
+  data.tar.gz: a410ed9e330c3ea8617f59a5ab119852668a13e34d0b2e10cf666aa6578745f3
 SHA512:
-  metadata.gz: 2e25f62d9189c973cab886e9d1ee04bae73211d7c19ec229de24ea05d2a5ecfee8a80d78159bd627205f6547b465ee05f77ce5ad67a3db51a955d45e15969528
-  data.tar.gz: 4794ddbec14b997291883c1b159c7809707fa77d9db42e8a2cb94e8d34fe8b22ccae37d4c953a489116c4194aca37cfe9d25e67f6e98ed4c73ea7add2d021e78
+  metadata.gz: 97a900ff0d0e317ef783fd429ede27713ef43be4d82d365f3c725aec0d840da2750c1bbc17791de4fe7584c6df4ab926b10d91709c1922e21e9ba1a1710adc96
+  data.tar.gz: 99d5b7f2eabcc066fe966e82d47a72412f7ecc48b294511a2760fc66d1a10299bdb9aac4846dae52a7b3db8c8dbd99d7990b725527f36c86c43fa0ab5e4f7205

data/README.md

@@ -1,55 +1,285 @@
-# Dvdvrconv [![Gem Version](https://badge.fury.io/rb/dvdvrconv.svg)](https://badge.fury.io/rb/dvdvrconv)
-
-  
-Dvdvrconv extracts the `vob` file from the `vro` file on the dvd-vr format disc.
-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
-
-*  [pixelb/dvd-vr](https://github.com/pixelb/dvd-vr/)
-*  FFmpeg
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'dvdvrconv'
-```
-
-And then execute:
-```ruby
-$ bundle install
-```
-Or install it yourself as:
-```ruby
-$ gem install dvdvrconv
-```
-
-
-## Usage
-
-```
->dvdvrconv -h
-Usage: dvdvrconv [options]
-    -v, --version                    Show version
-    -i, --info                       Show file information
-        --config=FILE                Use YAML format FILE.
-```
-
-
-## 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.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
-
-
-## License
-
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
-
+# Dvdvrconv [![Gem Version](https://badge.fury.io/rb/dvdvrconv.svg)](https://badge.fury.io/rb/dvdvrconv)
+
+  
+Dvdvrconv extracts the `vob` file from the `vro` file on the dvd-vr format disc.
+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
+
+*  [dvd-vr](https://github.com/pixelb/dvd-vr/)
+*  [FFmpeg](https://www.ffmpeg.org/)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'dvdvrconv'
+```
+
+And then execute:
+```ruby
+$ bundle install
+```
+Or install it yourself as:
+```ruby
+$ gem install dvdvrconv
+```
+
+
+## Usage
+
+View video information from dvd-ram disc in dvd-vr format.
+
+`dvdvrconv -i` or `dvdvrconv`
+```
+>dvdvrconv
+== Use these paths ==
+  => VR_MANGR.IFO: ./DVD_RTAV/VR_MANGR.IFO
+  => VR_MOVIE.VRO ./DVD_RTAV/VR_MOVIE.VRO
+  => dvd-vr.exe: ./win/dvd-vr.exe
+----- view dvd-vr info -----
+format: DVD-VR V1.1
+Encryption: CPRM supported
+
+tv_system   : NTSC
+resolution  : 704x480
+aspect_ratio: 4:3
+video_format: MPEG2
+audio_channs: 2
+audio_coding: Dolby AC-3
+
+num  : 1
+title: TEST1
+date : 2019-10-30 22:32:07
+size : 3534848
+-
+num  : 2
+title: TEST2
+date : 2019-10-30 22:33:05
+size : 2965504
+-
+num  : 3
+title: TEST3
+date : 2019-10-30 22:33:37
+size : 2394112
+-
+```
+
+Execute the VRO file to mp4 conversion.
+
+`dvdvrconv -e` or `dvdvrconv --exec`
+
+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
+    -c, --config=FILE                Use YAML format FILE.
+    -e, --exec                       Execute the VRO file to mp4 conversion.
+```
+
+### Configure dvdvrconv
+
+dvdvrconv reads `default_dvdvrconv.yml` in the current working directory as dvdvrconv's configuration file. It can contain the following settings:
+
+*  vr_mangr_ifo
+*  vr_movie_vro
+*  dvd_vr_cmd
+*  use_customize_title
+*  base_dst_name
+*  number_list
+
+#### 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.
+
+windows default
+```
+vr_mangr_ifo: "/cygdrive/D/DVD_RTAV/VR_MANGR.IFO"
+vr_movie_vro: "/cygdrive/D/DVD_RTAV/VR_MOVIE.VRO"
+```
+
+WSL(ubuntu) default
+```
+vr_mangr_ifo: "/mnt/d/DVD_RTAV/VR_MANGR.IFO"
+vr_movie_vro: "/mnt/d/DVD_RTAV/VR_MOVIE.VRO"
+```
+
+#### 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
+
+customize the title name of vob files.
+
+If specify individual file names. Write "base_dst_name:" as an Array.
+```
+use_customize_title: 1
+base_dst_name: ["name_one", "name_two"]
+number_list: []
+```
+The resulting file name is => ["name_one", "name_two"]
+
+
+If add a sequence number to the file name. Write "base_dst_name:" as String.
+```
+use_customize_title: 2
+base_dst_name: "output_name_"
+number_list: []
+```
+The resulting file name is => ["output_name_01", "output_name_02", ...]
+
+If specify sequence numbers individually.
+Write "base_dst_name:" as String and Write "number_list" as an Array.
+```
+use_customize_title: 3
+base_dst_name: "output_name_"
+number_list: [12, 13, 14, 15]
+```
+The resulting file name is => ["output_name_12", "output_name_13", "output_name_14", "output_name_15"]
+
+ 
+If do not want to customize the title name, 
+Specify `use_customize_title: no`.
+```
+use_customize_title: no
+base_dst_name: []
+number_list: []
+```
+
+
+## Install dependent libraries for WSL(ubuntu)
+
+### dvd-vr
+
+*  [pixelb/dvd-vr](https://github.com/pixelb/dvd-vr/)
+
+```
+$ git clone https://github.com/pixelb/dvd-vr.git
+Cloning into 'dvd-vr'...
+remote: Enumerating objects: 140, done.
+remote: Total 140 (delta 0), reused 0 (delta 0), pack-reused 140
+Receiving objects: 100% (140/140), 260.97 KiB | 40.00 KiB/s, done.
+Resolving deltas: 100% (37/37), done.
+
+$ cd dvd-vr/
+
+$ sudo make install
+cc -std=gnu99 -Wall -Wextra -Wpadded -DVERSION='"0.9.8b"' -O3 -DNDEBUG -DHAVE_ICONV -DICONV_CONST=""  -c -o dvd-vr.o dvd-vr.c
+cc  dvd-vr.o -Wl,-S -o dvd-vr
+cp -p dvd-vr /usr/local/bin
+gzip -c man/dvd-vr.1 > /usr/local/share/man/man1/dvd-vr.1.gz
+
+$ dvd-vr --help
+Usage: dvd-vr [OPTION]... VR_MANGR.IFO [VR_MOVIE.VRO]
+Print info about and optionally extract vob data from DVD-VR files.
+
+If the VRO file is specified, the component programs are
+extracted to the current directory or to stdout.
+
+  -p, --program=NUM  Only process program NUM rather than all programs.
+
+  -n, --name=NAME    Specify a basename to use for extracted vob files
+                     rather than using one based on the timestamp.
+                     If you pass `-' the vob files will be written to stdout.
+                     If you pass `[label]' the names will be based on
+                     a sanitized version of the title or label.
+
+      --help         Display this help and exit.
+      --version      Output version information and exit.
+```
+
+
+### FFmpeg
+
+```
+sudo apt install ffmpeg
+```
+
+## Install dependent libraries for Windows
+
+### dvd-vr
+
+Compile dvd-vr command in Cygwin environment.
+
+Download Cygwin for 64-bit version. => [setup-x86_64.exe](https://cygwin.com/setup-x86_64.exe)
+
+
+Install Cygwin for 64-bit version. At the Windows command prompt.
+```
+setup-x86_64.exe ^
+   --root c:\cygwin64 ^
+   --local-package-dir c:\cygwin64\packages ^
+   --site https://ftp.iij.ad.jp/pub/cygwin/ ^
+   --quiet-mode ^
+   --packages libiconv,libiconv-devel,gcc-core,gcc-g++,git,make
+```
+
+Compile dvd-vr. At the Cygwin terminal.
+```
+$ git clone https://github.com/pixelb/dvd-vr.git
+Cloning into 'dvd-vr'...
+remote: Enumerating objects: 140, done.
+remote: Total 140 (delta 0), reused 0 (delta 0), pack-reused 140
+Receiving objects: 100% (140/140), 260.97 KiB | 954.00 KiB/s, done.
+Resolving deltas: 100% (37/37), done.
+
+$ cd dvd-vr/
+
+$ make install
+cc -std=gnu99 -Wall -Wextra -Wpadded -DVERSION='"0.9.8b"' -O3 -DNDEBUG -DHAVE_ICONV -DICONV_CONST="const"  -c -o dvd-vr.o dvd-vr.c
+dvd-vr.c: In function ‘text_convert’:
+dvd-vr.c:414:24: warning: passing argument 2 of ‘libiconv’ from incompatible pointer type [-Wincompatible-pointer-types]
+  414 |         if (iconv (cd, (ICONV_CONST char**)&src, &srclen, &dst, &dstlen) != (size_t)-1) {
+      |                        ^~~~~~~~~~~~~~~~~~~~~~~~
+      |                        |
+      |                        const char **
+In file included from dvd-vr.c:124:
+/usr/include/iconv.h:82:43: note: expected ‘char **’ but argument is of type ‘const char **’
+   82 | extern size_t iconv (iconv_t cd,  char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
+      |                                   ~~~~~~~~^~~~~
+cc  dvd-vr.o -liconv -Wl,-S -o dvd-vr.exe
+cp man/dvd-vr.man man/dvd-vr.1
+cp -p dvd-vr.exe /usr/local/bin
+gzip -c man/dvd-vr.1 > /usr/local/share/man/man1/dvd-vr.1.gz
+```
+
+After compile success, you will get the following files.
+*  dvd-vr.exe     (c:\cygwin64\home\user_name\dvd-vr)
+*  cygwin1.dll    (c:\cygwin64\bin)
+*  cygiconv-2.dll (c:\cygwin64\bin)
+
+
+### FFmpeg
+
+*  [FFmpeg](https://www.ffmpeg.org/download.html)
+From the Windows EXE Files link above, select the following website.
+*  [Releases · BtbN/FFmpeg-Builds](https://github.com/BtbN/FFmpeg-Builds/releases) (daily auto-build).
+
+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
+
+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.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
 pixelb/dvd-vr is licensed under the GNU General Public License v2.0

data/lib/dvdvrconv/command.rb

@@ -20,12 +20,23 @@ module Dvdvrconv
       dvd = Dvdvrconv::Dvdvr.new
 
       # Set the path specified in the yaml file.
-      dvd.vrdisc.opts_ifo = @options[:vr_mangr_ifo] if @options[:vr_mangr_ifo]
-      dvd.vrdisc.opts_vro = @options[:vr_movie_vro] if @options[:vr_movie_vro]
-      dvd.vrdisc.cmd = @options[:dvd_vr_cmd] if @options[:dvd_vr_cmd]
+      if @options[:vr_mangr_ifo]
+        dvd.vrdisc.opts_ifo = @options[:vr_mangr_ifo]
+      else
+        dvd.vrdisc.opts_ifo = dvd.vrdisc.default_opts_ifo
+      end
+
+      if @options[:vr_movie_vro]
+        dvd.vrdisc.opts_vro = @options[:vr_movie_vro]
+      else
+        dvd.vrdisc.opts_vro = dvd.vrdisc.default_opts_vro
+      end
 
-      # dvd.vrdisc.opts_ifo = "test/DVD_RTAV/VR_MANGR.IFO"
-      # dvd.vrdisc.opts_vro = "test/DVD_RTAV/VR_MOVIE.VRO"
+      if @options[:dvd_vr_cmd]
+        dvd.vrdisc.cmd = @options[:dvd_vr_cmd]
+      else
+        dvd.vrdisc.cmd = dvd.vrdisc.default_cmd
+      end
 
       if options[:opt][:config_file]
         puts "Use config file\n  => #{options[:opt][:config_file]}"
@@ -44,11 +55,9 @@ module Dvdvrconv
 
       dvd.read_info
 
-      if options[:opt][:info]
-        dvd.view_info
-        exit
-      end
-
+      dvd.view_info if options[:opt][:info] || options[:opt].empty?
+      exit unless options[:opt][:exec]
+      
       # Extract vob files
       dvd.adjust_title
       dvd.vro2vob
@@ -116,24 +125,34 @@ module Dvdvrconv
 
     # load yaml file and store in @options.
     def load_config(file)
-      config = YAML.load(File.read(file))
+      config = YAML.load(File.read(file)) || {}
 
       %w(vr_mangr_ifo vr_movie_vro dvd_vr_cmd).each do |key|
+        @options[key.to_sym] = nil
+
         unless config.key?(key)
           puts "[ #{key} ] does not exist in #{file} file."
-          exit
-        end
-
-        if File.exist?(config[key])
-          @options[key.to_sym] = config[key]
         else
-          puts "File read error. No such file: #{config[key]}"
+          if File.exist?(config[key])
+            @options[key.to_sym] = config[key]
+          else
+            puts "File read error. No such file: #{config[key]}"
+          end
         end
+
       end
 
       @options[:use_customize_title] = config["use_customize_title"] || "no"
       @options[:base_dst_name] = config["base_dst_name"] || []
       @options[:number_list] = config["number_list"] || []
     end
+
+    def dvdpath
+      {
+        :vr_mangr_ifo => @options[:vr_mangr_ifo],
+        :vr_movie_vro => @options[:vr_movie_vro],
+        :dvd_vr_cmd => @options[:dvd_vr_cmd]
+      } 
+    end
   end
 end

data/lib/dvdvrconv/dvdvr.rb

@@ -13,16 +13,19 @@ module Dvdvrconv
     :output_title,    # @param [Array<String>]
     :duplicate_name,  # @param [Array<String>]
     :vob_titles,      # @param [Array<String>]
+    :default_opts_ifo,# @param [String]
+    :default_opts_vro,# @param [String]
+    :default_cmd,     # @param [String]
   )
 
   BASE_NAME = "DVD"
-  DEFAULT_CONFIG_FILE = "default_dvdvrconv.yaml"
+  DEFAULT_CONFIG_FILE = "default_dvdvrconv.yml"
 
   # Default DVD drive is "d".
-  # If you want to use a different drive, you need to set up a "default_dvdvrconv.yaml" file.
+  # If you want to use a different drive, you need to set up a "default_dvdvrconv.yml" file.
   WIN_DRV_IFO = "/cygdrive/D/DVD_RTAV/VR_MANGR.IFO"
   WIN_DRV_VRO = "/cygdrive/D/DVD_RTAV/VR_MOVIE.VRO"
-  WIN_DRV_CMD = "win/dvd-vr.exe"
+  WIN_DRV_CMD = File.expand_path("../../win/dvd-vr.exe", __dir__)
   DRV_IFO = "/mnt/d/DVD_RTAV/VR_MANGR.IFO"
   DRV_VRO = "/mnt/d/DVD_RTAV/VR_MOVIE.VRO"
   DRV_CMD = "dvd-vr"
@@ -42,6 +45,10 @@ module Dvdvrconv
         @vrdisc.opts_vro = Dvdvrconv::DRV_VRO
         @vrdisc.cmd = Dvdvrconv::DRV_CMD
       end
+
+      @vrdisc.default_opts_ifo = @vrdisc.opts_ifo
+      @vrdisc.default_opts_vro = @vrdisc.opts_vro
+      @vrdisc.default_cmd = @vrdisc.cmd
     end
 
     # Read VRO file from dvd-ram disc in dvd-vr format, and output vob files.
@@ -75,6 +82,7 @@ module Dvdvrconv
     #
     def read_info
       out, err, status = Open3.capture3(@vrdisc.cmd, @vrdisc.opts_ifo)
+      puts "File read error => #{err}" unless status.success?
       @vrdisc.header = out.scan(/^(.*?)Number/m)
 
       # Sets the captured information to @vrdisc.

data/lib/dvdvrconv/options.rb

@@ -15,9 +15,13 @@ module Dvdvrconv
           options[:info] = v
         end
 
-        o.on("--config=FILE", String, "Use YAML format FILE.") do |file|
+        o.on("-c", "--config=FILE", String, "Use YAML format FILE.") do |file|
           options[:config_file] = file
         end
+
+        o.on("-e", "--exec", "Execute the VRO file to mp4 conversion.") do |v|
+          options[:exec] = v
+        end
       end
 
       begin
@@ -26,7 +30,7 @@ module Dvdvrconv
         abort e.message
       rescue OptionParser::MissingArgument => e
         case e.args
-        when ["--config"]
+        when ["-c"], ["--config"]
           # load_config(Dvdvrconv::DEFAULT_CONFIG_FILE)
           puts "The config file has not been specified.\nUse the default configuration file. (=> #{Dvdvrconv::DEFAULT_CONFIG_FILE})"
           options[:config_file] = Dvdvrconv::DEFAULT_CONFIG_FILE

data/lib/dvdvrconv/version.rb

@@ -1,3 +1,3 @@
 module Dvdvrconv
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dvdvrconv
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - icm7216
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -61,8 +61,8 @@ files:
 - lib/dvdvrconv/dvdvr.rb
 - lib/dvdvrconv/options.rb
 - lib/dvdvrconv/version.rb
-- sample_default_dvdvrconv.yaml
-- sample_my.yaml
+- sample_default_dvdvrconv.yml
+- sample_my.yml
 - test-unit.yml
 - win/cygiconv-2.dll
 - win/cygwin1.dll
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.17
 signing_key:
 specification_version: 4
 summary: DVD-VR utility