Merge pull request #367 from blackcandy-org/format-library-count-number

Format big count number of library to human readable
blackcandy-org · Apr 18, 2024 · 5fe380e · 5fe380e
2 parents 0364bf2 + 618fe71
commit 5fe380e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -72,6 +72,10 @@ def format_duration(sec)
     (sec > 1.hour) ? time.strftime("%T") : time.strftime("%M:%S")
   end
 
+  def format_number(number)
+    number_to_human(number, units: {thousand: "K", million: "M", billion: "B"}, precision: 1, significant: false)
+  end
+
   def is_active?(controller: "", path: "")
     params[:controller].in?(Array(controller)) || (path.is_a?(Regexp) ? (path =~ request.path) : (path == request.path))
   end

diff --git a/app/javascript/controllers/player_controller.js b/app/javascript/controllers/player_controller.js
@@ -146,7 +146,7 @@ export default class extends Controller {
     window.requestAnimationFrame(this.#setProgress.bind(this))
     this.timerInterval = setInterval(this.#setTimer.bind(this), 1000)
 
-    // let playlist can show current palying song
+    // let playlist can show current playing song
     dispatchEvent(document, 'playlistSongs:showPlaying')
   }
 

diff --git a/app/views/libraries/show.html.erb b/app/views/libraries/show.html.erb
@@ -8,7 +8,7 @@
           <%= icon_tag "album", class: "u-mr-tiny" %>
           <%= t("label.albums") %>
         </span>
-        <span class='c-badge'><%= @albums_count %></span>
+        <span class='c-badge'><%= format_number(@albums_count) %></span>
       <% end %>
     </li>
     <li class='c-list__item'>
@@ -17,7 +17,7 @@
           <%= icon_tag "mic", class: "u-mr-tiny" %>
           <%= t("label.artists") %>
         </span>
-        <span class='c-badge'><%= @artists_count %></span>
+        <span class='c-badge'><%= format_number(@artists_count) %></span>
       <% end %>
     </li>
     <li class='c-list__item'>
@@ -26,7 +26,7 @@
           <%= icon_tag "queue-music", class: "u-mr-tiny" %>
           <%= t("label.playlists") %>
         </span>
-        <span class='c-badge'><%= @playlists_count %></span>
+        <span class='c-badge'><%= format_number(@playlists_count) %></span>
       <% end %>
     </li>
     <li class='c-list__item'>
@@ -35,7 +35,7 @@
           <%= icon_tag "music-note", class: "u-mr-tiny" %>
           <%= t("label.songs") %>
         </span>
-        <span class='c-badge'><%= @songs_count %></span>
+        <span class='c-badge'><%= format_number(@songs_count) %></span>
       <% end %>
     </li>
   </ul>

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
@@ -3,7 +3,7 @@
 require "test_helper"
 
 class ApplicationHelperTest < ActionView::TestCase
-  test "format_duration" do
+  test "format duration" do
     assert_equal "00:09", format_duration(9)
     assert_equal "01:30", format_duration(90)
     assert_equal "15:00", format_duration(900)
@@ -17,4 +17,11 @@ class ApplicationHelperTest < ActionView::TestCase
     assert_includes empty_alert_tag(has_icon: true), "c-icon"
     assert_not_includes empty_alert_tag(has_overlay: false), "c-overlay"
   end
+
+  test "format number" do
+    assert_equal "135", format_number(135)
+    assert_equal "1.4 K", format_number(1350)
+    assert_equal "1.4 M", format_number(1350000)
+    assert_equal "1.4 B", format_number(1350000000)
+  end
 end