diskcatalog 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a4c33e246e2738c6f822206c8dbb98392aff3534186cb1bde3913c3dacded5e
-  data.tar.gz: eaac4cb7ff83a101ddefe3604ff0cdffe71b193bd8d94aa80f8dc897995df8ee
+  metadata.gz: 5dbf507ee9fe22be9b3784cb3b108d7684250654cec86cc110d18ffa8e7cbde0
+  data.tar.gz: e5f2983c5bc234cd8299365d97b28f232563079778a880c2fe6bb20dc40d15a1
 SHA512:
-  metadata.gz: b26d641ce336e2e7b9c9652969df0786945e77204879c0b638650592a8c46a2e72c417bf736e6f4c9b2c3818f0f14bb77255edbb16e602bf35ec149d5ecd832a
-  data.tar.gz: 858ade4f1d4bcbd5772dc442c09ac9dbaa38a628d49ba5b82e7cda66c5f1c7dfeb34271f530d8f955d9bc6903403109a1efc3f71b6209fc9762742173aeb5056
+  metadata.gz: d8a5604806a5fba58e2ce19d58a99dd8968707257e7fca1067afa4d9cbf221f4d227f35e2166b438ec90a632f2d230877f44b538dbaecef73a9ee349ab49d40e
+  data.tar.gz: 5a53c9d4caa12aca79ea9f413e3e6c2bd63706e96e0cc05dd851923145cad8bef2349587e29dfae78d107b8bb32d299b890c94a25a8d57afc6a6f1492d580a16

data/.idea/diskcatalog.iml

@@ -10,7 +10,7 @@
       <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/bundle/ruby/3.2.0/cache" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="rbenv: 3.2.6" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module-library">
       <library name="ffi (v1.17.1) [path][gem]" type="rubylib">
@@ -204,6 +204,6 @@
         </excluded>
       </library>
     </orderEntry>
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.19, rbenv: 3.2.5) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.19, rbenv: 3.2.6) [gem]" level="application" />
   </component>
 </module>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diskcatalog (1.3.0)
+    diskcatalog (1.3.2)
       sys-filesystem
       zlib
 
@@ -17,6 +17,8 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  arm64-darwin-24
+  x64-mingw-ucrt
   x64-mingw32
   x86_64-darwin-22
   x86_64-darwin-24

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.3.0"
+  VERSION = "1.3.2"
 end

data/lib/diskcatalog.rb

@@ -13,7 +13,7 @@ require 'zlib'
 
 module Diskcatalog
   DEF_CONFIG = File.expand_path("~/.catalogrc")
-  SEARCH_CMD = "rg -z"
+  SEARCH_CMD = "rg"
 
   class Error < StandardError; end
  
@@ -88,9 +88,21 @@ module Diskcatalog
     end
     attr_reader :dir, :search, :debug, :output, :output_files, :output_info, :compress, :debug
 
-    def output_files
+    # def output_files
+    #   if compress
+    #     @output_files + '.gz'
+    #   else
+    #     @output_files
+    #   end
+    # end
+
+    def compress_output_files
+      @output_files + '.gz'
+    end
+
+    def real_output_files
       if compress
-        @output_files + '.gz'
+        compress_output_files
       else
         @output_files
       end
@@ -103,7 +115,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
@@ -184,13 +196,16 @@ module Diskcatalog
 
     private
     def make_files
-      puts "Create catalog file for #{@option.dir}: #{@option.output_files}"
+      puts "Create catalog file for #{@option.dir}: #{@option.real_output_files}"
       unless FileTest.directory?(@option.dir)
 	       raise RuntimeError
       end
 
+      File.unlink(@option.output_files) if FileTest.file?(@option.output_files)
+      File.unlink(@option.compress_output_files) if FileTest.file?(@option.compress_output_files)
+
       if @option.compress
-        out = File.open(@option.output_files, "w:utf-8")
+        out = File.open(@option.compress_output_files, "w:utf-8")
         out = Zlib::GzipWriter.open(out)
       else
         out = File.open(@option.output_files, "w:utf-8")
@@ -282,8 +297,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.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
@@ -45,6 +45,7 @@ executables:
 - catalogsearch.cmd
 - dcatc
 - dcats
+- dcatz
 extensions: []
 extra_rdoc_files: []
 files:
@@ -70,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