fm 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40f701f7d9cf760dfc9a76c431d47b8f1ddb031b
-  data.tar.gz: d9c4e22714f8d3b726ecb932e75889df445115db
+  metadata.gz: f65eb48c6ca670fb90fbdf816381ff87bf72952c
+  data.tar.gz: 6217ce69bb16183e8a6fb73abb17a00f0bf382ef
 SHA512:
-  metadata.gz: 1c80d0e806f342edbce81a1e5d7ecc5390cfffdbc4940c4aabc17557862c677a18ecda6e6d790125615b7ac188edabd0e82cd7519acb8e2f97b8a48649734665
-  data.tar.gz: 17a293a95dc60e18303fb4c71adf32e3896b4307dbf163780af4bf697ac242d25cf31407676e37b2215aaad8be0c0a33f611ad738bfbfae2155a9243602731e5
+  metadata.gz: 155faf79df27ffa1a79ee767622e5d600a8db246ff01e61c9004a93c9af8a0de7ee7b7f88547ba35b7f7f80876cd0b4f8df7d907e49e898fee844a62d0cd7b9e
+  data.tar.gz: d170cac39c565eca7097b51d1cc565a59622c819b3f10c2b49a46b2b5d7ceecce4351eef9b180072980d1cac6773ea925c3fb473055be3be4c79f8bfb52ae239

data/lib/fm/file.rb

@@ -4,11 +4,15 @@ module FM
         attr_reader :fsize
         attr_reader :digest
         attr_reader :path
+        attr_accessor :mtime
+        attr_accessor :itime
 
-        def initialize(fsize, path, digest)
+        def initialize(fsize, path, digest, mtime, itime = Time.now)
             @fsize = fsize
             @digest = digest
             @path = path
+            @mtime = mtime
+            @itime = itime      # Last index time.
         end
     end
 

data/lib/fm/index.rb

@@ -52,13 +52,55 @@ module FM
         nskipfiles = 0
         ndupfiles = 0
         nfailfiles = 0
+        duplist = {}
         puts "Indexing #{indexpath} ..."
         t0 = Time.now
 
+        dlist = []
+        h.each do |skey, svalue|
+            h[skey].each do |dkey, dvalue|
+                h[skey][dkey].each do |f|
+                    fsize = -1
+                    digest = ""
+                    fe = File.exists?(f.path)
+
+                    if fe && File.mtime(f.path) == f.mtime
+                        next
+                    end
+
+                    if fe
+                        fsize = File.size(f.path)
+                        digest = Digest::MD5.hexdigest(File.read(f.path))
+                    end
+                    if fsize != f.fsize || digest != f.digest
+                        dlist.push(f)
+                    end
+                end
+            end
+        end
+
+        dlist.each do |f|
+            fsize = f.fsize
+            path = f.path
+            digest = f.digest
+
+            h[fsize][digest].delete_if { |v| v.path == path }
+            if h[fsize][digest].size == 0
+                h[fsize].delete(digest)
+                if h[fsize].size == 0
+                    h.delete(fsize)
+                end
+            end
+
+            needupdate = true
+        end
+        dlist = nil
+
         for fpath in Dir.glob("#{indexpath}/**/*", File::FNM_DOTMATCH).select { |e| e.force_encoding("binary"); File.ftype(e) == "file" && has_folder?(".git", e) == false && has_folder?(".hg", e) == false }
             begin
                 fpath = File.realpath(fpath).force_encoding("binary")
                 fsize = File.size(fpath)
+                fmtime = File.mtime(fpath)
 
                 if fsize == 0
                     nskipfiles += 1
@@ -68,37 +110,34 @@ module FM
 
                 # Lazy index the file.
                 if h[fsize].nil?
-                    h[fsize] = fpath
+                    digest = Digest::MD5.hexdigest(File.read(fpath))
+                    h[fsize] = { digest => [ FMFile.new(fsize, fpath, digest, fmtime) ] }
                     needupdate = true
                     nnewfiles += 1
-                    puts "[NEW]: #{fpath} nil"
+                    puts "[NEW]: #{fpath} #{digest}"
                 else
-                    if h[fsize].is_a?(String)
-                        p = h[fsize]
-                        if p == fpath
+
+                    h[fsize].values.each do |v|
+                        if v.any? { |f| f.mtime == fmtime && f.path == fpath }
                             next
                         end
-
-                        d = Digest::MD5.hexdigest(File.read(p))
-                        h[fsize] = { d => [ FMFile.new(fsize, p, d) ] }
-                        needupdate = true
                     end
+
                     digest = Digest::MD5.hexdigest(File.read(fpath))
                     if h[fsize][digest].nil?
-                        h[fsize][digest] = [ FMFile.new(fsize, fpath, digest) ]
+                        h[fsize][digest] = [ FMFile.new(fsize, fpath, digest, fmtime) ]
                         needupdate = true
                         nnewfiles += 1
                         puts "[NEW]: #{fpath} #{digest}"
                     elsif h[fsize][digest].size == 1 && h[fsize][digest].first.path == fpath
                     else
                         ndupfiles += 1
-                        puts "[DUP]: #{fpath}"
-                        h[fsize][digest].each do |f|
-                            puts "       #{f.path}" if f.path != fpath
+                        if duplist[digest].nil?
+                            duplist[digest] = h[fsize][digest]
                         end
 
                         unless h[fsize][digest].any? { |f| f.path == fpath }
-                            fmfile = FMFile.new(fsize, fpath, digest)
+                            fmfile = FMFile.new(fsize, fpath, digest, fmtime)
                             h[fsize][digest].push(fmfile)
                             needupdate = true
                         end
@@ -109,6 +148,14 @@ module FM
                 puts "[FAIL]: file=\"#{fpath}\" #{e.message}"
             end
         end
+
+        duplist.values.each do |dup|
+            puts "[DUP]: #{dup.first.path}"
+            dup[1..-1].each do |f|
+                puts "       #{f.path}"
+            end
+        end
+
         t1 = Time.now
         puts "Indexing completed in #{(t1-t0).round(2)}s."
 

data/lib/fm/version.rb

@@ -1,3 +1,3 @@
 module FM
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - ShinYee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler