From ab1adc48f8be993f4a66a33c75f89202ae4a7fc4 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Koga <shiena.jp@gmail.com>
Date: Sun, 12 Feb 2017 01:53:25 +0900
Subject: [PATCH] Move readableSize to view helpers

---
 src/main/scala/gitbucket/core/util/JGitUtil.scala  | 4 ----
 src/main/scala/gitbucket/core/view/helpers.scala   | 7 +++++++
 src/main/twirl/gitbucket/core/repo/blob.scala.html | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/gitbucket/core/util/JGitUtil.scala b/src/main/scala/gitbucket/core/util/JGitUtil.scala
index 257eaf1a2..e26a733fd 100644
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -129,10 +129,6 @@ object JGitUtil {
      * the line separator of this content ("LF" or "CRLF")
      */
     val lineSeparator: String = if(content.exists(_.indexOf("\r\n") >= 0)) "CRLF" else "LF"
-    /**
-     * a human-readable display value (includes units - EB, PB, TB, GB, MB, KB or bytes)
-     */
-    val readableSize = FileUtil.readableSize(size.getOrElse(0))
   }
 
   /**
diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala
index beff9d5fd..dc4e1c128 100644
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -380,4 +380,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
     }
   }
 
+  /**
+   * a human-readable display value (includes units - EB, PB, TB, GB, MB, KB or bytes)
+   *
+   * @param size total size of object in bytes
+   */
+  def readableSize(size: Option[Long]): String = FileUtil.readableSize(size.getOrElse(0))
+
 }
diff --git a/src/main/twirl/gitbucket/core/repo/blob.scala.html b/src/main/twirl/gitbucket/core/repo/blob.scala.html
index 1156cbcfd..9ddd35eca 100644
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -54,7 +54,7 @@
       @helpers.avatar(latestCommit, 28)
       @helpers.user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
       <span class="muted">@gitbucket.core.helper.html.datetimeago(latestCommit.commitTime)</span>
-      @content.readableSize
+      @helpers.readableSize(content.size)
       <a href="@helpers.url(repository)/commit/@latestCommit.id" class="commit-message">@helpers.link(latestCommit.summary, repository)</a>
       <div class="btn-group pull-right">
         @if(hasWritePermission && content.viewType == "text" && repository.branchList.contains(branch)){