qdumpfs.rb in qdumpfs-1.6.0

- old
+ new

@@ -66,12 +66,12 @@
       end
       begin
         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
         exit
       ensure
@@ -102,12 +102,13 @@
     end
     
     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
       @error_files.each do |filename, reason|
         msg = "#{i}. #{filename}\t#{reason}\n"
@@ -134,11 +135,11 @@
       return if @opt.dry_run
       case type
       when "directory"
         FileUtils.mkpath(today)
       when "unchanged"
-        File.force_link(latest, today)
+        link(latest, today)
       when "updated"
         copy(src, today)
       when "new_file"
         copy(src, today)
       when "symlink"
@@ -309,11 +310,12 @@
       #####  オリジナルのバックアップルーチン
       @opt.validate_directories(2)
       
       log("##### backup start #####")
       
-      @written_bytes = 0
+      @write_bytes = 0
+      @link_bytes = 0
       @error_files = []
       start_time = Time.now
       if @opt.backup_at
         start_time = to_time(@opt.backup_at)
       end
@@ -360,10 +362,11 @@
     def sync
       #####  バックアップフォルダの同期ルーチン(バックアップディスクを他のディスクと同じ状態にする)
       @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
       
       # 制限時間まで繰り返す(指定がない場合1回で終了)