tapsoob 0.5.25 → 0.5.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87f86ef24606eac9b07a505455b518402d33d522b8e14420dfe36fbcc38beb78
-  data.tar.gz: 46722746c4d5c6ec5247f28cb5d05d33f55d78e3a8fd7ee560096c097351c9fd
+  metadata.gz: d9e2d75dd19008094d30f87a528281d1a6df5c0b2bda8faa79a67dbeb2bb22ce
+  data.tar.gz: 940c827d7dd14127f99116e66ddaa9ceb0d7fcab0127876748e1b571cde7d140
 SHA512:
-  metadata.gz: 2de7d2c3841e96e5b322cec4079b6d70a6b8fe761fde5e4b3799676cb61af6f2f38efed8a95ff40470b783db0897e21e93e44da541507b351e0f7c814fb18242
-  data.tar.gz: 363345d8ad6ce7847e1480c70e26cfabc6f27a8d9581b1f33e7bd7c9df3d270b8d9f7cec4cb6e267e234fbc15f3f5b70a5e5d559f979fbf09e15621f8b235789
+  metadata.gz: 537960e95fb5ae7b5e3d2e022c56fdf26ac989017274fea1f59fe8510e30248c8c8c3a060e70515d7b9db2882748962ae2423a3d9f6e1e63acf65c69b2741065
+  data.tar.gz: 027f3de686550ba21a5b44106d005526215e8f06667fcb80f8d6b5783423b453f1d1f4aef9be763bcf2e1ac7d4b25b8898a65d6f93798172203b91367d46e8d3

data/lib/tapsoob/operation.rb

@@ -198,11 +198,12 @@ module Tapsoob
       log.info "#{tables.size} tables, #{format_number(record_count)} records"
 
       tables.each do |table_name, count|
-        progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, count) : nil)
         stream   = Tapsoob::DataStream.factory(db, {
           :chunksize  => default_chunksize,
           :table_name => table_name
         }, { :debug => opts[:debug] })
+        estimated_chunks = (count.to_f / default_chunksize).ceil
+        progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, estimated_chunks) : nil)
         pull_data_from_table(stream, progress)
       end
     end
@@ -214,8 +215,10 @@ module Tapsoob
       record_count = tables[table_name.to_s]
       log.info "Resuming #{table_name}, #{format_number(record_count)} records"
 
-      progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, record_count) : nil)
       stream = Tapsoob::DataStream.factory(db, stream_state)
+      chunksize = stream_state[:chunksize] || default_chunksize
+      estimated_chunks = (record_count.to_f / chunksize).ceil
+      progress = (opts[:progress] ? ProgressBar.new(table_name.to_s, estimated_chunks) : nil)
       pull_data_from_table(stream, progress)
     end
 
@@ -249,6 +252,9 @@ module Tapsoob
             stream.fetch_data_from_database(data) do |rows|
               next if rows == {}
 
+              # Update progress bar by 1 chunk
+              progress.inc(1) if progress
+
               if dump_path.nil?
                 puts JSON.generate(rows)
               else
@@ -258,9 +264,9 @@ module Tapsoob
             log.debug "row size: #{row_size}"
             stream.error = false
             self.stream_state = stream.to_hash
-            
+
             c.idle_secs = (d1 + d2)
-            
+
             elapsed_time
           end
         rescue Tapsoob::CorruptedData => e
@@ -268,8 +274,6 @@ module Tapsoob
           stream.error = true
           next
         end
-
-        progress.inc(row_size) if progress
         
         break if stream.complete?
       end

data/lib/tapsoob/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Tapsoob
-  VERSION = "0.5.25".freeze
+  VERSION = "0.5.27".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tapsoob
 version: !ruby/object:Gem::Version
-  version: 0.5.25
+  version: 0.5.27
 platform: ruby
 authors:
 - Félix Bellanger