diskcatalog 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0eefbdc894982861188be371c1236b7040a8c48098177c2fe136e0f852deaec
-  data.tar.gz: 4cbc90895d7948d74b790d2976f9bb8443f53f09995e09830340512438f18bbf
+  metadata.gz: fecee62476c7ba3617e40c7508c6e89c1f7fd66f18c87b5e2b18d17b443275aa
+  data.tar.gz: ab1b8549fd18d8770b0e8919a4e2196bc0731c188b503fbbd5fa8bf76b378038
 SHA512:
-  metadata.gz: 5ecba185745812d17e28423f960e734cd2266919b5854befa4ea24c38d4d78216d6bfffa6b9b3837557f9ea4f683f1fdf814c9e28dbff96e94782fd7e1bdd3b3
-  data.tar.gz: 38842a37b131d732ceda1e49660619dfe4c91e23a6620e7cb00d3a4a29ffeb4db690964b21a13740222d89667247ff98a6099a0a2bce7b360989baedc6fa2379
+  metadata.gz: f407c0a3853b19894ed9f99332e9c88e2e51b9ea244ac48154d87385547f663cccccd842b70c12c08881cf20c5846248250ef14271b3bf6e2ea9a048527507a8
+  data.tar.gz: 9219b5b01ab1068a8865b95ec6412e05a8f4396dca81a471996d44e455a2c2812ef0177de5cf314e27a411a7334579eaeaadd6d77d457efd70a614bb399ecb00

data/Gemfile.lock

@@ -1,15 +1,16 @@
 PATH
   remote: .
   specs:
-    diskcatalog (0.1.0)
+    diskcatalog (0.3.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.14.2)
-    rake (13.0.3)
+    minitest (5.19.0)
+    rake (13.0.6)
 
 PLATFORMS
+  arm64-darwin-22
   x64-mingw32
   x86_64-darwin-22
 
@@ -19,4 +20,4 @@ DEPENDENCIES
   rake (~> 13.0)
 
 BUNDLED WITH
-   2.3.25
+   2.4.9

data/build.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+# rmagick for sierra
+export PKG_CONFIG_PATH=/usr/local/opt/imagemagick@6/lib/pkgconfig
+#export PATH=/usr/local/Cellar/imagemagick@6/6.9.7-5/bin:$PATH
+
+bundle_dir=./vendor/bundle
+if [ -d "$bundle_dir" ] ; then
+    /bin/rm -rf "$bundle_dir"
+    bundle update    
+else
+    /bin/rm -rf "$bundle_dir"
+    bundle install --path "$bundle_dir"
+fi
+
+
+
+
+

data/catalogrc

@@ -0,0 +1,2 @@
+general:
+    catalogdir: ./data

data/exe/mkcat

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require "diskcatalog"
+
+Diskcatalog::Command.run(ARGV)

data/lib/diskcatalog/my_find.rb

@@ -0,0 +1,61 @@
+module MyFind
+
+	#
+	# Calls the associated block with the name of every file and directory listed
+	# as arguments, then recursively on their subdirectories, and so on.
+	#
+	# Returns an enumerator if no block is given.
+	#
+	# See the +Find+ module documentation for an example.
+	#
+	def find(*paths, ignore_error: true) # :yield: path
+	  block_given? or return enum_for(__method__, *paths, ignore_error: ignore_error)
+  
+	  fs_encoding = Encoding.find("filesystem")
+  
+	  paths.collect!{|d| raise Errno::ENOENT, d unless File.exist?(d); d.dup}.each do |path|
+		path = path.to_path if path.respond_to? :to_path
+		enc = path.encoding == Encoding::US_ASCII ? fs_encoding : path.encoding
+		ps = [path]
+		while file = ps.shift
+		  catch(:prune) do
+			yield file.dup
+			begin
+			  s = File.lstat(file)
+			rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG, Errno::EPERM
+			  raise unless ignore_error
+			  next
+			end
+			if s.directory? then
+			  begin
+				fs = Dir.children(file, encoding: enc)
+			  rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG, Errno::EPERM
+				raise unless ignore_error
+				next
+			  end
+			  fs.sort!
+			  fs.reverse_each {|f|
+				f = File.join(file, f)
+				ps.unshift f
+			  }
+			end
+		  end
+		end
+	  end
+	  nil
+	end
+  
+	#
+	# Skips the current file or directory, restarting the loop with the next
+	# entry. If the current file is a directory, that directory will not be
+	# recursively entered. Meaningful only within the block associated with
+	# Find::find.
+	#
+	# See the +Find+ module documentation for an example.
+	#
+	def prune
+	  throw :prune
+	end
+  
+	module_function :find, :prune
+  end

data/lib/diskcatalog/version.rb

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

