diskcatalog 1.2.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 924717b99bcbe0a071819b38a67893a99dcdbed0cb0c4fc6f3e48309838f3614
-  data.tar.gz: e72b0379e4348cf604e285e91f5ee5728855ab15d693302889c6f2524d485798
+  metadata.gz: 4e0ad770b5bfab040d17787bfe39cb4f58b6a529c97ef1794bfa02cae9dc2534
+  data.tar.gz: cf0fab667155ab200608b10727f56efbf360cdb947ade106bd5b9065a3c9087a
 SHA512:
-  metadata.gz: 86112b38aab32e6cfce76f94d1e9a737fdaf0915d40b2693c4198d05f5d813c98303bd9f44fa7b71229862ceb8ba9d8ad3f19370f9b434198842c61d8e4aa8b4
-  data.tar.gz: 10b5729e36cfb3f3317b909d892e66dc39a2da63e6600778923218e8c211b374b2e9defb511fd92c50f78f7ff27e5bf629210e360d3c8b58cfea949013f23a5f
+  metadata.gz: 2474841f69413fc77f299293088b19ce423faa63dea352d47927b24f28eeaa6cdc54a38f044e458e08f6ed1eaf401966c59e45b9816c6b60992e8c9ef82b3570
+  data.tar.gz: 0e6f952649a11a2cfc851262a71c3654af582eaa9f334680c98015e6ede2968794c10ba3e7e8b2b2c1dcf3fd38da73fd7378c4e394dff12a482abb396a4d24a2

data/.idea/diskcatalog.iml

@@ -56,7 +56,7 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="minitest (v5.25.4) [path][gem]" type="rubylib">
+      <library name="minitest (v5.25.5) [path][gem]" type="rubylib">
         <properties>
           <option name="additionalInfo">
             <AdditionalInfo>
@@ -73,20 +73,20 @@
               <option value="lib" />
             </list>
           </option>
-          <option name="url" value="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.4" />
-          <option name="version" value="5.25.4" />
+          <option name="url" value="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.5" />
+          <option name="version" value="5.25.5" />
         </properties>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.4/lib" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.4/test" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.5/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.5/test" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.4/lib" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.4/test" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.5/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.5/test" />
         </SOURCES>
         <excluded>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.4/test" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/minitest-5.25.5/test" />
         </excluded>
       </library>
     </orderEntry>
@@ -169,6 +169,41 @@
         </excluded>
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="zlib (v3.2.1) [path][gem]" type="rubylib">
+        <properties>
+          <option name="additionalInfo">
+            <AdditionalInfo>
+              <option name="authors" value="該当なし" />
+              <option name="email" value="該当なし" />
+              <option name="homepage" value="該当なし" />
+              <option name="summary" value="該当なし" />
+            </AdditionalInfo>
+          </option>
+          <option name="fromPath" value="true" />
+          <option name="name" value="zlib" />
+          <option name="requirePaths">
+            <list>
+              <option value="lib" />
+            </list>
+          </option>
+          <option name="url" value="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/zlib-3.2.1" />
+          <option name="version" value="3.2.1" />
+        </properties>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/zlib-3.2.1/ext" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/zlib-3.2.1/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/zlib-3.2.1/ext" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/zlib-3.2.1/lib" />
+        </SOURCES>
+        <excluded>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/gems/zlib-3.2.1/ext" />
+        </excluded>
+      </library>
+    </orderEntry>
     <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.19, rbenv: 3.2.5) [gem]" level="application" />
   </component>
 </module>

data/Gemfile.lock

@@ -1,20 +1,23 @@
 PATH
   remote: .
   specs:
-    diskcatalog (1.2.3)
+    diskcatalog (1.3.1)
       sys-filesystem
+      zlib
 
 GEM
   remote: https://rubygems.org/
   specs:
     ffi (1.17.1)
-    minitest (5.25.4)
+    minitest (5.25.5)
     rake (13.2.1)
     sys-filesystem (1.5.3)
       ffi (~> 1.1)
+    zlib (3.2.1)
 
 PLATFORMS
   arm64-darwin-22
+  x64-mingw-ucrt
   x64-mingw32
   x86_64-darwin-22
   x86_64-darwin-24

data/diskcatalog.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_dependency "sys-filesystem"
+  spec.add_dependency "zlib"
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
 

data/exe/dcatz

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'zlib'
+
+
+def zcat(filename)
+  return unless filename
+  return unless FileTest.file?(filename)
+  if filename =~ /\.gz$/
+    Zlib::GzipReader.open(filename) do |gz|
+      print gz.read
+    end
+    return
+  end
+  File.open(filename, 'rb') do |f|
+    while (line = f.gets)
+      print line
+    end
+  end
+end
+
+filename = ARGV[0]
+zcat(filename)
+
+

data/lib/diskcatalog/utils.rb

@@ -18,6 +18,10 @@ module Diskcatalog
         '%.1f TB' % (size / tb)
       end.sub('.0', '')
     end
+
+    def self.windows?
+      RUBY_PLATFORM =~ /mswin|mingw|bccwin|cygwin/
+    end
   end
 end
 

data/lib/diskcatalog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Diskcatalog
-  VERSION = "1.2.3"
+  VERSION = "1.3.1"
 end

data/lib/diskcatalog.rb

@@ -9,6 +9,7 @@ require 'optparse'
 require 'fileutils'
 require 'yaml'
 require 'sys/filesystem'
+require 'zlib'
 
 module Diskcatalog
   DEF_CONFIG = File.expand_path("~/.catalogrc")
@@ -77,13 +78,23 @@ module Diskcatalog
        @dir = argv[0]
       end
 
+      @debug = @opts[:d]
+      @compress = @opts[:z]
       @output = @opts[:o]
       if @output
         @output_files = File.join(catalogdir, @output + '.files')
         @output_info = File.join(catalogdir, @output + '.info')
       end
     end
-    attr_reader :dir, :search, :debug, :output, :output_files, :output_info
+    attr_reader :dir, :search, :debug, :output, :output_files, :output_info, :compress, :debug
+
+    def output_files
+      if compress
+        @output_files + '.gz'
+      else
+        @output_files
+      end
+    end
   end
 
   class SearchOption < Option
@@ -92,7 +103,7 @@ module Diskcatalog
       @search = nil
       if argv.size > 0
         @search = argv[0]
-      end
+      end      
       raise "SEARCH is not specified" unless @search
     end
     attr_reader :search
@@ -133,6 +144,8 @@ module Diskcatalog
       opt.on('-v', '--verbose', 'verbose message') {|v| opts[:v] = v}
       opt.on('-o FILENAME', '--output=FILENAME') {|v| opts[:o] = v}
       opt.on('--config=CONFIGFILE', 'Config file') {|v| opts[:c] = v }
+      opt.on('-d', '--debug', 'debug message') {|v| opts[:d] = v}
+      opt.on('-z', '--gzip', 'compress with gzip') {|v| opts[:z] = v}
       opt.on('-l', '--list') {|v| opts[:l] = v}
       opt.parse!(argv)
       # if opts[:o].nil?
@@ -175,7 +188,14 @@ module Diskcatalog
       unless FileTest.directory?(@option.dir)
 	       raise RuntimeError
       end
-      out = File.open(@option.output_files, "w:utf-8")
+
+      if @option.compress
+        out = File.open(@option.output_files, "w:utf-8")
+        out = Zlib::GzipWriter.open(out)
+      else
+        out = File.open(@option.output_files, "w:utf-8")
+      end
+
       begin
         MyFind.find(@option.dir, ignore_error: true) do |f|
           if FileTest.file?(f)
@@ -190,8 +210,8 @@ module Diskcatalog
         puts e.message
         if option.debug
           p e.backtrace
+          p e.class
         end
-        p e.class
       end
       out.close if out
     end    
@@ -262,8 +282,24 @@ module Diskcatalog
       end
     end
 
-    def search
-      cmd = "#{SEARCH_CMD} #{@option.search} #{@option.catalogdir}"
+#     def write_zcat
+#       cmd = <<__EOM__
+# ruby -rzlib -e 'print File.extname(ARGV[0])==".gz" ? Zlib::GzipReader.open(ARGV[0]).read : File.read(ARGV[0])' %1      
+# __EOM__
+#       zcat_path = File.join(@option.catalogdir, "zcat.bat")
+#       File.open(zcat_path, "w:utf-8") do |f|
+#         f.puts cmd
+#       end
+#       zcat_path
+#     end
+
+    def search      
+      precmd = "-z"
+      if Diskcatalog::Utils.windows?
+#        zcat_path=write_zcat
+        precmd = "--pre=dcatz.bat" # .batを指定しないとエラーとなる。
+      end
+      cmd = "#{SEARCH_CMD} #{precmd} #{@option.search} #{@option.catalogdir}"      
       puts cmd if @option.debug
       system(cmd)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diskcatalog
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.1
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-11 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create disk catalog.
 email:
 - src@srcw.net
@@ -31,6 +45,7 @@ executables:
 - catalogsearch.cmd
 - dcatc
 - dcats
+- dcatz
 extensions: []
 extra_rdoc_files: []
 files:
@@ -56,6 +71,7 @@ files:
 - exe/catalogsearch.cmd
 - exe/dcatc
 - exe/dcats
+- exe/dcatz
 - lib/diskcatalog.rb
 - lib/diskcatalog/my_find.rb
 - lib/diskcatalog/utils.rb