Show remaining seconds instead of minutes for last 60 seconds

droonga · Nov 21, 2014 · 6505fb1 · 6505fb1
1 parent 1e471a3
commit 6505fb1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/droonga/data_absorber.rb b/lib/droonga/data_absorber.rb
@@ -79,8 +79,12 @@ def report_progress(start_time_in_seconds)
       progress = elapsed_time.to_f / required_time_in_seconds
       progress = [(progress * 100).to_i, 100].min
       remaining_time_in_seconds = [required_time_in_seconds - elapsed_time, 0].max
-      remaining_time_in_minutes = remaining_time_in_seconds.to_f / 60
-      "#{progress}% done (maybe #{remaining_time_in_minutes}minutes remaining)"
+      if remaining_time_in_seconds < 60
+        "#{progress}% done (maybe #{remaining_time_in_seconds} seconds remaining)"
+      else
+        remaining_time_in_minutes = remaining_time_in_seconds.to_f / 60
+        "#{progress}% done (maybe #{remaining_time_in_minutes} minutes remaining)"
+      end
     end
 
     private