file-digests 0.0.37 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27e992f2a4849569d6c87e53807ebdc53676b3e47ca2c1efd2799927fd16d0c7
-  data.tar.gz: 9e292709b7978d906b0423a980cc72b23f8a44c665f070d71f30953ccdc59256
+  metadata.gz: 1a7193a9795eb785cd22a7663fa4dae908d3349b854be8d3613750f24ce6b711
+  data.tar.gz: 32a8172cc7115240f5954b7e4775f841ddce10102c7e48e184690d2643e7a476
 SHA512:
-  metadata.gz: c80f844d16255d9437c8dd012eff010df23f5a14d87336bf987b34e913a12fa0932fd85e18760884c63d10f882041afecf77b0b354555cef62aadc98de5ba091
-  data.tar.gz: f5f5c8309b8921f034edeb36643cab34dff52e4091cd5508462294a48e79002dfdbdf09a126988449d1775d207651579ca19ffb7cd169038fe71067dabb5b8af
+  metadata.gz: 584a6fc4c10e6a33d9e55d9647abcfce913fa18b046eddf7193807408d7ac4167b1b7114aa300531426e767668841f483ad66775bf7f492ff552f290d19f6e2a
+  data.tar.gz: 877dea6a6ba8f3ab091ed6d5b0379090a60cff4477ad9d4409fa9fef9674bd39b9134682ac534d49535a21ed58382b02088fa00f83524d31add7c23919e9c0c4

data/lib/file-digests.rb

@@ -140,13 +140,13 @@ 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))
+    @files_path = realpath_with_disk @files_path
 
     @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
-
+    @digest_database_path = realdirpath_with_disk @digest_database_path
     @digest_database_files = ["#{@digest_database_path}", "#{@digest_database_path}-wal", "#{@digest_database_path}-shm"]
 
     if @options[:verbose]
@@ -273,7 +273,7 @@ class FileDigests
       perhaps_transaction(@new_digest_algorithm, :exclusive) do
         @counters = {good: 0, updated: 0, renamed: 0, likely_damaged: 0, exceptions: 0}
 
-        walk_files do |filename|
+        walk_files(@files_path.to_s) do |filename|
           process_file filename
         end
 
@@ -340,9 +340,11 @@ class FileDigests
   private
 
   def process_file filename
-    return if File.symlink? filename
+    perhaps_nt_filename = perhaps_nt_path filename
+
+    return if File.symlink? perhaps_nt_filename
 
-    stat = File.stat filename
+    stat = File.stat perhaps_nt_filename
 
     return if stat.blockdev?
     return if stat.chardev?
@@ -359,7 +361,7 @@ class FileDigests
 
     normalized_filename = filename.delete_prefix("#{@files_path.to_s}/").encode("utf-8", universal_newline: true).unicode_normalize(:nfkc)
     mtime_string = time_to_database stat.mtime
-    digest, new_digest = get_file_digest(filename)
+    digest, new_digest = get_file_digest(perhaps_nt_filename)
 
     nested_transaction do
       new_digests_insert(normalized_filename, new_digest) if new_digest
@@ -542,6 +544,22 @@ class FileDigests
 
   # Filesystem-related helpers
 
+  def realpath_with_disk path
+    path = path.realpath
+    if Gem.win_platform? && path.to_s[0] == "/"
+      return Pathname(Dir.pwd[0, 2] + path.to_s)
+    end
+    path
+  end
+
+  def realdirpath_with_disk path
+    path = path.realdirpath
+    if Gem.win_platform? && path.to_s[0] == "/"
+      return Pathname(Dir.pwd[0, 2] + path.to_s)
+    end
+    path
+  end
+
   def patch_path_string path
     Gem.win_platform? ? path.gsub(/\\/, "/") : path
   end
@@ -560,10 +578,28 @@ class FileDigests
     end
   end
 
-  def walk_files
-    puts "Gathering the list of files..." if @options[:verbose]
-    Dir.glob(@files_path + "**" + "*", File::FNM_DOTMATCH) do |filename|
-      yield filename
+  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)
+        else
+          yield item
+        end
+      else
+        STDERR.puts "ERROR: Directory entry is not readable: #{item}"
+        @counters[:exceptions] += 1
+      end
+    end
+  end
+
+  def perhaps_nt_path path
+    if Gem.win_platform?
+      "\\??\\#{path.gsub(/\//,"\\")}"
+    else
+      path
     end
   end
 

metadata

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