sort files in explorer view

Author: alshdavid

src/explorer/dir.hbs

@@ -22,6 +22,9 @@
 
     .size {
       padding: 0 8px;
+      text-align: right;
+      display: block;
+      white-space: pre;
     }
 
     i.icon.directory {
@@ -310,7 +313,7 @@
         <td><i class="icon {{this.0}} blank"></i></td>
         <td><code>({{this.1}})</code></td>
         <td>{{this.2}}</td>
-        <td><code class="size">{{this.3}}B</code></td>
+        <td><code class="size">{{this.3}}</code></td>
         <td><a href="/{{this.4}}">{{this.5}}</a></td>
       </tr>
       {{/each}}

src/explorer/mod.rs

@@ -37,7 +37,7 @@ pub fn render_directory_explorer(
   file_path: &Path,
 ) -> anyhow::Result<String> {
   let dir_path = PathBuf::from(file_path);
-  let dir = self::fs::read_dir(&dir_path)?;
+  let dir = fs::read_dir(&dir_path)?;
   let mut files = Vec::<(String, String, String, String, String, String)>::new();
   let mut folders = Vec::<(String, String, String, String)>::new();
 
@@ -105,6 +105,9 @@ pub fn render_directory_explorer(
     }
   }
 
+  folders.sort_by(|a, b| a.3.to_lowercase().cmp(&b.3.to_lowercase()));
+  files.sort_by(|a, b| a.5.to_lowercase().cmp(&b.5.to_lowercase()));
+
   let handlebars = Handlebars::new();
   let Ok(output) = handlebars.render_template(
     DIR_PAGE,

src/explorer/unix.rs

@@ -9,5 +9,19 @@ pub fn get_meta_mode(meta: &Metadata) -> String {
 }
 
 pub fn get_meta_size(meta: &Metadata) -> String {
-  format!("{}", meta.size())
+  let size = meta.size();
+  if size >= 1000 {
+    return format!("{} kb", meta.size() / 1000);
+  }
+  if size >= (1000 * 1000) {
+    return format!("{} mb", meta.size() / (1000 * 1000));
+  }
+  if size >= (1000 * 1000 * 1000) {
+    return format!("{} gb", meta.size() / (1000 * 1000 * 1000));
+  }
+  if size >= (1000 * 1000 * 1000 * 1000) {
+    return format!("{} tb", meta.size() / (1000 * 1000 * 1000 * 1000));
+  }
+
+  format!("{} b ", size)
 }