rb1drv-tools 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe054475b1688ad3e50fb5382392a53db3470a12dcc03943fa8002db1eebf559
-  data.tar.gz: f11b7b9575fb06c908120c3289ab641b4a08dd6e273c62935f3146c510aa871e
+  metadata.gz: ac6c60e1b964a10dcaaee6c08122be48be2aa54f726243626d278abae553a0c2
+  data.tar.gz: 4e434e9cf006428c8ddac3d7d042a715acb7c044b3a453c681eee5d3ea63a846
 SHA512:
-  metadata.gz: 5b5d1993a705015ffe7148c81faf8684cb63fbe08b49b15b2139f3c89abd3146551244ca2fded5bba3c6f387466efaa55e0c85c6d4e9ef050d4dcbbd7662468f
-  data.tar.gz: ec588699cb4c304cf93f55eb2e45493077aca86af8335c51cbe4c98047355da51eea1520c0d15890f231b0b9622f7842d73df43f0475e245c1e61b1271c0c909
+  metadata.gz: 72ffb0be1adce60d478df6a454c36414d39c204861a4816b5c41d59993c0063e1a058645be46262ec99f38966714f26faf92b9c10190314f9d285b392f866332
+  data.tar.gz: 50d3031fcd2eabcd36d07aafbd6add01f99696433d94f1dd4548bcd3a695c398213b8cb77a8b585ad31d8d59507a62efc693d4660bcf397800237842ae3f16d2

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rb1drv-tools (0.1.4)
-      rb1drv (~> 0.1)
+    rb1drv-tools (0.1.5)
+      rb1drv (>= 0.1.7)
       tty-progressbar (~> 0)
       tty-prompt (~> 0)
       tty-screen (~> 0)
@@ -31,7 +31,7 @@ GEM
       tty-color (~> 0.4.0)
     rack (2.0.5)
     rake (10.5.0)
-    rb1drv (0.1.6)
+    rb1drv (0.1.7)
       excon (~> 0.62)
       oauth2 (~> 1.4)
     timers (4.1.2)

data/lib/rb1drv-tools/command/help.rb

@@ -33,6 +33,7 @@ module Rb1drvTools
           download [-f] <r-files> [@target] Download files into directory recursively, skipping existing files
               -f                                Overwrite existing files regardless
               -s                                Overwrite existing files with different size or older date
+              -t                                Reset last modified time if remote file has newer date and same size
               @directory/                       Upload or download into directory as children, if:
                                                   - target directory exists
                                                   - target ends with a slash

data/lib/rb1drv-tools/command/info.rb

@@ -4,15 +4,22 @@ module Rb1drvTools
       Profile.profile
       format = '%10s: %s'
       CLI.od.request('drives').dig('value').each do |drive|
+        total = drive.dig('quota', 'total').to_i
+        used = drive.dig('quota', 'used').to_i
+        deleted = drive.dig('quota', 'deleted').to_i
+        remaining = drive.dig('quota', 'remaining').to_i
+        lost = total - used - deleted - remaining
+
         {
           'ID' => drive.dig('id'),
           'Site' => drive.dig('webUrl'),
           'Type' => drive.dig('driveType'),
           'Owner' => '%s <%s>' % [drive.dig('owner', 'user', 'displayName'), drive.dig('owner', 'user', 'email')],
-          'Size' => Utils.humanize_size(drive.dig('quota', 'total')),
-          'Used' => Utils.humanize_size(drive.dig('quota', 'used')),
-          'Deleted' => Utils.humanize_size(drive.dig('quota', 'deleted')),
-          'Free' => Utils.humanize_size(drive.dig('quota', 'remaining'))
+          'Size' => Utils.humanize_size(total),
+          'Used' => Utils.humanize_size(used),
+          'Deleted' => Utils.humanize_size(deleted),
+          'Free' => Utils.humanize_size(remaining),
+          'Lost' => Utils.humanize_size(lost) # Lost in universe (Version History)
         }.each do |row|
           puts format % row
         end

data/lib/rb1drv-tools/command/upload.rb

@@ -6,6 +6,7 @@ module Rb1drvTools
       file_mode = true
       overwrite = false
       overwrite_smarter = false
+      time_sync = false
 
       items = []
       args.each do |arg|
@@ -16,6 +17,8 @@ module Rb1drvTools
             overwrite_smarter = true
           when 'f'
             overwrite = true
+          when 't'
+            time_sync = true
           else
             puts "Warning: unknown flag '#{flag}'."
           end
