pindo 4.7.8 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a9d88e4cefb78e407a08819025c3e4e04ddca1b33dfdbaa2910643ca0314f9a
-  data.tar.gz: c4870fd7e8b90626cf398b48bfb55b432ce4e867bd2737ae1b8793056353bb0e
+  metadata.gz: 26a76bb1d95b970919b4b386f52841ddc4cb21ac22a7b5d433c7fcc88b6030da
+  data.tar.gz: e0f0eb7ec08a2fca3489b0d469fe23eaa0f34ea9d88bcb209b50df822f42e406
 SHA512:
-  metadata.gz: 9f30678026ced27fe6c692449d26cd2518d5ac8f83e410ef5c7382c475b62140e2c6e9939e24388d32235d10554aca61bf48a113f7df82b94193d2bff8f72a29
-  data.tar.gz: 314c346c4393769e9b2e98b65fbee1d28f8ff373215422adb5c27f327dbd610faa9b917e8a684dcc0bb37c72fcd45161cab32e9a6f9e7f1e08a2288c49ecb01c
+  metadata.gz: 9d95421e56c75ed51b5d75b7e84aa2e7dba6c566379d6cc23e3966aa616dc15f0c433552b5963c04ae36f488891dc80b1f2ac8b79f0069d166daaaf59c942bd0
+  data.tar.gz: a3c6c60f5398b336f17a79bff657a4eb0b28882328828fc05507bbe38a03e4785f455492dffd0800df788d686351ecc3376a88e8e69bd3e2268337417571f2f6

data/lib/pindo/client/pgyeruploadclient.rb

@@ -94,14 +94,12 @@ module Pindo
 
         upload_path_key = upload_path + file_uuid + extension
 
-        task_num = 5
+        task_num = 10
 
         puts "文件路径: #{@upload_binary_file}"
         puts "文件大小: #{total_m}M"
         puts "上传路径: #{upload_path_key}"
         puts "切片大小: 5 MB"
-        puts "最大线程数: #{task_num}"
-        puts
 
         upload_result = nil
 
@@ -110,7 +108,17 @@ module Pindo
 
         upload_id= result_data["data"]["uploadId"]
         @upload_params_list = result_data["data"]["uploadParamsList"]
+        task_num = @upload_params_list.length 
+        if task_num < 2
+          task_num = 2
+        end
 
+        if task_num > 100
+          task_num = 100
+        end
+        
+        puts "最大线程数: #{task_num}"
+        puts
 
         Funlog.instance.fancyinfo_start("开始上传...")
         @upload_eTags = []
@@ -121,6 +129,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)
+
         if result_data["code"] == 200
             upload_result = upload_path_key
             Funlog.instance.fancyinfo_success("文件#{@upload_binary_file} 上传成功! 😎😎😎")
@@ -136,7 +145,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 +153,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 +179,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 +202,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 +211,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 +224,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 +242,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.8.0"
 
   	class VersionCheck
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pindo
 version: !ruby/object:Gem::Version
-  version: 4.7.8
+  version: 4.8.0
 platform: ruby
 authors:
 - wade
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-23 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: claide