pindo 4.7.9 → 4.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6aaeca7f069b61265bf65ea62d49bf8b3d3e64ccf2755475a68c37afa54b12fb
-  data.tar.gz: 980495658d7accae82e4bf4f11913892edfb0efeaae49438e9003f9a67aed5f2
+  metadata.gz: 0cff4bb49b837340114cc7cb33a2a6d2cbbb91ac74e97a2485d803887fdc2713
+  data.tar.gz: 8b4390944c7a344643014534b9167f01ace020bf4fac8ff3ac485da4c4ae7506
 SHA512:
-  metadata.gz: f89ffccfccdd56678fe98cac69f9eb621276a264aa93bd7bdd55d78995220cfc25b199c6f1da3b4ebf7a03e7b3a86b75568e8a252da3089c2211f088c0195e33
-  data.tar.gz: 566ff17b4b945007869f8acdce6d5e7bb10ec688973f82ad92aeb7e10dd12e9ddf4fb570424b3892813af57601d821ac867c586a3dbc9b967b7e0d9e5763ba50
+  metadata.gz: 8dbc329c5d290c7abbcf75dee882a07ea7187187ba38287271fa485c21d75fd22fcd8267a362d38e49e4bb87813ab6b0d56c53c67dae1e49f570de0ad6c68739
+  data.tar.gz: 2263c2090f3377f75241d8b9a0adfb8db568acce03393f01eae36e0413ca1303cd4cde8ba6c5ebb2b70c9d4b2b47d28095e18516e7d236e262a8a6bf38e6f52f

data/lib/pindo/client/pgyeruploadclient.rb

@@ -99,9 +99,8 @@ module Pindo
         puts "文件路径: #{@upload_binary_file}"
         puts "文件大小: #{total_m}M"
         puts "上传路径: #{upload_path_key}"
-        puts "切片大小: 5 MB"
-        puts "最大线程数: #{task_num}"
         puts
+        puts "切片大小: 5MB"
 
         upload_result = nil
 
@@ -110,7 +109,19 @@ module Pindo
 
         upload_id= result_data["data"]["uploadId"]
         @upload_params_list = result_data["data"]["uploadParamsList"]
+        task_num = @upload_params_list.length
+        retry_count = 5
+        if task_num < 2
+          task_num = 2
+        end
+
+        if task_num > 100
+          task_num = 100
+        end
 
+        puts "线程个数: #{task_num}"
+        puts "重试次数: #{retry_count}"
+        puts
 
         Funlog.instance.fancyinfo_start("开始上传...")
         @upload_eTags = []
@@ -118,10 +129,10 @@ module Pindo
         # single_task_upload_data_req( )
 
 
-        multi_task_upload_data_req(task_num:task_num)
+        multi_task_upload_data_req(task_num:task_num, retry_count:retry_count)
 
         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} 上传成功! 😎😎😎")
@@ -135,11 +146,10 @@ module Pindo
       end
 
 
-      def multi_task_upload_data_req(task_num:1)
-
+      def multi_task_upload_data_req(task_num:1, retry_count: 3)
 
           for i in 0..@upload_params_list.length-1 do
-            @upload_params_list[i]["retryCount"] = 3
+            @upload_params_list[i]["retryCount"] = retry_count
           end
 
           while @upload_params_list.size > 0
@@ -193,7 +203,6 @@ module Pindo
           put_data = file.read(read_length)
 
           request = create_req(upload_url:upload_url, body_data:put_data, read_length:read_length)
-
           request.on_progress do |dltotal, dlnow, ultotal, ulnow|
               if ulnow
                 @progress_bar.update_upload_index(upload_part:part_no, upload_size:ulnow)
@@ -201,8 +210,6 @@ module Pindo
               end
           end
 
-          eTag_item = nil
-
           request.on_complete do |response|
               if response.success?
                 @progress_bar.complete_upload_index(upload_part:part_no, complete_size:read_length)
@@ -213,7 +220,8 @@ module Pindo
                 @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)
+                  # @upload_params_list.push(upload_params_item)
+                  single_task_upload_part_data_req(upload_params_item:upload_params_item, hydra_handle:hydra_handle)
                 else
                   Funlog.instance.fancyinfo_error("文件#{@upload_binary_file} 上传失败! 😭😭😭")
                   raise Informative, "上传文件失败"
@@ -226,9 +234,6 @@ module Pindo
           else
             hydra_handle.queue(request)
           end
-
-          return  eTag_item
-
       end
 
       def create_req(upload_url:nil, body_data:nil, read_length:nil)
@@ -333,6 +338,7 @@ module Pindo
         attr_accessor :upload_total_size
         attr_accessor :last_update_time
         attr_accessor :update_ing_size
+        attr_accessor :is_done
 
         def initialize(upload_total_size:nil, draw_char:'>')
 
@@ -343,6 +349,8 @@ module Pindo
 
           @complete_size = 0
           @update_ing_size = {}
+
+          @is_done = false
         end
 
         def update_upload_index(upload_part:nil, upload_size:nil)
@@ -365,7 +373,7 @@ module Pindo
                 total_num = @upload_total_size
                 index_num = @complete_size
                 @update_ing_size.each do |key, value|
-                    index_num = index_num + value
+                   index_num = index_num + value
                 end
 
                 progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
@@ -374,19 +382,14 @@ module Pindo
                 index = 40.0 * index_num / total_num
                 upload_message = "已上传:#{upload_size}MB|#{progress_str}\%【" + (@draw_char * (index/1).floor).ljust(40.0, '_') +  "】Total:#{total_size}MB"
                 Funlog.instance.fancyinfo_update(upload_message)
+                if index_num == total_num && !@is_done
+                  @is_done = true
+                  Funlog.instance.fancyinfo_success(upload_message)
+                end
             end
         end
 
       end
 
-      # def set_progress(index_num, total_num,  char ='>' )
-      #     progress_str = sprintf("%.2f", 100.0 * index_num / total_num )
-      #     total_size = sprintf("%.2f", 1.00 * total_num / 1024 /1024 )
-      #     upload_size = sprintf("%.2f", 1.00 * index_num / 1024 /1024 )
-      #     index = 40.0 * index_num / total_num
-      #     upload_message = "已上传:#{upload_size}MB|#{progress_str}\%【" + (char * (index/1).floor).ljust(40.0, '_') +  "】Total:#{total_size}MB"
-      #     Funlog.instance.fancyinfo_update(upload_message)
-      # end
-
   end
 end

data/lib/pindo/version.rb

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

metadata

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