rb1drv 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81df80e1aa9121117a01bbfff3db1217d07f4fec06913abc4404f675180ce649
-  data.tar.gz: 318dc652e701f11a38d2b1aafc05f5804074cf4add0dd9a783811ed8ca7e8d2a
+  metadata.gz: 441718671c6e794189827b5411f9d3081931dbf9b5f9b8a1b1eaad8ebfd7487b
+  data.tar.gz: 9dac61af7d31703a8b90288a435f54aa4681464e6598a6818f49bac77dd0cea7
 SHA512:
-  metadata.gz: bdb422dfb4957985a3fab31c0025391b1434591652a36a84f26a129bd758ef5a2d017d953c318a8b9a762ccdf4abc1ad953cb3b84c4bf82724f08063e7f0cd15
-  data.tar.gz: a92c40cff2015a682a965b60a57eb5c4e03fe5525a0d9d8c46a69171394e3a47c58acda9c608cc915acae2db38db8fc3f69384a7a0ef83a383911822e2371e0c
+  metadata.gz: c5f2da5b24a15baecef1b3e9a0cbe99b481792a66fc1eaed1280904543db09dc131ca9bb20feb49c274d790168f17c7a2e3d17aa10c1e76c7a34924e47b88b26
+  data.tar.gz: cadf55833889484e9856585bde0fe794ed6ed9dcdd124658502cea266e4e8cf2c621197db1504e71355a4c6eb3255dd58fae6fc08ccd0f2f9b859e74a1da68cf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rb1drv (0.1.6)
+    rb1drv (0.1.7)
       excon (~> 0.62)
       oauth2 (~> 1.4)
 

data/lib/rb1drv/onedrive_404.rb

@@ -3,6 +3,10 @@ module Rb1drv
     def initialize(*_)
     end
 
+    def id
+      '_FILE_NOT_FOUND_'
+    end
+
     # No
     def dir?
       false

data/lib/rb1drv/onedrive_dir.rb

@@ -15,7 +15,7 @@ module Rb1drv
     # @return [Array<OneDriveDir,OneDriveFile>] directories and files whose parent is current directory
     def children
       return [] if child_count <= 0
-      @cached_children ||= @od.request("#{api_path}/children")['value'].map do |child|
+      @cached_children ||= @od.request("#{api_path}/children?$top=1000")['value'].map do |child|
         OneDriveItem.smart_new(@od, child)
       end
     end
@@ -110,6 +110,8 @@ module Rb1drv
 
       resume_file = "#{filename}.1drv_upload"
       resume_session = JSON.parse(File.read(resume_file)) rescue nil if File.exist?(resume_file)
+      old_file = OneDriveItem.smart_new(@od, @od.request("#{api_path}:/#{target_name}"))
+      new_file = nil
 
       result = nil
       loop do
@@ -132,14 +134,17 @@ module Rb1drv
 
           until resume_session && resume_session['session_url'] do
             result = @od.request("#{api_path}:/#{target_name}:/createUploadSession", item: {'@microsoft.graph.conflictBehavior': overwrite ? 'replace' : 'rename'})
-            resume_session = {
-              'session_url' => result['uploadUrl'],
-              'source_size' => File.size(filename),
-              'fragment_size' => fragment_size
-            }
-            File.write(resume_file, JSON.pretty_generate(resume_session))
-            conn = Excon.new(resume_session['session_url'], idempotent: true)
-            sleep 15 unless result['uploadUrl']
+            if result['uploadUrl']
+              resume_session = {
+                'session_url' => result['uploadUrl'],
+                'source_size' => File.size(filename),
+                'fragment_size' => fragment_size
+              }
+              File.write(resume_file, JSON.pretty_generate(resume_session))
+              conn = Excon.new(resume_session['session_url'], idempotent: true)
+              break
+            end
+            sleep 15
           end
 
           new_file = nil
@@ -157,31 +162,36 @@ module Rb1drv
                 yield :progress, file: filename, from: from, to: to, progress: progress, total: total if block_given?
               end
               begin
-                result = conn.put headers: headers, chunk_size: chunk_size, body: sliced_io, read_timeout: 15, write_timeout: 15, retry_limit: 2
+                result = conn.put headers: headers, chunk_size: chunk_size, body: sliced_io, retry_limit: 2
                 raise IOError if result.body.include? 'accessDenied'
-              rescue Excon::Error::Timeout, Excon::Error::Socket
+              rescue Excon::Error::Socket, IOError
+                # Probably server rejected this request
+                throw :restart
+              rescue Excon::Error::Timeout
                 conn = Excon.new(resume_session['session_url'], idempotent: true)
                 yield :retry, file: filename, from: from, to: to if block_given?
                 retry
-              rescue IOError
-                conn = Excon.new(resume_session['session_url'], idempotent: true)
-                yield :retry, file: filename, from: from, to: to if block_given?
-                sleep 60
-                retry
+              ensure
+                yield :finish_segment, file: filename, from: from, to: to if block_given?
               end
-              yield :finish_segment, file: filename, from: from, to: to if block_given?
               throw :restart if result.body.include?('</html>')
               result = JSON.parse(result.body)
               new_file = OneDriveFile.new(@od, result) if result.dig('file')
             end
           end
           throw :restart unless new_file&.file?
-          File.unlink(resume_file)
-          return set_mtime(new_file, File.mtime(filename))
+          break
         end
         # catch :restart here
-        sleep 60 # and retry the whole process
+        sleep 60 # wait for server to process the previous request
+        new_file = OneDriveItem.smart_new(@od, @od.request("#{api_path}:/#{target_name}"))
+        break if new_file.file? && new_file.id != old_file.id
+        # and retry the whole process
       end
+
+      # upload completed
+      File.unlink(resume_file)
+      return new_file.set_mtime(File.mtime(filename))
     end
 
     # Uploads a local file into current remote directory using simple upload mode.
@@ -209,11 +219,7 @@ module Rb1drv
       result = @od.conn.put(query)
       result = JSON.parse(result.body)
       file = OneDriveFile.new(@od, result)
-      set_mtime(file, File.mtime(filename))
-    end
-
-    def set_mtime(file, time)
-      OneDriveFile.new(@od, @od.request(file.api_path, {fileSystemInfo: {lastModifiedDateTime: time.utc.iso8601}}, :patch))
+      file.set_mtime(File.mtime(filename))
     end
   end
 end

data/lib/rb1drv/onedrive_file.rb

@@ -57,5 +57,23 @@ module Rb1drv
       yield :finish_segment, file: target_name if block_given?
       FileUtils.mv(tmpfile, filename)
     end
+
+    # Change last modified time for a remote file.
+    #
+    # NOTICE: OneDrive by default keeps multiple history version for this operation.
+    # NOTICE: You must turn off versioning to prevent multiple counts on disk quota.
+    #
+    # 3 attempts will be made due to delay after a file upload.
+    #
+    # @param time [Time] desired last modified time
+    # @return [OneDriveFile] new file object returned by API
+    def set_mtime(time)
+      attempt = 0
+      OneDriveFile.new(@od, @od.request(api_path, {fileSystemInfo: {lastModifiedDateTime: time.utc.iso8601}}, :patch))
+    rescue
+      sleep 10
+      attempt += 1
+      retry if attempt <= 3
+    end
   end
 end

data/lib/rb1drv/version.rb

@@ -1,3 +1,3 @@
 module Rb1drv
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb1drv
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Xinyue Lu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2