diskcatalog 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b472547e057c9be023aff84991ecefb6a3d85d1010e7de9d27420b3aed32f2eb
-  data.tar.gz: dbd3f42b6f63b554827007a98373c52372d3caaddcdc0e4a1a24517e78085967
+  metadata.gz: fecee62476c7ba3617e40c7508c6e89c1f7fd66f18c87b5e2b18d17b443275aa
+  data.tar.gz: ab1b8549fd18d8770b0e8919a4e2196bc0731c188b503fbbd5fa8bf76b378038
 SHA512:
-  metadata.gz: df21bf04899b92bd001afad66f84e71517012ef0e24f8bf67e605ac6d8c4f7e2416ead0fa6519f64422f60cc9b84ee8cf1b6302bce892a584f3650202bd6768c
-  data.tar.gz: 74ef4bc98b74c718040fd23642f03eb4a5e713267da7774a54f830fd72ba4f9434c374822894e8177f58015e8115d79f8717f3d73897045ced9ee8f425fc8d84
+  metadata.gz: f407c0a3853b19894ed9f99332e9c88e2e51b9ea244ac48154d87385547f663cccccd842b70c12c08881cf20c5846248250ef14271b3bf6e2ea9a048527507a8
+  data.tar.gz: 9219b5b01ab1068a8865b95ec6412e05a8f4396dca81a471996d44e455a2c2812ef0177de5cf314e27a411a7334579eaeaadd6d77d457efd70a614bb399ecb00

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    diskcatalog (0.2.0)
+    diskcatalog (0.3.0)
 
 GEM
   remote: https://rubygems.org/
@@ -10,6 +10,7 @@ GEM
     rake (13.0.6)
 
 PLATFORMS
+  arm64-darwin-22
   x64-mingw32
   x86_64-darwin-22
 

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.3.0"
 end

data/lib/diskcatalog.rb

@@ -1,15 +1,17 @@
 # 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")
 
@@ -120,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    
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diskcatalog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - src
@@ -33,6 +33,7 @@ files:
 - exe/diskcatalog
 - exe/mkcat
 - lib/diskcatalog.rb
+- lib/diskcatalog/my_find.rb
 - lib/diskcatalog/version.rb
 - run_mkcat.cmd
 - run_mkcat.sh