data/lib/diskcatalog.rb

@@ -1,22 +1,63 @@
 # frozen_string_literal: true
 
+require_relative "diskcatalog/my_find"
 require_relative "diskcatalog/version"
 
-require 'find'
 require 'optparse'
 require 'fileutils'
+require 'yaml'
+
+
 
 module Diskcatalog
   class Error < StandardError; end
-  
+ 
+  class Config
+    CATALOGDIR = File.expand_path("~/.catalog")
+
+    def self.create_from_yaml(yaml)
+      config = Config.new
+      catalogdir = config_value(yaml, "general", "catalogdir", true)
+      if catalogdir
+        catalogdir = File.expand_path(catalogdir)
+      end
+      config.catalogdir = catalogdir
+
+  ##    puts config.catalogdir
+      config.init_default
+      if config.catalogdir.nil? || !FileTest.directory?(config.catalogdir)
+        raise RuntimeError, "catalogdir is not exist: #{config.catalogdir}"
+      end      
+      config
+    end
+
+    def self.config_value(yaml, section, key, require)
+      return nil unless yaml
+      return nil unless yaml[section]
+      value = yaml[section][key]
+      if require && (value.nil? || value.empty?)
+        raise RuntimeError, "#{section}:#{key}: is empty"
+      end
+      value
+    end
+    
+    def init_default
+      @catalogdir ||= CATALOGDIR
+    end
+
+    attr_accessor :catalogdir
+  end
+
+
   class Option
-    def initialize(opts, dirs)
+    def initialize(opts, dirs, config)
       @opts = opts
       @dir = dirs[0] if dirs.size > 0
+      @config = config
       @debug = @opts[:d] 
       @output = @opts[:o]
-      @output_files = @output + '.files'
-      @output_info = @output + '.info'
+      @output_files = File.join(config.catalogdir, @output + '.files')
+      @output_info = File.join(config.catalogdir, @output + '.info')
       @debug = true
     end
     attr_reader :dir, :debug, :output, :output_files, :output_info
@@ -36,12 +77,21 @@ module Diskcatalog
       end      
       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.parse!(argv)
       if opts[:o].nil?
 	      puts opt.help
 	      exit
       end
-      option = Option.new(opts, argv)
+      config_file = opts[:c] || "~/.catalogrc"
+      puts config_file
+      config_file = File.expand_path(config_file)      
+      yaml = nil
+      if FileTest.file?(config_file)
+        yaml = YAML.load_file(config_file)
+      end
+      config = Config.create_from_yaml(yaml)      
+      option = Option.new(opts, argv, config)
       begin
 	      command = Command.new(option)
 	      command.run
@@ -72,15 +122,20 @@ module Diskcatalog
 	       raise RuntimeError
       end
       out = File.open(@opt.output_files, "w:utf-8")
-      Find.find(@opt.dir, ignore_error: true) do |f|
-        if FileTest.file?(f)
-          size = File.size(f)
-          mtime = File.mtime(f).strftime("%Y-%m-%d")
-          out.puts "#{f}\t#{size}\t#{mtime}"
-        elsif FileTest.directory?(f)
-          STDERR.puts f
-        end
-      end      
+      begin
+        MyFind.find(@opt.dir, ignore_error: true) do |f|
+          if FileTest.file?(f)
+            size = File.size(f)
+            mtime = File.mtime(f).strftime("%Y-%m-%d")
+            out.puts "#{f}\t#{size}\t#{mtime}"
+          elsif FileTest.directory?(f)
+            STDERR.puts f
+          end
+        end  
+      rescue => e
+        p e.class
+        puts e.message
+      end    
       out.close if out
     end    
 

data/run_mkcat.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+curdir=$(dirname $0)
+bundle exec ruby $curdir/exe/mkcat "$@"
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diskcatalog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies: []
 description: Create disk catalog.
 email:
@@ -16,6 +16,7 @@ email:
 executables:
 - catalogsearch.cmd
 - diskcatalog
+- mkcat
 extensions: []
 extra_rdoc_files: []
 files:
@@ -25,13 +26,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- build.sh
+- catalogrc
 - diskcatalog.gemspec
 - exe/catalogsearch.cmd
 - exe/diskcatalog
+- exe/mkcat
 - lib/diskcatalog.rb
+- lib/diskcatalog/my_find.rb
 - lib/diskcatalog/version.rb
-- run_diskcatalog.cmd
-- run_diskcatalog.sh
+- run_mkcat.cmd
+- run_mkcat.sh
 - sig/diskcatalog.rbs
 homepage: https://github.com/src256
 licenses:
@@ -55,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Create disk catalog.

data/run_diskcatalog.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-curdir=$(dirname $0)
-bundle exec ruby $curdir/exe/diskcatalog "$@"