Merge pull request #1160 from meramsey/patch-1

Update filemanager.py to fix filesize issues
usmannasir · Nov 23, 2023 · 44dff41 · 44dff41
2 parents 589f87a + 1f6dd3c
commit 44dff41
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/filemanager/filemanager.py b/filemanager/filemanager.py
@@ -172,7 +172,8 @@ def changeOwner(self, path):
             ProcessUtilities.executioner(command, website.externalApp)
         except:
             print("Permisson not changed")
-
+
+
     def listForTable(self):
         try:
             finalData = {}

diff --git a/filemanager/static/filemanager/js/fileManager.js b/filemanager/static/filemanager/js/fileManager.js
@@ -14,6 +14,28 @@ function getCookie(name) {
     return cookieValue;
 }
 
+// JavaScript function to convert bytes to a human-readable format
+function bytesToHumanReadable(bytes, suffix = 'B') {
+    let units = ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z'];
+    let i = 0;
+    while (Math.abs(bytes) >= 1024 && i < units.length - 1) {
+        bytes /= 1024;
+        ++i;
+    }
+    return bytes.toFixed(1) + units[i] + suffix;
+}
+
+// JavaScript function to convert kilobytes to a human-readable format
+function kilobytesToHumanReadable(kilobytes, suffix = 'KB') {
+    let units = ['KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+    let i = 0;
+    while (Math.abs(kilobytes) >= 1024 && i < units.length - 1) {
+        kilobytes /= 1024;
+        ++i;
+    }
+    return kilobytes.toFixed(2) + ' ' + units[i];
+}
+
 var fileManager = angular.module('fileManager', ['angularFileUpload']);
 
 fileManager.config(['$interpolateProvider', function ($interpolateProvider) {
@@ -721,7 +743,8 @@ fileManager.controller('fileManagerCtrl', function ($scope, $http, FileUploader,
                     } else {
                         var fileName = filesData[keys[i]][0];
                         var lastModified = filesData[keys[i]][2];
-                        var fileSize = filesData[keys[i]][3];
+                        var fileSizeBytes = parseInt(filesData[keys[i]][3], 10); // Assuming this is the size in kilobytes
+            			var fileSize = kilobytesToHumanReadable(fileSizeBytes); // Convert to human-readable format
                         var permissions = filesData[keys[i]][4];
                         var dirCheck = filesData[keys[i]][5];
                         // console.log(fileName);

diff --git a/filemanager/templates/filemanager/index.html b/filemanager/templates/filemanager/index.html
@@ -153,7 +153,7 @@
                 <tr>
                     <th scope="col"></th>
                     <th scope="col">{% trans "File Name" %}</th>
-                    <th scope="col">{% trans "Size (KB)" %}</th>
+                    <th scope="col">{% trans "Size" %}</th>
                     <th scope="col">{% trans "Last Modified" %}</th>
                     <th scope="col">{% trans "Permissions" %}</th>
                 </tr>
@@ -738,4 +738,4 @@ <h5 class="modal-title" >{% trans "Confirm Restore!" %} <img ng-hide="cyberPanel
 </div>
 
 </body>
-</html>
+</html>