qdumpfs 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 606cd6d5f9de57b340a1ac41d5e621d2f947cff5e1fce3a9ec510be72e0f0d4d
-  data.tar.gz: 073da696b6e73cd8059a246fbe18b51f09050f100bb9f7a454954921d4e5d228
+  metadata.gz: 3d4d28c42fc54a4ba9ba806aa57c056774889663cfa011d1cb8ff6d259a3368b
+  data.tar.gz: fcfa95f0abdbaf1a8b571cf088fa83811e1984f4bd7bcd1283e68bdad3ce894b
 SHA512:
-  metadata.gz: 34c7c309574b3cbd00175b0e327d1df5687fa2acb84fcb3d29ff5d77adeaacfddc5f91a28de702d0aaa06e0b694ea722d00d43ed50d7b7f74d80d2f754b1027c
-  data.tar.gz: f5702a62c4b9ab44364df7c697c5d503ddccce6b946f2e7702de6783521aa05afa358df218686a90934a80af64906105068bb5cd0a77aa8fcacf597e56541436
+  metadata.gz: d1af10ef6521b9f775a538dc666e06f4cc4222131413144c8eacd59d795242890db306411e34076b041ac356b0a2e6a0c74c50cf221e01550caf0b18260bd738
+  data.tar.gz: 68351bac00ffe057beb25433f5d158c74814a2a20efa43cd15a8a608cc800f5655b6f41be2b1292e8ebc1b7b63e43f01add315daaa3503d047f4139e7dbf4848

data/.gitignore

@@ -12,4 +12,7 @@ log.txt
 *test.cmd
 test*.cmd
 *.log
+/data/to
+/data/to2
+
 

data/Gemfile.lock

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

data/data/from/0.txt

@@ -0,0 +1 @@
+0

data/data/from/a/1.txt

@@ -0,0 +1 @@
+1

data/exe/sample

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+require 'fileutils'
+require "qdumpfs"
+
+from = "./data/from"
+to = "./data/to"
+to2 = "./data/to2"
+
+def create_dir(dir)
+  if FileTest.directory?(dir)
+    FileUtils.rm_rf(dir)
+  end
+  FileUtils.mkpath(dir)
+end
+
+create_dir(to)
+create_dir(to2)
+
+
+arg = ["--backup-at=20210119", from, to]
+Qdumpfs::Command.run(arg)
+arg = ["--backup-at=20210121", from, to]
+Qdumpfs::Command.run(arg)
+arg = ["--backup-at=20210122", from, to]
+Qdumpfs::Command.run(arg)
+arg = ["--backup-at=20210123", from, to]
+Qdumpfs::Command.run(arg)
+arg = ["--backup-at=20210124", from, to]
+Qdumpfs::Command.run(arg)
+
+
+arg = ["--backup-at=20210122", from, to2]
+Qdumpfs::Command.run(arg)
+arg = ["--backup-at=20210123", from, to2]
+
+arg = ["--command=delete", "--delete-from=20210122", "--delete-to=20210123", "--limit=1", to, to2]
+Qdumpfs::Command.run(arg)
+
+

data/lib/qdumpfs.rb

@@ -38,15 +38,18 @@ module Qdumpfs
       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|
+      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|
+      opt.on('--delete-to=YYYYMMDD', 'delete backup to YYYY/MM/DD') {|v|
         opts[:delete_to] = Date.parse(v)
-      } 
+      }
+      opt.on('--backup-at=YYYYMMDD', 'backup at YYYY/MM/DD') {|v|
+        opts[:backup_at] = Date.parse(v)
+      }
       opt.parse!(argv)
-      option = Option.new(opts, ARGV)
+      option = Option.new(opts, argv)
       if opts[:v]
         puts "<<<<< qdumpfs options >>>>> "
         puts "logdir: #{option.logdir}"
@@ -146,28 +149,28 @@ 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 = dir
-        if File.directory?(path) and Date.valid_date?(year, month, day) and
-          dirs << path
-        end
-      }
-      dirs
-    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 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)
       # バックアップの差分コピーを実行
@@ -306,6 +309,9 @@ module Qdumpfs
       
       @written_bytes = 0
       start_time = Time.now
+      if @opt.backup_at
+        start_time = to_time(@opt.backup_at)
+      end
       src = @opt.src
       dst = @opt.dst
       
@@ -453,9 +459,9 @@ module Qdumpfs
       @opt.validate_directories(1)
       
       start_time = Time.now
+p @opt.limit_sec      
       limit_time = start_time + (@opt.limit_sec)
-      log("##### #{cmd} start #{fmt(start_time)} => limit_time=#{fmt(limit_time)} #####")
-      
+      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|
         
         target_start = Time.now        

data/lib/qdumpfs/option.rb

@@ -140,14 +140,15 @@ module Qdumpfs
       @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]      
+      @delete_to = @opts[:delete_to]
+      @backup_at = @opts[:backup_at]
       @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
+    attr_reader :delete_from, :delete_to, :backup_at
     
     def report(type, filename)
       if @opts[:v]
@@ -217,14 +218,21 @@ module Qdumpfs
     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
+        if delete_from && delete_to
+          if backup_dir.date >= delete_from && backup_dir.date <= delete_to
+            backup_dir.keep = false
+          end
+        elsif delete_from
+          if backup_dir.date >= delete_from
+            backup_dir.keep = false
+          end
+        elsif delete_to
+          if backup_dir.date <= delete_to
+            backup_dir.keep = false
+          end
         end
       end
     end

data/lib/qdumpfs/util.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 def wprintf(format, *args)
   STDERR.printf("pdumpfs: " + format + "\n", *args)
 end
@@ -278,6 +279,10 @@ module QdumpfsUtils
   
   def to_unix_path(path)
     path.gsub(/\\/, '/')
-  end  
+  end
+
+  def to_time(date)
+    Time.local(date.year, date.month, date.day)
+  end
 end
 

data/lib/qdumpfs/version.rb

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

data/sample.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+curdir=$(dirname $0)
+bundle exec ruby $curdir/exe/sample
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qdumpfs
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - src
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-18 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -57,6 +57,7 @@ email:
 - src@srcw.net
 executables:
 - qdumpfs
+- sample
 extensions: []
 extra_rdoc_files: []
 files:
@@ -73,7 +74,10 @@ files:
 - bin/setup
 - build.cmd
 - build.sh
+- data/from/0.txt
+- data/from/a/1.txt
 - exe/qdumpfs
+- exe/sample
 - lib/qdumpfs.rb
 - lib/qdumpfs/option.rb
 - lib/qdumpfs/util.rb
@@ -85,6 +89,7 @@ files:
 - run_qdumpfs.cmd
 - run_qdumpfs.sh
 - run_sync.cmd
+- sample.sh
 - test_pdumpfs/data/bar
 - test_pdumpfs/data/baz/quux
 - test_pdumpfs/data/file