win32_filetime 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70b017261f7dbbe2b16694d91f7a11a5e312c228
-  data.tar.gz: cbf648e30b528a910672494885338ca52db80100
+  metadata.gz: 7b3074ff5192787372d2131ab493fffd452f1c52
+  data.tar.gz: 9e2cf84261950416a33ed0c257865fdbc1fb783c
 SHA512:
-  metadata.gz: 0988a7b478f4be845ed72105d99ed5a534e6de7d1d083ed174059ce96d9466918f1acb1ffac6e25418967f2a41c781f3f3586e6fa92fd2ab55644549c5d97019
-  data.tar.gz: 4531d8cb04df6b9a80c60198b72fa942396e8e320325e5359e6b62de60c1c9091c87af971ef737c2ae384ebe25f7dddf26d0f1c251ae357bac2d92db8f3fcbfb
+  metadata.gz: 02b71ce76429650880ae051315979ef099c554e7092dfd9f3e25038ef81770fe3fbc0e19c4b574d9a049b2625e310a503eb2c00d128532671ea6ac615f3647e9
+  data.tar.gz: f74d1195f76f3c76b99f866de35949403f690f08fe41248bd86c17d4cfd5774a08fcf359f63a6a53e869110da1870a23b1a7ff8b87f0bee74d70c34b5ea36dca

data/bin/getdirtimes

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -w
 # encoding: GBK
 
-require 'win32ft'
+require 'win32_filetime'
 require "dirwalk"
 
 G = {

data/bin/restoreoldtimes

@@ -2,35 +2,47 @@
 # encoding: GBK
 
 require 'openssl'
-require 'win32ft'
+require 'win32_filetime'
 W = Win32ft
 
 trap "SIGINT" do
-  STDERR.puts "exit on Ctrl-C."
+  STDERR.puts "\nexit on Ctrl-C."
   exit 1
 end
 
-def rolloldtime(d1, fn)
-  fn = File.absolute_path(fn)
+def rolloldtime(d1, logf)
+  logf = File.absolute_path(logf)
+  c_ds = 0
+  c_fs = 0
   Dir.chdir(d1) do
-    File.foreach(fn) do |line|
+    File.foreach(logf) do |line|
       line.strip!
       next if line.empty?
       p1 = line.index(/ 0x\w+ 0x\w+ 0x\w+ \d+$/)
       next if !p1
 
       fn = line[0...p1]
-      next if !File.file?(fn) && !File.directory?(fn)
+      next if $just_dir && !File.directory?(fn)
+      if File.file?(fn)
+        c_fs += 1
+      elsif File.directory?(fn)
+        c_ds += 1
+      else
+        next
+      end
 
       tc1,ta1,tm1,_sz1 = line[p1..-1].split
-      W.setfiletime(fn, tc1, ta1, tm1)
+      W.setfiletime(fn, tc1, ta1, tm1) rescue STDERR.puts "\n Error! #{fn}"
     end
   end
+  STDERR.puts " Restoreoldtimes \"#{d1}\"   dirs: #{c_ds}  files: #{c_fs}"
+  c_fs
 end
 
 def main
+  $just_dir = ARGV.delete('-o') ? true : false
   if ARGV.size != 2
-    STDERR.puts "Syntax: restoreoldtimes.rb  Dir1 file.log"
+    STDERR.puts "Syntax: restoreoldtimes.rb  Dir1 file.log  [ -o ] # -o just_dir "
     exit 1
   end
   if !File.directory?(ARGV[0]) || !File.file?(ARGV[1])

data/bin/rolloldtimes

@@ -2,7 +2,7 @@
 # encoding: GBK
 
 require 'openssl'
-require 'win32ft'
+require 'win32_filetime'
 W = Win32ft
 
 trap "SIGINT" do
@@ -20,15 +20,19 @@ def getmd5(fn)
   md5.hexdigest
 end
 
-def rolloldtime(d1, d2)
-  fs1 = Dir.chdir(d1) { Dir.glob '*' }
-  fs2 = Dir.chdir(d2) { Dir.glob '*' }
+def rolloldtime(dir_from, dir_to)
+  c_ds = 1
+  c_fs = 0
+  fs1 = Dir.chdir(dir_from) { Dir.glob '*' }
+  fs2 = Dir.chdir(dir_to) { Dir.glob '*' }
   fs = fs1 & fs2
   fs.each do |fn|
-    f1 = File.join d1,fn
-    f2 = File.join d2,fn
+    f1 = File.join dir_from,fn
+    f2 = File.join dir_to,fn
     if File.directory?(f1) && File.directory?(f2)
-      rolloldtime(f1, f2)
+      _d1, _f1 = rolloldtime(f1, f2)
+      c_ds += _d1
+      c_fs += _f1
     elsif File.file?(f1) && File.file?(f2)
       begin
         tc1, ta1, tm1, sz1 = W.getfiletime(f1, getsize: true)
@@ -50,22 +54,25 @@ def rolloldtime(d1, d2)
             end
           end
         end
+        c_fs += 1
       rescue Exception => e
         STDERR.puts e
       end
     end
   end
+  [c_ds, c_fs]
 end
 
 def main
   if ARGV.size != 2
-    STDERR.puts "Syntax: rolloldtimes.rb  Dir1 Dir2"
+    STDERR.puts "Syntax: rolloldtimes.rb  dir_from  dir_to"
     exit 1
   end
   if !File.directory?(ARGV[0]) || !File.directory?(ARGV[1])
-    STDERR.puts "Syntax:  Dir1 Dir2  must be directory"
+    STDERR.puts "Syntax:  Dir_from  Dir_to  must be directory"
   end
-  rolloldtime(ARGV[0], ARGV[1])
+  c_ds, c_fs = rolloldtime(ARGV[0], ARGV[1])
+  STDERR.puts " Restoreoldtimes \"#{ARGV[0]}\" -> \"#{ARGV[1]}\".  dirs: #{c_ds}  files: #{c_fs}"
 end
 
 main

data/lib/{win32ft.rb → win32_filetime.rb}

@@ -4,10 +4,10 @@
 require "win32_filetime/version"
 require "ffi"
 
-class FileTime < FFI::Struct
+class Win32Filetime::FileTime < FFI::Struct
   layout :dwLowDateTime, :uint,
           :dwHighDateTime, :uint
-  
+
   include Comparable
   def <=>(other)
     s1 = self[:dwHighDateTime] << 32 | self[:dwLowDateTime]
@@ -47,7 +47,7 @@ class FileTime < FFI::Struct
   end
 end
 
-class SystemTime < FFI::Struct
+class Win32Filetime::SystemTime < FFI::Struct
   layout :wYear, :ushort,
           :wMonth, :ushort,
           :wDayOfWeek, :ushort,
@@ -88,7 +88,7 @@ class SystemTime < FFI::Struct
   end
 end
 
-class Large_Integer < FFI::Struct
+class Win32Filetime::Large_Integer < FFI::Struct
   layout :LowPart, :uint,
           :HighPart, :uint
 
@@ -118,11 +118,11 @@ class Large_Integer < FFI::Struct
   end
 end
 
-class HANDLE < FFI::Struct
+class Win32Filetime::HANDLE < FFI::Struct
   layout :handle, :uint
 end
 
-module CFflag
+module Win32Filetime::CFflag
   GENERIC_READ      = 0x80000000
   GENERIC_WRITE     = 0x40000000
   GENERIC_EXECUTE   = 0x20000000
@@ -153,7 +153,7 @@ module CFflag
   INVALID_HANDLE_VALUE            =0xFFFFFFFF
 end
 
-module FA
+module Win32Filetime::FA
   FILE_ATTRIBUTE_READONLY                 =0x00000001
   FILE_ATTRIBUTE_HIDDEN                   =0x00000002
   FILE_ATTRIBUTE_SYSTEM                   =0x00000004
@@ -171,15 +171,15 @@ module FA
   FILE_ATTRIBUTE_VIRTUAL                  =0x00010000
 end
 
-module Win32ft
+module Win32Filetime
   extend FFI::Library
   ffi_lib 'msvcrt', 'kernel32'
   ffi_convention :stdcall
-  
+
   attach_function :GetFileType, [:ulong], :int
   attach_function :GetLastError, [], :uint
   attach_function :FormatMessage, :FormatMessageA, [:uint, :pointer, :uint, :uint, :string, :uint, :pointer], :int
-  
+
   attach_function :FileTimeToLocalFileTime, [FileTime.by_ref, FileTime.by_ref], :bool
   attach_function :LocalFileTimeToFileTime, [FileTime.by_ref, FileTime.by_ref], :bool
   def self.ft2lft(ft)
@@ -192,7 +192,7 @@ module Win32ft
     LocalFileTimeToFileTime(lft, ft)
     ft
   end
-  
+
   attach_function :FileTimeToSystemTime, [FileTime.by_ref, SystemTime.by_ref], :bool
   attach_function :SystemTimeToFileTime, [SystemTime.by_ref, FileTime.by_ref], :bool
   def self.ft2st(ft, convft2lft: false)
@@ -217,7 +217,7 @@ module Win32ft
     ft = lft2ft(ft) if convlft2ft
     ft
   end
-  
+
   attach_function :GetSystemTime, [SystemTime.by_ref], :void
   def self.getsystemtime
     st = SystemTime.new
@@ -232,7 +232,7 @@ module Win32ft
   end
   attach_function :GetFileAttributes, :GetFileAttributesA, [:string], :uint
   attach_function :SetFileAttributes, :SetFileAttributesA, [:string, :uint], :bool
-  
+
 =begin
 CreateFile("", GENERIC_READ,  FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0)
 CreateFile("", GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0)
@@ -244,7 +244,7 @@ CreateFile("", GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, 0, OPEN_EXISTI
    DWORD   dwCreationDisposition,  # CREATE_NEW / CREATE_ALWAYS / OPEN_EXISTING / OPEN_ALWAYS / TRUNCATE_EXISTING
    DWORD   dwFlagsAndAttributes,   # 0 | FILE_FLAG_BACKUP_SEMANTICS if dir
    HANDLE  hTemplateFile           # 0
-       
+
 ReadFile(
     HANDLE,
     buf,      # FFI::MemoryPointer.new(:char, 100)
@@ -273,7 +273,7 @@ CloseHandle(HANDLE)
   attach_function :DeleteFile, :DeleteFileA, [:string], :bool
   attach_function :FlushFileBuffers, [:ulong], :bool
   attach_function :CloseHandle, [:ulong], :bool
-  
+
   attach_function :GetFileTime, [:ulong, FileTime.by_ref, FileTime.by_ref, FileTime.by_ref], :bool
   attach_function :SetFileTime, [:ulong, FileTime.by_ref, FileTime.by_ref, FileTime.by_ref], :bool
   def self.getfiletime(fn, getsize: false)
@@ -324,7 +324,7 @@ CloseHandle(HANDLE)
     tt = (wintt - 116444736000000000) / 10**7.0
     tt
   end
-  
+
   attach_function :GetFileSizeEx, [:ulong, Large_Integer.by_ref], :bool
   def self.getfilesize(fn)
     hf = CreateFile(fn, CFflag::GENERIC_READ, CFflag::FILE_SHARE_READ | CFflag::FILE_SHARE_WRITE,
@@ -337,3 +337,5 @@ CloseHandle(HANDLE)
     size.to_i
   end
 end
+
+Win32ft = Win32Filetime

data/lib/win32_filetime/version.rb

@@ -1,3 +1,3 @@
 module Win32Filetime
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/specs/win32ft.spec.rb

@@ -1,6 +1,7 @@
 # encoding: GBK
 
-require_relative "../lib/win32ft"
+require_relative "../lib/win32_filetime"
+include Win32Filetime
 
 describe "FileTime" do
   it "new FileTime instance should ==" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win32_filetime
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - windwiny
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,8 +70,8 @@ files:
 - bin/getdirtimes
 - bin/restoreoldtimes
 - bin/rolloldtimes
+- lib/win32_filetime.rb
 - lib/win32_filetime/version.rb
-- lib/win32ft.rb
 - specs/win32ft.spec.rb
 - win32_filetime.gemspec
 homepage: https://github.com/windwiny/win32_filetime.git
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: win32 filetime api.