From b30a8f4b447e59cfd5682821716f6c22d4e885aa Mon Sep 17 00:00:00 2001
From: itdominator <1itdominator@gmail.com>
Date: Fri, 18 Mar 2022 17:18:13 -0500
Subject: [PATCH] added size info, new sort logic

---
 src/core/static/css/main.css                |  5 +++
 src/core/static/js/react-ui-logic.js        | 16 +++++--
 src/core/utils/shellfm/windows/view/View.py | 46 +++++++++++++++++----
 3 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/src/core/static/css/main.css b/src/core/static/css/main.css
index df670ca..7e471bb 100644
--- a/src/core/static/css/main.css
+++ b/src/core/static/css/main.css
@@ -79,6 +79,11 @@
 	max-height: 100% !important;
 }
 
+.float-right {
+    float: right;
+    text-align: right;
+    font-size: initial;
+}
 
 /* Other message text colors */
 .errorTxt   { color: rgb(170, 18, 18); }
diff --git a/src/core/static/js/react-ui-logic.js b/src/core/static/js/react-ui-logic.js
index 8121825..57fc44c 100644
--- a/src/core/static/js/react-ui-logic.js
+++ b/src/core/static/js/react-ui-logic.js
@@ -54,6 +54,7 @@ class FilesList extends React.Component {
         for (let file of files) {
             const name    = file[0];
             const hash    = file[1];
+            const fsize   = file[2];
             let extension = re.exec( name.toLowerCase() )[1] ? name : "file.dir";
             let data      = setFileIconType(extension);
             let icon      = data[0];
@@ -63,13 +64,22 @@ class FilesList extends React.Component {
 
             if (filetype === "video") {
                 card_header = name;
-                card_body   = <img class="card-img-top" src={"static/imgs/thumbnails/" + hash + ".jpg"} alt={name} />;
+                card_body   = <React.Fragment>
+                                <img class="card-img-top" src={"static/imgs/thumbnails/" + hash + ".jpg"} alt={name} />
+                                <span class="float-right">{fsize}</span>
+                            </React.Fragment>;
             } else if (filetype === "image") {
                 card_header = name;
-                card_body   = <img class="card-img-top" src={"api/file-manager-action/files/" + hash} alt={name} />;
+                card_body   = <React.Fragment>
+                                <img class="card-img-top" src={"api/file-manager-action/files/" + hash} alt={name} />
+                                <span class="float-right">{fsize}</span>
+                            </React.Fragment>;
             } else {
                 card_header = <img class="icon-style" src={icon} alt={name} />;
-                card_body = name;
+                card_body = <React.Fragment>
+                                {name}
+                                <span>{fsize}</span>
+                            </React.Fragment>;
 
             }
 
diff --git a/src/core/utils/shellfm/windows/view/View.py b/src/core/utils/shellfm/windows/view/View.py
index 2a37a5f..70a97d4 100644
--- a/src/core/utils/shellfm/windows/view/View.py
+++ b/src/core/utils/shellfm/windows/view/View.py
@@ -1,6 +1,5 @@
 # Python imports
-import hashlib
-import os
+import hashlib, os, re
 from os import listdir
 from os.path import isdir, isfile, join
 
@@ -56,11 +55,11 @@ class View(Settings, Launcher, Path):
             else:
                 self.dirs.append(f)
 
-        self.dirs.sort()
-        self.vids.sort()
-        self.images.sort()
-        self.desktop.sort()
-        self.ungrouped.sort()
+        self.dirs.sort(key=self._natural_keys)
+        self.vids.sort(key=self._natural_keys)
+        self.images.sort(key=self._natural_keys)
+        self.desktop.sort(key=self._natural_keys)
+        self.ungrouped.sort(key=self._natural_keys)
 
         self.files = self.dirs + self.vids + self.images + self.desktop + self.ungrouped
 
@@ -68,9 +67,12 @@ class View(Settings, Launcher, Path):
         return hashlib.sha256(str.encode(text)).hexdigest()[:18]
 
     def hashSet(self, arry):
+        path = self.get_path()
         data = []
         for arr in arry:
-            data.append([arr, self.hashText(arr)])
+            file = f"{path}/{arr}"
+            size = "4K" if isdir(file) else self.sizeof_fmt(os.path.getsize(file))
+            data.append([arr, self.hashText(arr), size])
         return data
 
     def get_path_part_from_hash(self, hash):
@@ -167,3 +169,31 @@ class View(Settings, Launcher, Path):
 
     def get_ungrouped(self):
         return self.hashSet(self.ungrouped)
+
+    def sizeof_fmt(self, num, suffix="B"):
+        for unit in ["", "K", "M", "G", "T", "Pi", "Ei", "Zi"]:
+            if abs(num) < 1024.0:
+                return f"{num:3.1f} {unit}{suffix}"
+            num /= 1024.0
+        return f"{num:.1f} Yi{suffix}"
+
+    def get_dir_size(self, sdir):
+        """Get the size of a directory.  Based on code found online."""
+        size = os.path.getsize(sdir)
+
+        for item in listdir(sdir):
+            item = join(sdir, item)
+
+            if isfile(item):
+                size = size + os.path.getsize(item)
+            elif isdir(item):
+                size = size + self.get_dir_size(item)
+
+        return size
+
+
+    def _atoi(self, text):
+        return int(text) if text.isdigit() else text
+
+    def _natural_keys(self, text):
+        return [ self._atoi(c) for c in re.split('(\d+)',text) ]