qdumpfs 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4d28c42fc54a4ba9ba806aa57c056774889663cfa011d1cb8ff6d259a3368b
-  data.tar.gz: fcfa95f0abdbaf1a8b571cf088fa83811e1984f4bd7bcd1283e68bdad3ce894b
+  metadata.gz: bc8d8dec60fe04598e9dd5bea8528f5299a7cbb7ee0f0432c3b6d46488917edf
+  data.tar.gz: '029dffccca2865524f208d28f2ebe2f63b2de465e0a5f08de93c597156fd48a9'
 SHA512:
-  metadata.gz: d1af10ef6521b9f775a538dc666e06f4cc4222131413144c8eacd59d795242890db306411e34076b041ac356b0a2e6a0c74c50cf221e01550caf0b18260bd738
-  data.tar.gz: 68351bac00ffe057beb25433f5d158c74814a2a20efa43cd15a8a608cc800f5655b6f41be2b1292e8ebc1b7b63e43f01add315daaa3503d047f4139e7dbf4848
+  metadata.gz: 9c393b76dddd9978adf5dfc77cfb25f3c14bfb9b1aca0767228b8b4c70fdf11206f4a35c9e0f5098b1c7ba1e3b113dc8f51de3ad14b48d39fe1dff8dd21309f1
+  data.tar.gz: 054605d2b4f91e2c0fdbd0518614b81a9f04f0ba378f0d92c5aba28c59456ae88c40dfb156579295c10130c248fc314197bd03398f18435cd1e0596696f444f2

data/Gemfile.lock

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

data/README.md

@@ -1,13 +1,14 @@
 # Qdumpfs
 
-qdumpfs is a modified version of pdumpfs.
+pdumpfsの個人的改良版です。
 
-## Installation
+Gem化して最近のバージョンのバージョンのRubyに対応。コマンドの拡張などを行っています。
 
-gem install qdumpfs
+## インストール
 
-## Usage
+gem install qdumpfs
 
+## 使用方法
 
 ```
 Usage: qdumpfs [options] <source> <dest>
@@ -19,48 +20,53 @@ Options
     -e, --exclude=PATTERN            exclude files/directories matching PATTERN
     -s, --exclude-by-size=SIZE       exclude files larger than SIZE
     -w, --exclude-by-glob=GLOB       exclude files matching GLOB
-    -c, --command=COMMAND            backup|sync|list|expire|verify|test
+    -c, --command=COMMAND            backup|sync|list|expire|verify|delete
     -l, --limit=HOURS                limit hours
     -k, --keep=KEEPARG               ex: --keep 100Y12M12W30D (100years, 12months, 12weeks, 30days, default)
 ```
 
-## Example
+## 実行例
+
+
+バックアップを実行する場合。
 
-Backup your home directory, run the following command.
 ```
 qdumpfs /home/foo /backup
 ```
 
-You can specify command option(default is "backup").
+"--command backup"オプションを明示することもできます。
+
 ```
 qdumpfs --command=backup /home/foo /backup
 ```
 
-Sync two backup directories.
+"--command sync"でバックアップフォルダを同期できます。
 ```
 qdumpfs --command=sync /backup1 /backup2
 ```
 
-Sync two backup directories(limit 1 hours, keep 100Y12M12W30D).
+バックアップフォルダの同期には膨大な時間が必要な場合があるため、実行時間を制限できます。以下は例えば1時間に制限する場合です。
 ```
 qdumpfs --command=sync --limit=1 /backup1 /backup2
 ```
 
-Sync two backup directories(limit 1 hours, keep specified backups only).
+バックアップフォルダの同期で、1時間でかつ"100Y12M12W30D"を保存する場合のオプションです。
 ```
-qdumpfs --command=sync --limit=1 --keep=5Y6M7W10D --keep/backup1 /backup2
+qdumpfs --command=sync --limit=1 --keep=5Y6M7W10D backup1 /backup2
 ```
 
-Expire backup directory.
+"--command expire"で、"--keep="パターンに該当しないバックアップを削除できます。
 ```
-qdumpfs --command=expire --limit=1 --keep=5Y6M7W10D --keep/backup1 /backup2
+qdumpfs --command=expire --limit=1 --keep=5Y6M7W10D backup1 /backup2
 ```
 
+"--command delete"で、バックアップに存在する指定したパスを削除できます(間違えてバックアップした内容を削除したい場合などに使用)。
+```
+qdumpfs --command=delete --delete-dir=backup1 --limit=1  r:/backup2
+```
 
 ## License
 
 qdumpfs is a free software with ABSOLUTELY NO WARRANTY under the terms of the GNU General Public License version 2.
 
 
-
-

data/lib/qdumpfs.rb

@@ -45,6 +45,9 @@ module Qdumpfs
       opt.on('--delete-to=YYYYMMDD', 'delete backup to YYYY/MM/DD') {|v|
         opts[:delete_to] = Date.parse(v)
       }
+      opt.on('--delete-dir=DIRS', 'relative path from the snapshot root of the backup. ex: --delete-dir=foo,home/bar') {|v|
+        opts[:delete_dirs] = v.split(/,/)
+      }      
       opt.on('--backup-at=YYYYMMDD', 'backup at YYYY/MM/DD') {|v|
         opts[:backup_at] = Date.parse(v)
       }
@@ -85,8 +88,6 @@ module Qdumpfs
         verify
       elsif @opt.cmd == 'delete'
         delete('delete')
-#      elsif @opt.cmd == 'test'
-#        test
       else
         raise RuntimeError, "unknown command: #{@opt.cmd}"
       end
