diskcatalog 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a4c33e246e2738c6f822206c8dbb98392aff3534186cb1bde3913c3dacded5e
-  data.tar.gz: eaac4cb7ff83a101ddefe3604ff0cdffe71b193bd8d94aa80f8dc897995df8ee
+  metadata.gz: 4e0ad770b5bfab040d17787bfe39cb4f58b6a529c97ef1794bfa02cae9dc2534
+  data.tar.gz: cf0fab667155ab200608b10727f56efbf360cdb947ade106bd5b9065a3c9087a
 SHA512:
-  metadata.gz: b26d641ce336e2e7b9c9652969df0786945e77204879c0b638650592a8c46a2e72c417bf736e6f4c9b2c3818f0f14bb77255edbb16e602bf35ec149d5ecd832a
-  data.tar.gz: 858ade4f1d4bcbd5772dc442c09ac9dbaa38a628d49ba5b82e7cda66c5f1c7dfeb34271f530d8f955d9bc6903403109a1efc3f71b6209fc9762742173aeb5056
+  metadata.gz: 2474841f69413fc77f299293088b19ce423faa63dea352d47927b24f28eeaa6cdc54a38f044e458e08f6ed1eaf401966c59e45b9816c6b60992e8c9ef82b3570
+  data.tar.gz: 0e6f952649a11a2cfc851262a71c3654af582eaa9f334680c98015e6ede2968794c10ba3e7e8b2b2c1dcf3fd38da73fd7378c4e394dff12a482abb396a4d24a2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diskcatalog (1.3.0)
+    diskcatalog (1.3.1)
       sys-filesystem
       zlib
 
@@ -17,6 +17,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-22
+  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.1"
 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
  
@@ -103,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
@@ -282,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diskcatalog
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - src
@@ -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