qdumpfs 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5a18d42979f9ddc74bca2e274dc76b38ab50377398497b244399e9997a693da
-  data.tar.gz: 017acf5a04a798a3eefab1626b2262a8a8fcfe5a10350b4dd8b2ac7003810c03
+  metadata.gz: 606cd6d5f9de57b340a1ac41d5e621d2f947cff5e1fce3a9ec510be72e0f0d4d
+  data.tar.gz: 073da696b6e73cd8059a246fbe18b51f09050f100bb9f7a454954921d4e5d228
 SHA512:
-  metadata.gz: 1dc38b92a65d33b0ebcf52e9db1ba9a6c0940ac7dc1e2270e86ee8f329fbceb466a490dad1f763f0caeaa72e97bfc3156873e6fd5402606e9eb5a2858c82c29f
-  data.tar.gz: 948fd22961accdd955cdb6c66b73c11548be2e6a8bc99fc41fbec23b8ba3cd82ae70df1c21d4653e4ee9cc28b5ec34b53a50b1caf227bd2240d0bef2176edab7
+  metadata.gz: 34c7c309574b3cbd00175b0e327d1df5687fa2acb84fcb3d29ff5d77adeaacfddc5f91a28de702d0aaa06e0b694ea722d00d43ed50d7b7f74d80d2f754b1027c
+  data.tar.gz: f5702a62c4b9ab44364df7c697c5d503ddccce6b946f2e7702de6783521aa05afa358df218686a90934a80af64906105068bb5cd0a77aa8fcacf597e56541436

data/Gemfile.lock

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

data/lib/qdumpfs.rb

@@ -34,11 +34,17 @@ module Qdumpfs
       }
       opt.on('-s SIZE', '--exclude-by-size=SIZE', 'exclude files larger than SIZE') {|v| opts[:es] = v }
       opt.on('-w GLOB', '--exclude-by-glob=GLOB', 'exclude files matching GLOB') {|v| opts[:ep] = v }
-      commands = ['backup', 'sync', 'list', 'expire', 'verify']
+      commands = ['backup', 'sync', 'list', 'expire', 'verify', 'delete']
       opt.on('-c COMMAND', '--command=COMMAND', commands, commands.join('|')) {|v| opts[:c] = v}
       opt.on('-l HOURS', '--limit=HOURS', 'limit hours') {|v| opts[:limit] = v}
       opt.on('-k KEEPARG', '--keep=KEEPARG', 'ex: --keep 100Y12M12W30D (100years, 12months, 12weeks, 30days, default)') {|v| opts[:keep] = v}
       opt.on('--logdir LOGDIR', 'logdir') {|v| opts[:logdir] = v}
+      opt.on('--delete-from YYYYMMDD', 'delete backup from YYYY/MM/DD') {|v|
+        opts[:delete_from] = Date.parse(v)
+      }
+      opt.on('--delete-to YYYYMMDD', 'delete backup to YYYY/MM/DD') {|v|
+        opts[:delete_to] = Date.parse(v)
+      } 
       opt.parse!(argv)
       option = Option.new(opts, ARGV)
       if opts[:v]
@@ -52,6 +58,8 @@ module Qdumpfs
         command = Command.new(option)
         command.run
       rescue => e
+#        p e.message
+#        p e.backtrace
         puts opt.help
         exit        
       end
@@ -69,13 +77,15 @@ module Qdumpfs
       elsif @opt.cmd == 'list'
         list
       elsif @opt.cmd == 'expire'
-        expire
+        delete('expire')
       elsif @opt.cmd == 'verify'
         verify
+      elsif @opt.cmd == 'delete'
+        delete('delete')
 #      elsif @opt.cmd == 'test'
 #        test
-#      else
-        raise RuntimeError, "unknown command: #{cmd}"
+      else
+        raise RuntimeError, "unknown command: #{@opt.cmd}"
       end
     end
     
@@ -439,40 +449,45 @@ module Qdumpfs
       file.close 
     end
     
-    def expire
+    def delete(cmd)
       @opt.validate_directories(1)
       
       start_time = Time.now
       limit_time = start_time + (@opt.limit_sec)
-      log("##### expire start #{fmt(start_time)} => limit_time=#{fmt(limit_time)} #####")
+      log("##### #{cmd} start #{fmt(start_time)} => limit_time=#{fmt(limit_time)} #####")
       
       @opt.dirs.each do |target_dir|
         
         target_start = Time.now        
-        expire_target_dir(target_dir)
+        delete_target_dir(cmd, target_dir)
         target_end = Time.now
         
         # 次回expireにかかる時間を最終expire時間の半分と予想
         next_expire = (target_end - target_start) / 2
         
         cur_time = Time.now
-        in_imit = (cur_time + next_expire) < limit_time
+        in_limit = (cur_time + next_expire) < limit_time
         
         log("## cur_time=#{fmt(cur_time)} + next_expire=#{next_expire} <  limit_time=#{fmt(limit_time)} in_limit=#{in_limit} ## ")
         unless in_limit
           break
         end
       end
-      
-      log("##### expire end #####")
+      log("##### #{cmd} end #####")
     end
-    
-    def expire_target_dir(target_dir)
+
+    def delete_target_dir(cmd, target_dir)
       target_dir = to_unix_path(target_dir)
       puts "<<<<< Target dir: #{target_dir} >>>>>"
       
       snapshots = BackupDir.scan_backup_dirs(target_dir)
-      @opt.detect_keep_dirs(snapshots)
+      if cmd == 'expire'
+        @opt.detect_expire_dirs(snapshots)
+      elsif cmd == 'delete'
+        @opt.detect_delete_dirs(snapshots, @opt.delete_from, @opt.delete_to) 
+      else
+        raise RuntimeError, "unknown command: #{cmd}"
+      end
       
 #      p @opt.keep_year
 #      p @opt.keep_month
@@ -527,8 +542,64 @@ module Qdumpfs
       puts "Keep dirs:"
       snapshots.each do |snapshot|
         puts snapshot.path if snapshot.keep
-      end
-      
+      end      
     end
+
+    # def delete
+    #   @opt.validate_directories(1)
+      
+    #   start_time = Time.now
+    #   limit_time = start_time + (@opt.limit_sec)      
+    #   log("##### delete start #{fmt(start_time)} => limit_time=#{fmt(limit_time)} #####")
+    #   @opt.dirs.each do |target_dir|
+    #     target_start = Time.now
+    #     delete_target_dir(target_dir)
+    #     target_end = Time.now
+        
+    #     # 次回expireにかかる時間を最終expire時間の半分と予想
+    #     next_expire = (target_end - target_start) / 2
+        
+    #     cur_time = Time.now
+    #     in_imit = (cur_time + next_expire) < limit_time
+        
+    #     log("## cur_time=#{fmt(cur_time)} + next_expire=#{next_expire} <  limit_time=#{fmt(limit_time)} in_limit=#{in_limit} ## ")
+    #     unless in_limit
+    #       break
+    #     end
+    #   end        
+    #   log("##### delete end #####")
+    # end
+
+    # def delete_target_dir(target_dir)
+    #   target_dir = to_unix_path(target_dir)
+    #   puts "<<<<< Target dir: #{target_dir} >>>>>"
+      
+    #   snapshots = BackupDir.scan_backup_dirs(target_dir)
+    #   @opt.detect_delete_dirs(snapshots)
+
+    #   snapshots.each do |snapshot|
+    #     next if snapshot.keep
+    #     t_start = Time.now
+    #     print "Deleting #{snapshot.path} ..."
+       
+    #     unless @opt.dry_run
+    #       if windows?
+    #         # Windowsの場合
+    #         win_backup_path = to_win_path(snapshot.path)
+    #         system("rmdir /S /Q #{win_backup_path}")
+    #       else
+    #         # Linux/macOSの場合
+    #         system("rm -rf #{snapshot.path}")
+    #       end
+    #     end
+    #   end
+
+    #   t_end = Time.now
+    #   diff = (t_end - t_start).to_i
+    #   diff_hours = diff / 3600
+    #   puts " done[#{diff} seconds = #{diff_hours} hours]." 
+    # end
+    
   end
+
 end

data/lib/qdumpfs/option.rb

@@ -139,12 +139,15 @@ module Qdumpfs
       @keep_month = $1.to_i if keep =~ /(\d+)M/
       @keep_week = $1.to_i if keep =~ /(\d+)W/
       @keep_day = $1.to_i if keep =~ /(\d+)D/
+      @delete_from = @opts[:delete_from]
+      @delete_to = @opts[:delete_to]      
       @today = Date.today
     end
     attr_reader :dirs, :src, :dst, :cmd
     attr_reader :keep_year, :keep_month, :keep_week, :keep_day
     attr_reader :logdir, :logpath, :verifypath
     attr_reader :logger, :matcher, :reporter, :interval_proc
+    attr_reader :delete_from, :delete_to
     
     def report(type, filename)
       if @opts[:v]
@@ -206,12 +209,25 @@ module Qdumpfs
       end
     end
     
-    def detect_keep_dirs(backup_dirs)
+    def detect_expire_dirs(backup_dirs)
       detect_year_keep_dirs(backup_dirs)
       detect_month_keep_dirs(backup_dirs)
       detect_week_keep_dirs(backup_dirs)
       detect_day_keep_dirs(backup_dirs)
     end
+
+    def detect_delete_dirs(backup_dirs, delete_from, delete_to)
+      backup_dirs.each do |backup_dir|
+        backup_dir.keep = true
+        if delete_from && backup_dir.date >= delete_from && delete_to && backup_dir.date <= delete_to
+          backup_dir.keep = false
+        elsif delete_from && backup_dir.date >= delete_from
+          backup_dir.keep = false
+        elsif delete_to && backup_dir.date <= delete_to
+          backup_dir.keep = false
+        end
+      end
+    end
     
     def open_verifyfile
       if FileTest.file?(@verifypath)

data/lib/qdumpfs/version.rb

@@ -1,3 +1,3 @@
 module Qdumpfs
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-17 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler