qdumpfs 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9b8f612a400b0682abe97668be57dfac200cd82345d2e24f83db48816d4cc1f
-  data.tar.gz: e9b12b095bb6e73130332b31c4310ebfd7b6fde97443f98c9d4695db49597f8b
+  metadata.gz: 1594429d5e80a9642960701f07ca24f2acc200fa7c7d5762f45d788f5efda0f1
+  data.tar.gz: 954c39775382b64539ad80cebc613f09dddfd8c23feeaff5e9a9f153ad6dfd9c
 SHA512:
-  metadata.gz: b06e0c654dff2be9ed4833f6c1ff64b5609d684aded51a418ca59d46c26efe2c074fbef13e1c3af260e93b18136a940e4870ed2152ea2e29179378361eb978fb
-  data.tar.gz: 5eea2de28c689f00c664cc285bdec6929bbb39e021e8ae9eddfb3d5c2406e1aef156623dfbb17edbe19a4b57fa95f3af624a281cba04c093cb1fb19eb0f36ecb
+  metadata.gz: daa758f9b2486038f1fd668ae321af249606a4e836fe0223e28738f4c9011ff5a30dcbcb9b350e6e65873f37dea70d26cd7f0485277815eacba42fd1dc7043a2
+  data.tar.gz: 10dbb763cf7e3969cc344d34ce42d70403fceee304b253ad055a250676b63c34c50cd1238e9684c404cfdff7f2dda272726615496e498235d34bc6b01d53eca5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    qdumpfs (1.5.2)
+    qdumpfs (1.6.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/qdumpfs/util.rb

@@ -116,7 +116,7 @@ module QdumpfsUtils
             block = r.sysread(block_size)
             w.syswrite(block)
             i += 1
-            @written_bytes += block.size
+            @write_bytes += block.size
           end
         }
       }
@@ -136,7 +136,12 @@ module QdumpfsUtils
     File.utime(stat.atime, stat.mtime, dest)
     File.chmod(stat.mode, dest) # not necessary. just to make sure
   end
-  
+
+  def link(src, dest)
+    @link_bytes += File.size(src)
+    File.force_link(src, dest)
+  end
+    
   def convert_bytes(bytes)
     if bytes < 1024
       sprintf("%dB", bytes)

data/lib/qdumpfs/version.rb

@@ -1,4 +1,4 @@
 module Qdumpfs
-  VERSION = "1.5.2"
+  VERSION = "1.6.0"
 end  
   

data/lib/qdumpfs.rb

@@ -68,8 +68,8 @@ module Qdumpfs
         command = Command.new(option)
         command.run
       rescue => e
+        puts e.message + "\n"
         if option.debug
-          p e.message
           p e.backtrace
         end
         puts opt.help
@@ -104,8 +104,9 @@ module Qdumpfs
     private
     def log_result(src, today, elapsed)
       time  = Time.now.strftime("%Y-%m-%dT%H:%M:%S")
-      bytes = convert_bytes(@written_bytes)
-      msg = sprintf("%s: %s -> %s (in %.2f sec, %s written)\n", time, src, today, elapsed, bytes)
+      write_bytes = convert_bytes(@write_bytes)
+      link_bytes = convert_bytes(@link_bytes)
+      msg = sprintf("%s: %s -> %s (in %.2f sec, %s write, %s link)\n", time, src, today, elapsed, write_bytes, link_bytes)
       log(msg)
       log("error files:\n")
       i = 1
@@ -136,7 +137,7 @@ module Qdumpfs
       when "directory"
         FileUtils.mkpath(today)
       when "unchanged"
-        File.force_link(latest, today)
+        link(latest, today)
       when "updated"
         copy(src, today)
       when "new_file"
@@ -275,7 +276,7 @@ module Qdumpfs
       log("sync_latest src=#{src} latest=#{latest} today=#{today}")
 
       if latest
-        log("update_snapshot #{src} #{latest} #{today}")
+        log("update_snapshot src=#{src} latest=#{latest} today=#{today}")
         # バックアップがすでに存在する場合差分コピー
         update_snapshot(src, latest, today)
       else
@@ -311,7 +312,8 @@ module Qdumpfs
       
       log("##### backup start #####")
       
-      @written_bytes = 0
+      @write_bytes = 0
+      @link_bytes = 0
       @error_files = []
       start_time = Time.now
       if @opt.backup_at
@@ -362,7 +364,8 @@ module Qdumpfs
       @opt.validate_directories(2)
       
       start_time = Time.now
-      @written_bytes = 0
+      @write_bytes = 0
+      @link_bytes = 0
       @error_files = []
       src = @opt.src
       dst = @opt.dst

data/run_sync.cmd

@@ -2,5 +2,5 @@
 
 call uru 306p216
 
-bundle exec ruby exe/qdumpfs  -d --command sync --keep=2Y0M1W0D r:/pc1/pdumpfs/opt v:/pc1/pdumpfs/opt
+bundle exec ruby exe/qdumpfs  -d --command sync --keep=2Y0M0W0D r:/pc1/pdumpfs/opt v:/pc1/pdumpfs/opt
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - src
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler