bdsync 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bef8cde7cd361296d1aedf0e364c43f4457d4a6b1cf6ef5c82703861b9569cb
-  data.tar.gz: 3c8d7931ad7a790a93ea75d936f510eaa33229248367fa980b318a2452cb06e1
+  metadata.gz: 1aeb789488a7670229fa4a2934989b606fa2ef25434ff47e43f3ac3e427dfd8a
+  data.tar.gz: e9ddef916d834bb0bd04b2bb390eba73563ba9e54780100bddf060a04b610650
 SHA512:
-  metadata.gz: 3400a2f2ef46c789d8cd4d4354fa64e28ee38b9d00a941c6c837645605d284b8f5e31e5b02cc5709ce42bfa67d6c134c964d9a6af5cabbecc975e915405e320c
-  data.tar.gz: 19e5a4affe4aad906f3722809fedb1a23dd71dc4e0d1c8fa2b8935d28976cb1cdd478e85b0c72fb90877a283953a830795ae2c40a8a74bbdf5fefc5e31c41f7b
+  metadata.gz: fc8b863ee0ad9ef4ba5f5a6e84e1fe5ee4d9aaf807448a25c7cad0d74450a201fdeb10676a325810b6550b1dfd4b8cd95e925a6f982ba75b2fad1e1d8eada2a0
+  data.tar.gz: 141a974e6ad5187e5509f769a7f5bd2b644b0bb908748cde83cb3e492a83bafab02d1d8ea746ff9d2692f9ebbbb8be1d84f5c197f37ed7fa77ac4e3abaec568d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bdsync (2.1.2)
+    bdsync (2.2.0)
       colorize (~> 0.8)
       net-sftp (~> 2.1)
 

data/lib/bdsync/core.rb

@@ -173,8 +173,12 @@ module Bdsync
                     download_file local_path, remote_path
                     update_file_data relative_path, local_path, remote.mtime
                 else
-                    handle_local_conflict local_path
-                    download_file local_path, remote_path
+                    # compare file contents, conflict if not equal
+                    if !is_same_contents local_path, remote_path
+                        handle_local_conflict local_path
+                        download_file local_path, remote_path
+                    end
+
                     update_file_data relative_path, local_path, remote.mtime
                 end
             when :directory
@@ -202,8 +206,12 @@ module Bdsync
                     remote = upload_file local_path, remote_path
                     update_file_data relative_path, local_path, remote.mtime
                 else
-                    handle_remote_conflict remote_path
-                    remote = upload_file local_path, remote_path
+                    # compare file contents, conflict if not equal
+                    if !is_same_contents local_path, remote_path
+                        handle_remote_conflict remote_path
+                        remote = upload_file local_path, remote_path
+                    end
+
                     update_file_data relative_path, local_path, remote.mtime
                 end
             when :directory
@@ -260,12 +268,20 @@ module Bdsync
                         update_file_data relative_path, local_path, remote.mtime
                     else
                         if File.mtime(local_path).to_i > remote.mtime
-                            handle_remote_conflict remote_path
-                            remote = upload_file local_path, remote_path
+                            # compare file contents, conflict if not equal
+                            if !is_same_contents local_path, remote_path
+                                handle_remote_conflict remote_path
+                                remote = upload_file local_path, remote_path
+                            end
+
                             update_file_data relative_path, local_path, remote.mtime
                         else
-                            handle_local_conflict local_path
-                            download_file local_path, remote_path
+                            # compare file contents, conflict if not equal
+                            if !is_same_contents local_path, remote_path
+                                handle_local_conflict local_path
+                                download_file local_path, remote_path
+                            end
+
                             update_file_data relative_path, local_path, remote.mtime
                         end
                     end
@@ -339,12 +355,20 @@ module Bdsync
                         update_file_data relative_path, local_path, remote.mtime
                     else
                         if File.mtime(local_path).to_i > remote.mtime
-                            handle_remote_conflict remote_path
-                            remote = upload_file local_path, remote_path
+                            # compare file contents, conflict if not equal
+                            if !is_same_contents local_path, remote_path
+                                handle_remote_conflict remote_path
+                                remote = upload_file local_path, remote_path
+                            end
+
                             update_file_data relative_path, local_path, remote.mtime
                         else
-                            handle_local_conflict local_path
-                            download_file local_path, remote_path
+                            # compare file contents, conflict if not equal
+                            if !is_same_contents local_path, remote_path
+                                handle_local_conflict local_path
+                                download_file local_path, remote_path
+                            end
+
                             update_file_data relative_path, local_path, remote.mtime
                         end
                     end
@@ -437,5 +461,11 @@ module Bdsync
         def local_ensure_parent path
             local_ensure_dir File.dirname path
         end
+
+        def is_same_contents local_path, remote_path
+            local_file_md5 = Utils.file_md5 local_path
+            remote_file_md5 = get_remote_file_md5 remote_path
+            local_file_md5 == remote_file_md5
+        end
     end
 end

data/lib/bdsync/lfs.rb

@@ -89,5 +89,9 @@ module Bdsync
         def remote_ensure_parent path
             local_ensure_parent path
         end
+
+        def get_remote_file_md5 path
+            Utils.file_md5 path
+        end
     end
 end

data/lib/bdsync/sftp.rb

@@ -82,5 +82,11 @@ module Bdsync
         def remote_ensure_parent path
             remote_ensure_dir File.dirname path
         end
+
+        def get_remote_file_md5 remote_path
+            puts "#{Utils.caller_info 1} sftp.session.exec! md5sum #{remote_path}".white
+            res = @sftp.session.exec! "md5sum #{remote_path}"
+            res.split[0]
+        end
     end
 end

data/lib/bdsync/utils.rb

@@ -22,6 +22,10 @@ module Bdsync
             Digest::MD5.hexdigest(s)
         end
 
+        def self.file_md5 file_path
+            Digest::MD5.file(file_path).hexdigest
+        end
+
         def self.caller_info level
             info = caller[level].match(%r{([^/]+):(\d+):in `(.+)'})
             "#{info.captures[0]}:#{info.captures[1]} - #{info.captures[2]}"

data/lib/bdsync/version.rb

@@ -1,3 +1,3 @@
 module Bdsync
-    VERSION = "2.1.2"
+    VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bdsync
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Xia Xiongjun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize