From 889dfad9fac60f691844dca4c93c3a4778d1c786 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Thu, 25 Aug 2016 13:26:53 +0800
Subject: [PATCH] decide storage unit automatically

---
 app/Models/User.php             |  6 +++---
 resources/views/admin/index.tpl |  8 +++-----
 resources/views/user/index.tpl  | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 212d062c..1cc57536 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -165,9 +165,9 @@ class User
         if (is_null($this->storage_used)) {
             $this->storage_used = 0;
             // recalculate
-            $prefix = \Config::getDbConfig()['prefix'];
-            $sql = "SELECT SUM(`size`) AS total_size FROM `{$prefix}textures` WHERE uploader = {$this->uid}";
-            $this->storage_used = \DB::fetchArray($sql)['total_size'];
+            $sql = "SELECT SUM(`size`) AS total_size FROM `{table}` WHERE uploader = {$this->uid}";
+            $result = \DB::table('textures')->fetchArray($sql)['total_size'];
+            $this->storage_used = $result ?: 0;
         }
         return $this->storage_used;
     }
diff --git a/resources/views/admin/index.tpl b/resources/views/admin/index.tpl
index 919a28ef..259e996d 100644
--- a/resources/views/admin/index.tpl
+++ b/resources/views/admin/index.tpl
@@ -46,14 +46,11 @@
                     </div>
                 </div>
 
-
-
-
                 <div class="info-box">
                     <span class="info-box-icon bg-green"><i class="fa fa-files-o"></i></span>
                     <div class="info-box-content">
                         <span class="info-box-text">上传材质总数</span>
-                        <span class="info-box-number">{{ \Storage::getFileNum(BASE_DIR."/textures/") }}</span>
+                        <span class="info-box-number">{{ \DB::table('textures')->getRecordNum() }}</span>
                     </div><!-- /.info-box-content -->
                 </div><!-- /.info-box -->
 
@@ -61,7 +58,8 @@
                     <span class="info-box-icon bg-yellow"><i class="fa fa-hdd-o"></i></span>
                     <div class="info-box-content">
                         <span class="info-box-text">占用空间大小</span>
-                        <span class="info-box-number">{{ floor(\Storage::getDirSize(BASE_DIR."/textures/")/1024)."KB" }}</span>
+                        <?php $size = \DB::table('textures')->fetchArray("SELECT SUM(`size`) AS total_size FROM `{table}` WHERE 1")['total_size']; ?>
+                        <span class="info-box-number">{{ $size > 1024 ? round($size / 1024, 1)."MB" : $size."KB" }}</span>
                     </div><!-- /.info-box-content -->
                 </div><!-- /.info-box -->
             </div>
diff --git a/resources/views/user/index.tpl b/resources/views/user/index.tpl
index 4dcd76cd..10372d1c 100644
--- a/resources/views/user/index.tpl
+++ b/resources/views/user/index.tpl
@@ -43,9 +43,21 @@
                                 </div><!-- /.progress-group -->
                                 <div class="progress-group">
                                     <span class="progress-text">存储空间</span>
-                                    <span class="progress-number"><b>{{ $user->getStorageUsed() }}</b>/{{ $user->getStorageUsed() + $user->getScore() / Option::get('score_per_storage') }} KB</span>
+                                    <?php $rate = Option::get('score_per_storage'); ?>
+                                    @if ($user->getStorageUsed() > 1024)
+                                    <span class="progress-number">
+                                        <b>{{ round($user->getStorageUsed() / 1024, 1) }}</b>/
+                                        {{ round(($user->getStorageUsed() + $user->getScore() / $rate) / 1024, 1) }} MB
+                                    </span>
+                                    @else
+                                    <span class="progress-number">
+                                        <b>{{ $user->getStorageUsed() }}</b>/
+                                        {{ $user->getStorageUsed() + $user->getScore() / $rate }} KB
+                                    </span>
+                                    @endif
+
                                     <div class="progress sm">
-                                        <div class="progress-bar progress-bar-yellow" style="width: {{ $user->getStorageUsed() / ($user->getStorageUsed() + $user->getScore() / Option::get('score_per_storage')) * 100 }}%"></div>
+                                        <div class="progress-bar progress-bar-yellow" style="width: {{ $user->getStorageUsed() / ($user->getStorageUsed() + $user->getScore() / $rate) * 100 }}%"></div>
                                     </div>
                                 </div><!-- /.progress-group -->
                             </div><!-- /.col -->