file-digests 0.0.10 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a167cb6f59c4cdae02d1a84636e81a2a2deab97f1f23f6c9a47a3ff875da554
-  data.tar.gz: 193fb14076bfb7bc66928bbb4d1b6c4ff58c8c9ec9ba3d22bfcbda74960b9416
+  metadata.gz: 573cd697002f30d083625d586b4d03caf8c0f2cb763bed75e2bc9ac0a8b03612
+  data.tar.gz: 7cfbef9cdf7a9110c6b84b27591a498960515842675fabf6bf5512a78d7e54bc
 SHA512:
-  metadata.gz: 20cfd65569fc3919ba8957ced4afca0572044c745a3d31f14f64872ea267599a911bb9e9f2ac203f25d1069c6bc50d4d24600a779d42f49e91a39f701eeaeee6
-  data.tar.gz: d6cee295615ce3ae115c20fde66533e547148ba7626ebcbc78bf30e6cd5e2d5b3f391ca4068f50e79892ae695636a00c0395f63226a6d9cf5ba4de9d27bcff24
+  metadata.gz: 4916e667dccfb630a31fdaa74271a9c85a5f28a81f28143a4f5b406784e0e78652a29ff8e3fd9ff6507a5d90a4d9baacd2385f7de169f2c9dda6dc0f3b58866b
+  data.tar.gz: be5ae679122bbcffc703940b113e8d1e1057e46f7ce61ead1f52664f6b147bbd9c201d56b7faeafef29da30297cfde2e40f38c8e9400d615b9bbc6e630557259

data/lib/file-digests.rb

@@ -8,32 +8,9 @@ require 'sqlite3'
 
 module FileDigests
 
-  def self.ensure_dir_exists path
-    if File.exist?(path)
-      unless File.directory?(path)
-        raise "#{path} is not a directory"
-      end
-    else
-      FileUtils.mkdir_p path
-    end
-  end
-
-  def self.measure_time
-    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    yield
-    elapsed = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start).to_i
-    puts "Elapsed time: #{elapsed / 3600}h #{(elapsed % 3600) / 60}m #{elapsed % 60}s" unless QUIET
-  end
-
-  def self.patch_path_string path
-    Gem.win_platform? ? path.gsub(/\\/, '/') : path
-  end
-
   def self.perform_check
-    files_path = Pathname.new patch_path_string(ARGV[0] || ".")
-    digest_database_path = Pathname.new patch_path_string(ARGV[1]) if ARGV[1]
-    checker = Checker.new files_path, digest_database_path
-    checker.check
+    checker = Checker.new ARGV[0], ARGV[1]
+    checker.perform_check
   end
 
   class DigestDatabase
@@ -154,27 +131,37 @@ module FileDigests
 
   class Checker
     def initialize files_path, digest_database_path
-      @counters = {good: 0, updated: 0, new: 0, missing: 0, renamed: 0, likely_damaged: 0, exceptions: 0}
-      @files_path = files_path
+      @files_path = cleanup_path(files_path || ".")
       @prefix_to_remove = @files_path.to_s + '/'
 
-      unless digest_database_path
-        digest_database_path = @files_path + '.file-digests.sqlite'
+      raise "Files path must be a readable directory" unless (File.directory?(@files_path) && File.readable?(@files_path))
+
+      @digest_database_path = if digest_database_path
+        cleanup_path(digest_database_path)
+      else
+        @files_path + '.file-digests.sqlite'
+      end
+
+      if File.directory?(@digest_database_path)
+        @digest_database_path = @digest_database_path + '.file-digests.sqlite'
+      end
+
+      if @files_path == @digest_database_path.dirname
         @skip_file_digests_sqlite = true
       end
 
-      FileDigests::ensure_dir_exists @files_path
-      FileDigests::ensure_dir_exists digest_database_path.dirname
+      ensure_dir_exists @digest_database_path.dirname
 
-      if File.exist?(digest_database_path.dirname + '.file-digests.sha512')
+      if File.exist?(@digest_database_path.dirname + '.file-digests.sha512')
         @use_sha512 = true
       end
 
-      @digest_database = DigestDatabase.new digest_database_path
+      @digest_database = DigestDatabase.new @digest_database_path
+      @counters = {good: 0, updated: 0, new: 0, missing: 0, renamed: 0, likely_damaged: 0, exceptions: 0}
     end
 
-    def check
-      FileDigests::measure_time do
+    def perform_check
+      measure_time do
         walk_files do |filename|
           process_file filename
         end
@@ -189,11 +176,7 @@ module FileDigests
       puts @counters.inspect
     end
 
-    def walk_files
-      Dir.glob(@files_path + '**' + '*', File::FNM_DOTMATCH) do |filename|
-        yield filename
-      end
-    end
+    private
 
     def process_file filename
       return if File.symlink? filename
@@ -210,20 +193,46 @@ module FileDigests
       return if stat.socket?
 
       if @skip_file_digests_sqlite
-        return if filename == '.file-digests.sqlite'
-        return if filename == '.file-digests.sqlite-wal'
-        return if filename == '.file-digests.sqlite-shm'
+        basename = File.basename(filename)
+        return if basename == '.file-digests.sha512'
+        return if basename == '.file-digests.sqlite'
+        return if basename == '.file-digests.sqlite-wal'
+        return if basename == '.file-digests.sqlite-shm'
       end
 
       @digest_database.insert_or_update(
-        filename.delete_prefix(@prefix_to_remove).unicode_normalize(:nfkc),
+        filename.delete_prefix(@prefix_to_remove).encode('utf-8', universal_newline: true).unicode_normalize(:nfkc),
         stat.mtime.utc.strftime('%Y-%m-%d %H:%M:%S'),
         get_file_digest(filename),
         @counters
         )
     rescue => exception
       @counters[:exceptions] += 1
-      STDERR.puts "EXCEPTION: #{filename}: #{exception.message}"
+      STDERR.puts "EXCEPTION: #{filename.encode('utf-8', universal_newline: true)}: #{exception.message}"
+    end
+
+    def patch_path_string path
+      Gem.win_platform? ? path.gsub(/\\/, '/') : path
+    end
+
+    def cleanup_path path
+      Pathname.new(patch_path_string(digest_database_path)).cleanpath
+    end
+
+    def ensure_dir_exists path
+      if File.exist?(path)
+        unless File.directory?(path)
+          raise "#{path} is not a directory"
+        end
+      else
+        FileUtils.mkdir_p path
+      end
+    end
+
+    def walk_files
+      Dir.glob(@files_path + '**' + '*', File::FNM_DOTMATCH) do |filename|
+        yield filename
+      end
     end
 
     def get_file_digest filename
@@ -237,5 +246,12 @@ module FileDigests
       end
     end
 
+    def measure_time
+      start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      yield
+      elapsed = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - start).to_i
+      puts "Elapsed time: #{elapsed / 3600}h #{(elapsed % 3600) / 60}m #{elapsed % 60}s" unless QUIET
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file-digests
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.15
 platform: ruby
 authors:
 - Stanislav Senotrusov