pindo 4.7.8 → 4.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a9d88e4cefb78e407a08819025c3e4e04ddca1b33dfdbaa2910643ca0314f9a
-  data.tar.gz: c4870fd7e8b90626cf398b48bfb55b432ce4e867bd2737ae1b8793056353bb0e
+  metadata.gz: 6aaeca7f069b61265bf65ea62d49bf8b3d3e64ccf2755475a68c37afa54b12fb
+  data.tar.gz: 980495658d7accae82e4bf4f11913892edfb0efeaae49438e9003f9a67aed5f2
 SHA512:
-  metadata.gz: 9f30678026ced27fe6c692449d26cd2518d5ac8f83e410ef5c7382c475b62140e2c6e9939e24388d32235d10554aca61bf48a113f7df82b94193d2bff8f72a29
-  data.tar.gz: 314c346c4393769e9b2e98b65fbee1d28f8ff373215422adb5c27f327dbd610faa9b917e8a684dcc0bb37c72fcd45161cab32e9a6f9e7f1e08a2288c49ecb01c
+  metadata.gz: f89ffccfccdd56678fe98cac69f9eb621276a264aa93bd7bdd55d78995220cfc25b199c6f1da3b4ebf7a03e7b3a86b75568e8a252da3089c2211f088c0195e33
+  data.tar.gz: 566ff17b4b945007869f8acdce6d5e7bb10ec688973f82ad92aeb7e10dd12e9ddf4fb570424b3892813af57601d821ac867c586a3dbc9b967b7e0d9e5763ba50

data/lib/pindo/client/pgyeruploadclient.rb

@@ -94,7 +94,7 @@ module Pindo
 
         upload_path_key = upload_path + file_uuid + extension
 
-        task_num = 5
+        task_num = 10
 
         puts "文件路径: #{@upload_binary_file}"
         puts "文件大小: #{total_m}M"
@@ -121,6 +121,7 @@ module Pindo
         multi_task_upload_data_req(task_num:task_num)
 
         result_data = post_upload_finish_req(upload_path_key:upload_path_key, upload_id:upload_id, eTags:@upload_eTags)
+        puts result_data
         if result_data["code"] == 200
             upload_result = upload_path_key
             Funlog.instance.fancyinfo_success("文件#{@upload_binary_file} 上传成功! 😎😎😎")
@@ -136,7 +137,6 @@ module Pindo
 
       def multi_task_upload_data_req(task_num:1)
 
-          # puts "add task_num :#{task_num}"
 
           for i in 0..@upload_params_list.length-1 do
             @upload_params_list[i]["retryCount"] = 3
@@ -145,10 +145,9 @@ module Pindo
           while @upload_params_list.size > 0
             upload_params_list_temp = []
             #每次最大5个线程上传
-            for i in 0..task_num do
+            for i in 1..task_num do
               upload_params_list_temp << @upload_params_list.shift
             end
-
             hydra = Typhoeus::Hydra.new
             while upload_params_list_temp.size > 0
                 upload_params_item = upload_params_list_temp.shift
@@ -172,11 +171,6 @@ module Pindo
           single_task_upload_part_data_req(upload_params_item:upload_params_item)
         end
 
-        # if !@upload_params_list.nil? && @upload_params_list.length > 0
-        #     for i in 0..@upload_params_list.length-1 do
-        #         eTag_item = single_task_upload_part_data_req(upload_params_item:@upload_params_list[i])
-        #     end
-        # end
 
         return @eTags
       end
@@ -200,13 +194,8 @@ module Pindo
 
           request = create_req(upload_url:upload_url, body_data:put_data, read_length:read_length)
 
-          # @upload_num = start_position
-
           request.on_progress do |dltotal, dlnow, ultotal, ulnow|
-              # puts "dltotal (#{dltotal}), dlnow (#{dlnow}), ultotal (#{ultotal}), ulnow (#{ulnow})"
               if ulnow
-                # @upload_num = start_position + ulnow
-                # set_progress(@upload_num, @file_size)
                 @progress_bar.update_upload_index(upload_part:part_no, upload_size:ulnow)
                 @progress_bar.update_upload_progress()
               end
@@ -214,17 +203,6 @@ module Pindo
 
           eTag_item = nil
 
-          request.on_failure do |response|
-              @progress_bar.delete_upload_index(upload_part:part_no)
-              upload_params_item["retryCount"] = upload_params_item["retryCount"] - 1
-              if upload_params_item["retryCount"] > 0
-                @upload_params_list.push(upload_params_item)
-              else
-                Funlog.instance.fancyinfo_error("文件#{@upload_binary_file} 上传失败! 😭😭😭")
-                raise Informative "上传文件失败"
-              end
-          end
-
           request.on_complete do |response|
               if response.success?
                 @progress_bar.complete_upload_index(upload_part:part_no, complete_size:read_length)
@@ -238,7 +216,7 @@ module Pindo
                   @upload_params_list.push(upload_params_item)
                 else
                   Funlog.instance.fancyinfo_error("文件#{@upload_binary_file} 上传失败! 😭😭😭")
-                  raise Informative "上传文件失败"
+                  raise Informative, "上传文件失败"
                 end
               end
           end
@@ -256,7 +234,6 @@ module Pindo
       def create_req(upload_url:nil, body_data:nil, read_length:nil)
 
           request = nil
-
           proxy_options = {
             proxy: ENV['http_proxy'] || ENV['https_proxy'],
             proxyuserpwd: "#{ENV['HTTP_PROXY_USER']}:#{ENV['HTTP_PROXY_PASSWORD']}"

data/lib/pindo/version.rb

@@ -1,6 +1,6 @@
 module Pindo
 
-  	VERSION = "4.7.8"
+  	VERSION = "4.7.9"
 
   	class VersionCheck
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.7.8
+  version: 4.7.9
 platform: ruby
 authors:
 - wade