@@ -149,29 +150,6 @@ module Qdumpfs
       return src_count, dst_count
     end
 
-#    def get_snapshots(target_dir)
-#      # 指定したディレクトリに含まれるバックアップフォルダ(日付つき)を全て取得
-#      dd   = "[0-9][0-9]"
-#      dddd = dd + dd
-#      # FIXME: Y10K problem.
-#      dirs = []
-#      glob_path = File.join(target_dir, dddd, dd, dd)
-#      Dir.glob(glob_path).sort.find {|dir|
-#        day, month, year = File.split_all(dir).reverse.map {|x| x.to_i }
-#        path = diro
-#        if File.directory?(path) and Date.valid_date?(year, month, day) and
-#          dirs << path
-#        end
-#      }
-#      dirs
-#    end
-
-#    def get_snapshot_date(snapshot)
-#      # バックアップディレクトリのパス(日付つき)から日付を取得して返す
-#      day, month, year = File.split_all(snapshot).reverse.map {|x| x.to_i }
-#      Time.new(year, month, day)
-#    end
-    
     def update_snapshot(src, latest, today)
       # バックアップの差分コピーを実行
       # src: コピー元ディレクトリ ex) i:/from/home
@@ -457,9 +435,7 @@ module Qdumpfs
     
     def delete(cmd)
       @opt.validate_directories(1)
-      
       start_time = Time.now
-p @opt.limit_sec      
       limit_time = start_time + (@opt.limit_sec)
       log("##### #{cmd} delete-from=#{@opt.delete_from} delete-to=#{@opt.delete_to} start #{fmt(start_time)} => limit_time=#{fmt(limit_time)} #####")
       @opt.dirs.each do |target_dir|
@@ -482,6 +458,29 @@ p @opt.limit_sec
       log("##### #{cmd} end #####")
     end
 
+    def rm_dir(path)
+      can_delete = true
+      if @opt.dry_run
+        can_delete = false
+      elsif !FileTest.directory?(path)
+        can_delete = false
+      end
+      msg = can_delete ? "...ok..." : "...ng..."
+      print "Deleting #{path} #{msg}"
+
+      return unless can_delete
+
+      #それ以外は日付バックアップディレクトリ全体を削除
+      if windows?
+        # Windowsの場合
+        win_backup_path = to_win_path(path)
+        system("rmdir /S /Q #{win_backup_path}")
+      else
+        # Linux/macOSの場合
+        system("rm -rf #{path}")
+      end
+    end
+
     def delete_target_dir(cmd, target_dir)
       target_dir = to_unix_path(target_dir)
       puts "<<<<< Target dir: #{target_dir} >>>>>"
@@ -494,40 +493,20 @@ p @opt.limit_sec
       else
         raise RuntimeError, "unknown command: #{cmd}"
       end
-      
-#      p @opt.keep_year
-#      p @opt.keep_month
-#      p @opt.keep_day
-      
+    
       snapshots.each do |snapshot|
         next if snapshot.keep
         t_start = Time.now
-        print "Deleting #{snapshot.path} ..."
-       
-        unless @opt.dry_run
-          #http://superuser.com/questions/19762/mass-deleting-files-in-windows/289399#289399
-          ##### here
-          #bundle exec ruby exe/qdumpfs --dry-run --keep=100Y36M30W30D --command expire f:/pc1/pdumpfs/users f:/pc1/pdumpfs/opt f:/pc1/pdumpfs/d
-          
-          if windows?
-            # Windowsの場合
-            win_backup_path = to_win_path(snapshot.path)
-            
-#            byenow = "byenow"
-#            if which(byenow)
-#              print " bynow"
-#              system("byenow -y --delete-ntapi --one-liner #{snapshot.path}")
-#            else
-#              print " pass1"
-#              system("del /F /S /Q #{win_backup_path} > nul")
-#              print " pass2"
-#              system("rmdir /S /Q #{win_backup_path}")
-            #            end
-            system("rmdir /S /Q #{win_backup_path}")
-          else
-            # Linux/macOSの場合
-            system("rm -rf #{snapshot.path}")
+
+        if @opt.delete_dirs.size > 0
+          #削除するディレクトリが指定されている場合日付バックアップディレクトリの下そのディレクトリを削除
+          @opt.delete_dirs.each do |delete_dir|
+            delete_path = File.join(snapshot.path, delete_dir)
+            rm_dir(delete_path)
           end
+        else
+          #それ以外はバックアップディレクトリ全体が対象
+          rm_dir(snapshot.path)
         end
         
         t_end = Time.now
@@ -551,60 +530,6 @@ p @opt.limit_sec
       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
 

data/lib/qdumpfs/option.rb

@@ -141,6 +141,7 @@ module Qdumpfs
       @keep_day = $1.to_i if keep =~ /(\d+)D/
       @delete_from = @opts[:delete_from]
       @delete_to = @opts[:delete_to]
+      @delete_dirs = @opts[:delete_dirs]
       @backup_at = @opts[:backup_at]
       @today = Date.today
     end
@@ -148,7 +149,7 @@ module Qdumpfs
     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, :backup_at
+    attr_reader :delete_from, :delete_to, :delete_dirs, :backup_at
     
     def report(type, filename)
       if @opts[:v]

data/lib/qdumpfs/version.rb

@@ -1,3 +1,4 @@
-module Qdumpfs
-  VERSION = "0.7.0"
-end
+module Qdumpfs
+  VERSION = "0.8.0"
+end  
+  

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler