tapsoob 0.5.26 → 0.5.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f19b27231e8231c5a11cb879256df846b2963712eb9a335549f7c3199144b74
-  data.tar.gz: 792abe05f841fe4aa5a55de950d371f0ba23bb0d1ebfcb4e7c6ab76b695cd47d
+  metadata.gz: d9e2d75dd19008094d30f87a528281d1a6df5c0b2bda8faa79a67dbeb2bb22ce
+  data.tar.gz: 940c827d7dd14127f99116e66ddaa9ceb0d7fcab0127876748e1b571cde7d140
 SHA512:
-  metadata.gz: d0ca8097f4ba556ef856e33b8c9e6e03c68636af1dc2c6d1896d3c399d5835cedb2de3d889bef199e903efc09eb2a3da74a9f9e2806dcc7a178bd3cda37c175f
-  data.tar.gz: 6a9c81e0acc7eca5296e718bd3e20bc224b23cb788b16d8b9651e48eda87cde3bcece13159d0ffcae4ff4d2e8b71144d818b2eef276dd7e967e1fd6020a5292c
+  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,8 +252,8 @@ module Tapsoob
             stream.fetch_data_from_database(data) do |rows|
               next if rows == {}
 
-              # Update progress bar immediately when data is ready, before I/O
-              progress.inc(row_size) if progress
+              # Update progress bar by 1 chunk
+              progress.inc(1) if progress
 
               if dump_path.nil?
                 puts JSON.generate(rows)

data/lib/tapsoob/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Tapsoob
-  VERSION = "0.5.26".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.26
+  version: 0.5.27
 platform: ruby
 authors:
 - Félix Bellanger