@@ -58,7 +61,7 @@ module Rb1drvTools
         target_dir = get_obj(File.dirname(target))
         CLI.cwd.mkdir(File.dirname(target))
         target_name = File.basename(target)
-        upload(items.first, target_dir, File.basename(target), overwrite_policy: overwrite_policy)
+        upload(items.first, target_dir, File.basename(target), overwrite_policy: overwrite_policy, time_sync: time_sync)
       else
         items.each do |item|
           unless target_obj.dir?
@@ -72,40 +75,45 @@ module Rb1drvTools
           end
           Dir[item].each do |match|
             if File.directory?(match)
-              traverse_dir(match, target_obj.mkdir(File.basename(match)))
+              traverse_dir(match, target_obj.mkdir(File.basename(match)), overwrite_policy: overwrite_policy, time_sync: time_sync)
             else
-              upload(match, target_obj, File.basename(match), overwrite_policy: overwrite_policy)
+              upload(match, target_obj, File.basename(match), overwrite_policy: overwrite_policy, time_sync: time_sync)
             end
           end
         end
       end
     end
 
-    def self.traverse_dir(source_directory, target_directory)
+    def self.traverse_dir(source_directory, target_directory, overwrite_policy: :skip, time_sync: false)
       Dir.entries(source_directory).sort.each do |child|
         next if child == '.' || child == '..'
         new_path = File.join(source_directory, child)
         if File.directory?(new_path)
           new_dir = target_directory.get_child(child)
           new_dir = target_directory.mkdir(child) unless new_dir.dir?
-          traverse_dir(new_path, new_dir)
+          traverse_dir(new_path, new_dir, overwrite_policy: overwrite_policy, time_sync: time_sync)
         else
-          upload(new_path, target_directory, child)
+          upload(new_path, target_directory, child, overwrite_policy: overwrite_policy, time_sync: time_sync)
         end
       end
     end
 
-    def self.upload(source_file, target_directory, target_name, overwrite_policy: :skip)
+    def self.upload(source_file, target_directory, target_name, overwrite_policy: :skip, time_sync: false)
       return if source_file.include?('.1drv_upload')
       printf "%s => %s :: %s\n", source_file, target_directory.absolute_path, target_name
       target_obj = target_directory.get_child(target_name)
       return puts 'Target is a directory, skipped' if target_obj.dir?
+      mtime = File.mtime(source_file)
+      file_size = File.size(source_file)
       if overwrite_policy != :overwrite && target_obj.file?
+        if time_sync && target_obj.size == file_size && target_obj.mtime - mtime > 2
+          target_obj.set_mtime(mtime)
+          print '<sync mtime> '
+        end
         return puts 'Skipped' if overwrite_policy == :skip
         return puts 'Remote file is up to date, skipped' if target_obj.mtime >= File.mtime(source_file) - 2
       end
       screen_width = TTY::Screen.width
-      file_size = File.size(source_file)
       if STDOUT.tty? && screen_width >= 50
         multibar = TTY::ProgressBar::Multi.new
         bar = multibar.register("%s :current_byte / :total_byte :byte_rate/s [:bar] :eta :percent" % source_file[0..29], total: file_size, frequency: 2, head: '>')

data/lib/rb1drv-tools/utils.rb

@@ -52,13 +52,16 @@ module Rb1drvTools
     end
 
     def humanize_size(size)
+      num = size.abs.to_f
       units = ['', 'K', 'M', 'G']
       unit_idx = 0
-      while size > 8192 && unit_idx < units.size - 1 do
-        size /= 1024
+      while num > 8192.0 && unit_idx < units.size - 1 do
+        num /= 1024.0
         unit_idx += 1
       end
-      "#{size}#{units[unit_idx]}"
+      num = num.round(1)
+      num = -num if size < 0
+      "#{num}#{units[unit_idx]}"
     end
   end
 end

data/lib/rb1drv-tools/version.rb

@@ -1,3 +1,3 @@
 module Rb1drvTools
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/rb1drv-tools.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_dependency "rb1drv", "~> 0.1"
+  spec.add_dependency "rb1drv", ">= 0.1.7"
   spec.add_dependency "tty-progressbar", "~> 0"
   spec.add_dependency "tty-prompt", "~> 0"
   spec.add_dependency "tty-screen", "~> 0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rb1drv-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Xinyue Lu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb1drv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: tty-progressbar
   requirement: !ruby/object:Gem::Requirement