git-fit 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca129e8a18a66ca1cf48deaaffac3c5a7b84b752737bb52e96906a207be7eb19
-  data.tar.gz: aba8f6fd23d5d6cc89b174b0de160a590dd9a74c20836e4986303e9d2ab5be2b
+  metadata.gz: b08e4aac65236128444a75e0890cdaf1e8b25f08a1db325833c7e6c240019b98
+  data.tar.gz: b028cc241a518348434988519e5602cbe624d73e80f0b3e5bfbfb0bbe13660ab
 SHA512:
-  metadata.gz: 848a12e3fe926fe889c3672d75b0929756ee036622d6c09db8306f6b7590eb63298243d3d90733dcff18b253a285120cf26896546f000f05d7dbe57bc8b28c65
-  data.tar.gz: bbc19cdda1ceee49217d287cc07073cdbee17ecdf6a41774963670dbf377e2933250ef23a21fdfc9beb75624b86212289b6424408f40409d202c0a0873dc62c7
+  metadata.gz: 62d0a2b6b23b44c8d56254fa695fcd5735052319261cb6b146143b88910f704c2eb2df77544bcb23b490409ed271e495d7bade5fff25d6c32e8a9dbb9d717e63
+  data.tar.gz: 6ab10823f7a8d558de35ef6eb51d11d7aa88d03a9d61d175623355d5a1f159cfd6a23c7985836b8edf26ce0284e61d99f1506792c1f3017a62852dfbdc493d1c

data/lib/git_fit/sync/runner.rb

@@ -32,6 +32,8 @@ module GitFit
         @shutdown = false
         @source_start_times = {}
         @source_activated = {}
+        @run_totals = {}
+        @run_processed = {}
       end
 
       def run
@@ -128,6 +130,8 @@ module GitFit
         @adapters.delete(source)
         @source_start_times.delete(source)
         @source_activated.delete(source)
+        @run_totals.delete(source)
+        @run_processed.delete(source)
       end
 
       def worker_loop
@@ -156,13 +160,13 @@ module GitFit
       end
 
       def process_source(source)
-        @stats_lock.synchronize { @source_start_times[source] ||= Time.now }
         unless init_source(source)
           finish_activity(source)
           return
         end
+        @stats_lock.synchronize { @source_start_times[source] ||= Time.now }
 
-        total = @pending_ids[source].size
+        total = @run_totals[source] ||= @pending_ids[source].size
         processed = 0
         timed_out_local = false
         auth_failed_local = false
@@ -209,6 +213,8 @@ module GitFit
           break if processed >= BATCH_SIZE
         end
 
+        @run_processed[source] = (@run_processed[source] || 0) + processed
+
         if auth_failed_local
           finish_activity(source, true, 're-auth failed')
         else
@@ -246,10 +252,11 @@ module GitFit
       end
 
       def report_activity_progress(source, activity, result, processed, total)
+        acc = (@run_processed[source] || 0) + processed
         info = result ? @adapters[source].build_progress_info(result) : nil
         @output_queue << {
           type: :progress, source:, id: activity[:id],
-          info:, done: processed, total:
+          info:, done: acc, total:
         }
       end
 
@@ -352,7 +359,7 @@ module GitFit
           elsif (cnt = info[:done]) && cnt > 0
             label = "#{cnt} synced"
             label += ", #{err} errors" if err > 0
-            label += " (auth failed)" if info[:auth_failed]
+            label += ' (auth failed)' if info[:auth_failed]
             $stdout.puts "    done: #{s}: #{label}"
           elsif info[:auth_failed]
             $stdout.puts "    done: #{s}: 0 synced (auth failed)"
@@ -369,10 +376,9 @@ module GitFit
       end
 
       def show_progress?(done, total)
-        return true if done.nil? || done <= 3
+        return true if done.nil?
         return true if total && (total - done) <= 5
-        step = total && total > 0 ? [1, (total / 15.0).ceil].max : 1
-        step <= 1 || done % step == 0
+        done % BATCH_SIZE == 1
       end
     end
   end

data/lib/git_fit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitFit
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fit
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Lax