file-digests 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7193a9795eb785cd22a7663fa4dae908d3349b854be8d3613750f24ce6b711
-  data.tar.gz: 32a8172cc7115240f5954b7e4775f841ddce10102c7e48e184690d2643e7a476
+  metadata.gz: ac950f13dc01dc9df2f54f3ef0f5141b778b96e4bb3619859e88617561995d38
+  data.tar.gz: 90a54bcfdd87c28f831fe7675f8285131b01aabc1dca87c3446089ed20530bf5
 SHA512:
-  metadata.gz: 584a6fc4c10e6a33d9e55d9647abcfce913fa18b046eddf7193807408d7ac4167b1b7114aa300531426e767668841f483ad66775bf7f492ff552f290d19f6e2a
-  data.tar.gz: 877dea6a6ba8f3ab091ed6d5b0379090a60cff4477ad9d4409fa9fef9674bd39b9134682ac534d49535a21ed58382b02088fa00f83524d31add7c23919e9c0c4
+  metadata.gz: eac04858364ea73a555d2c1b272acca9cb78901b68b2b3dfef659f27f7b83d14c9c37a7d66f892117a7ee13aee321f2873f4f11e4cae652d09d02c3510144086
+  data.tar.gz: 385350fae26d40df014c9409d7fafa50fa6e10c2951c44c740e0e41ad547fe4d7f548245f97736850c796a01a0517d591a1431dfd9b6e7511d2d854d1e60979c

data/lib/file-digests.rb

@@ -140,9 +140,11 @@ class FileDigests
 
   def initialize_paths files_path, digest_database_path
     @files_path = cleanup_path(files_path || ".")
-    raise "Files path must be a readable directory" unless (File.directory?(@files_path) && File.readable?(@files_path))
+    raise "ERROR: Files path must be a readable directory" unless (File.directory?(@files_path) && File.readable?(@files_path))
     @files_path = realpath_with_disk @files_path
 
+    @error_log_path = @files_path + "file-digests errors #{Time.now.strftime("%Y-%m-%d %H-%M-%S")}.txt"
+
     @digest_database_path = digest_database_path ? cleanup_path(digest_database_path) : @files_path
     @digest_database_path += ".file-digests.sqlite" if File.directory?(@digest_database_path)
     ensure_dir_exist @digest_database_path.dirname
@@ -370,7 +372,7 @@ class FileDigests
 
   rescue => exception
     @counters[:exceptions] += 1
-    print_file_exception exception, filename
+    report_file_exception exception, filename
   end
 
   def process_file_indeed filename, mtime, digest
@@ -396,7 +398,7 @@ class FileDigests
     else
       if found["mtime"] == mtime && !@options[:accept_fate] # Digest is different and mtime is the same
         @counters[:likely_damaged] += 1
-        STDERR.puts "LIKELY DAMAGED: #{filename}"
+        error_text "LIKELY DAMAGED: #{filename}"
       else
         @counters[:updated] += 1
         puts "UPDATED#{" (FATE ACCEPTED)" if found["mtime"] == mtime && @options[:accept_fate]}: #{filename}" unless @options[:quiet]
@@ -532,7 +534,7 @@ class FileDigests
   def check_if_database_is_at_certain_version target_version
     current_version = get_metadata("database_version")
     if current_version != target_version
-      STDERR.puts "This version of file-digests (#{FileDigests::VERSION || "unknown"}) is only compartible with the database version #{target_version}. Current database version is #{current_version}. To use this database, please install appropriate version if file-digest."
+      STDERR.puts "ERROR: This version of file-digests (#{FileDigests::VERSION || "unknown"}) is only compartible with the database version #{target_version}. Current database version is #{current_version}. To use this database, please install appropriate version if file-digest."
       raise "Incompatible database version"
     end
   end
@@ -581,17 +583,21 @@ class FileDigests
   def walk_files(path, &block)
     Dir.each_child(path, encoding: "UTF-8") do |item|
       item = "#{path}#{File::SEPARATOR}#{item}"
-      test_item = perhaps_nt_path item
-      if File.readable?(test_item)
-        if File.directory?(test_item)
-          walk_files(item, &block)
+      item_perhaps_nt_path = perhaps_nt_path item
+      
+      unless File.symlink? item_perhaps_nt_path
+        if File.directory?(item_perhaps_nt_path)
+          if File.readable?(item_perhaps_nt_path)
+            walk_files(item, &block)
+          else
+            error_text "ERROR: Directory is not readable: #{item}"
+            @counters[:exceptions] += 1
+          end
         else
           yield item
         end
-      else
-        STDERR.puts "ERROR: Directory entry is not readable: #{item}"
-        @counters[:exceptions] += 1
       end
+
     end
   end
 
@@ -647,17 +653,31 @@ class FileDigests
     puts "Elapsed time: #{elapsed.to_i / 3600}h #{(elapsed.to_i % 3600) / 60}m #{"%.3f" % (elapsed % 60)}s" unless @options[:quiet]
   end
 
-  def print_file_exception exception, filename
-    STDERR.print "EXCEPTION: #{exception.message}, processing file: "
+  def report_file_exception exception, filename
+    write_file_exception STDERR, exception, filename
+    File.open(@error_log_path, "a") do |f|
+      write_file_exception f, exception, filename
+    end
+  end
+
+  def write_file_exception dest, exception, filename
+    dest.print "ERROR: #{exception.message}, processing file: "
     begin
-      STDERR.print filename.encode("utf-8", universal_newline: true)
+      dest.print filename.encode("utf-8", universal_newline: true)
     rescue
-      STDERR.print "(Unable to encode file name to utf-8) "
-      STDERR.print filename
+      dest.print "(Unable to encode file name to utf-8) "
+      dest.print filename
+    end
+    dest.print "\n"
+    dest.flush
+    exception.backtrace.each { |line| dest.puts "  " + line }
+  end
+
+  def error_text text
+    STDERR.puts text
+    File.open(@error_log_path, "a") do |f|
+      f.puts text
     end
-    STDERR.print "\n"
-    STDERR.flush
-    exception.backtrace.each { |line| STDERR.puts "  " + line }
   end
 
   def print_counters

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: file-digests
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
 platform: ruby
 authors:
 - Stanislav Senotrusov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl