diskcatalog 0.2.0 → 0.9.0

data/diskcatalog.iml

@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library name="minitest (vbundled(5.19.0)) [path][gem]" type="rubylib">
+        <properties>
+          <option name="version" value="4" />
+        </properties>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.19.0/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.19.0/test" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.19.0/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.19.0/test" />
+        </SOURCES>
+        <excluded>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/minitest-5.19.0/test" />
+        </excluded>
+      </library>
+    </orderEntry>
+    <orderEntry type="module-library">
+      <library name="rake (vbundled(13.0.6)) [path][gem]" type="rubylib">
+        <properties>
+          <option name="version" value="4" />
+        </properties>
+        <CLASSES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.0.6/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.0.6/exe" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.0.6/lib" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.0.6/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.0.6/exe" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.0.6/lib" />
+        </SOURCES>
+        <excluded>
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.0.6/doc" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/3.1.0/gems/rake-13.0.6/exe" />
+        </excluded>
+      </library>
+    </orderEntry>
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.10, rbenv: 3.1.4) [gem]" level="application" />
+  </component>
+  <component name="RakeTasksCache">
+    <option name="myRootTask">
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build diskcatalog-0.3.0.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl id="build">
+            <subtasks>
+              <RakeTaskImpl description="Generate SHA512 checksum if diskcatalog-0.3.0.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install diskcatalog-0.3.0.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install diskcatalog-0.3.0.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.3.0 and build and push diskcatalog-0.3.0.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run tests" fullCommand="test" id="test" />
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
+    </option>
+  </component>
+</module>

data/exe/{diskcatalog → dcatc}

@@ -2,4 +2,4 @@
 
 require "diskcatalog"
 
-Diskcatalog::Command.run(ARGV)
+Diskcatalog::CreateCommand.run(ARGV)

data/exe/{mkcat → dcats}

@@ -2,4 +2,4 @@
 
 require "diskcatalog"
 
-Diskcatalog::Command.run(ARGV)
+Diskcatalog::SearchCommand.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.2.0"
+  VERSION = "0.9.0"
 end

data/lib/diskcatalog.rb

@@ -1,15 +1,20 @@
 # frozen_string_literal: true
 
+require_relative "diskcatalog/my_find"
 require_relative "diskcatalog/version"
 
-require 'find'
 require 'optparse'
 require 'fileutils'
 require 'yaml'
 
+
+
 module Diskcatalog
+  DEF_CONFIG = File.expand_path("~/.catalogrc")
+  SEARCH_CMD = "rg"
+
   class Error < StandardError; end
-  
+ 
   class Config
     CATALOGDIR = File.expand_path("~/.catalog")
 
@@ -46,22 +51,72 @@ module Diskcatalog
     attr_accessor :catalogdir
   end
 
-
   class Option
-    def initialize(opts, dirs, config)
+    def initialize(opts, argv, config)
       @opts = opts
-      @dir = dirs[0] if dirs.size > 0
+      @argv = argv
       @config = config
-      @debug = @opts[:d] 
+      @debug = @opts[:d]
+      @list = false
+      if @opts[:l]
+        @list = true
+      end
+    end
+    attr_reader :debug, :list
+    def catalogdir
+      @config.catalogdir
+    end
+  end
+
+  class CreateOption < Option
+    def initialize(opts, argv, config)
+      super
+      @dir = nil
+      if argv.size > 0 && FileTest.directory?(argv[0])
+       @dir = argv[0]
+      end
+
       @output = @opts[:o]
-      @output_files = File.join(config.catalogdir, @output + '.files')
-      @output_info = File.join(config.catalogdir, @output + '.info')
-      @debug = true
+      if @output
+        @output_files = File.join(catalogdir, @output + '.files')
+        @output_info = File.join(catalogdir, @output + '.info')
+      end
     end
-    attr_reader :dir, :debug, :output, :output_files, :output_info
+    attr_reader :dir, :search, :debug, :output, :output_files, :output_info
+  end
+
+  class SearchOption < Option
+    def initialize(opts, argv, config)
+      super
+      @search = nil
+      if argv.size > 0
+        @search = argv[0]
+      end
+    end
+    attr_reader :search
   end
 
   class Command
+    def self.load_yaml(config_file)
+      config_file ||=  DEF_CONFIG
+      config_file = File.expand_path(config_file)
+      puts "Config: #{config_file}"
+      yaml = nil
+      if FileTest.file?(config_file)
+        yaml = YAML.load_file(config_file)
+      end
+      Config.create_from_yaml(yaml)
+    end
+
+    def list
+      puts "List catalog in #{@opt.catalogdir}"
+      Dir.glob(File.join(@opt.catalogdir, "*.info")).each do |path|
+        puts File.basename(path)
+      end
+    end
+  end
+
+  class CreateCommand < Command
     def self.run(argv)
       STDOUT.sync = true
       opts = {}
@@ -76,30 +131,23 @@ 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('-l', '--list') {|v| opts[:l] = v}
       opt.parse!(argv)
-      if opts[:o].nil?
-	      puts opt.help
-	      exit
-      end
-      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)
+      # if opts[:o].nil?
+	    #   puts opt.help
+	    #   exit
+      # end
+      config = load_yaml(opts[:c])
+      option = CreateOption.new(opts, argv, config)
       begin
-	      command = Command.new(option)
+	      command = CreateCommand.new(option)
 	      command.run
       rescue => e
+        puts e.message
 	      if option.debug
-          p e.message
-          p e.backtrace
+          puts e.backtrace
 	      end
 	      puts opt.help
-	      exit
       end
     end
 
@@ -108,27 +156,41 @@ module Diskcatalog
     end
 
     def run
-      puts @opt.dir
-
-      make_files
-      make_info
+      if @opt.list
+        list
+      else
+        unless @opt.dir
+          raise "directory is not specified"
+        end
+        make_files
+        make_info
+      end
     end
 
     private
     def make_files
+      puts "Create catalog for #{@opt.dir}"
       unless FileTest.directory?(@opt.dir)
 	       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
+      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
+        puts e.message
+        if option.debug
+          p e.backtrace
         end
-      end      
+        p e.class
+      end
       out.close if out
     end    
 
@@ -139,4 +201,50 @@ module Diskcatalog
       out.close if out
     end
   end
+
+  class SearchCommand < Command
+    def self.run(argv)
+      STDOUT.sync = true
+      opts = {}
+      opt = OptionParser.new(argv)
+      opt.version = VERSION
+      opt.banner = "Usage: #{opt.program_name} [options] <directory>"
+      opt.separator('Options')
+      opt.on_head('-h', '--help', 'show this message') do |v|
+        puts opt.help
+        exit
+      end
+      opt.on('-v', '--verbose', 'verbose message') {|v| opts[:v] = v}
+      opt.on('--config=CONFIGFILE', 'Config file') {|v| opts[:c] = v }
+      opt.parse!(argv)
+      config = load_yaml(opts[:c])
+      option = SearchOption.new(opts, argv, config)
+      begin
+        command = SearchCommand.new(option)
+        command.run
+      rescue => e
+        puts e.message
+        if option.debug
+          p e.backtrace
+        end
+        puts opt.help
+      end
+    end
+
+    def initialize(option)
+      @opt = option
+    end
+
+    def run
+      if @opt.list
+        list
+      else
+        search
+      end
+    end
+
+    def search
+      system("#{SEARCH_CMD} #{@opt.search} #{@opt.catalogdir}")
+    end
+  end
 end

data/run_dcatc.cmd

@@ -0,0 +1,5 @@
+@echo off
+
+call uru 305p211
+
+bundle exec ruby exe/dcatc %*

data/run_dcatc.sh

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

data/run_dcats.cmd

@@ -0,0 +1,5 @@
+@echo off
+
+call uru 305p211
+
+bundle exec ruby exe/dcats %*

data/run_dcats.sh

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

metadata

@@ -1,42 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: diskcatalog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.9.0
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies: []
 description: Create disk catalog.
 email:
 - src@srcw.net
 executables:
 - catalogsearch.cmd
-- diskcatalog
-- mkcat
+- dcatc
+- dcats
 extensions: []
 extra_rdoc_files: []
 files:
+- ".idea/.gitignore"
+- ".idea/misc.xml"
+- ".idea/vcs.xml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- build.cmd
 - build.sh
 - catalogrc
+- data/.gitignore
+- data/ext.files
 - diskcatalog.gemspec
+- diskcatalog.iml
 - exe/catalogsearch.cmd
-- exe/diskcatalog
-- exe/mkcat
+- exe/dcatc
+- exe/dcats
 - lib/diskcatalog.rb
+- lib/diskcatalog/my_find.rb
 - lib/diskcatalog/version.rb
-- run_mkcat.cmd
-- run_mkcat.sh
+- pkg/diskcatalog-0.1.0.gem
+- pkg/diskcatalog-0.2.0.gem
+- pkg/diskcatalog-0.3.0.gem
+- run_dcatc.cmd
+- run_dcatc.sh
+- run_dcats.cmd
+- run_dcats.sh
 - sig/diskcatalog.rbs
+- test_diskcatalog.cmd
 homepage: https://github.com/src256
 licenses:
 - MIT

data/run_mkcat.sh

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