usable storage is now displayed

dirkules/hardware/btrfsTools.py

@@ -28,6 +28,7 @@ def get_space(label):
             values[0] = int(newLine[2])
         elif newLine[0] == "Free":
             values[2] = int(newLine[2])
-        # usable missing
+        elif newLine[0] == "Data" and newLine[1] == "ratio:":
+            values[1] = int(values[0]/float(newLine[2]))
     memory_map = (dict(zip(keys, values)))
     return memory_map

dirkules/manager/driveManager.py

@@ -51,9 +51,8 @@ def pool_gen():
         # because not removed and the pool will be displayed twice, because not same part constellation
         if value.fs == "btrfs" and not existence:
             memory_map = btrfsTools.get_space(value.mountpoint)
-            pool_obj = Pool(value.label, memory_map.get("total"), memory_map.get("free"), raid, value.fs,
-                            value.mountpoint,
-                            "not implemented", drives)
+            pool_obj = Pool(value.label, memory_map.get("total"), memory_map.get("usable"), memory_map.get("free"), raid,
+                            value.fs, value.mountpoint, "not implemented", drives)
             db.session.add(pool_obj)
             db.session.commit()
 
@@ -62,8 +61,7 @@ def pool_gen():
                 free_space = ext4Tools.get_free_space(value.name)
             else:
                 free_space = 2
-            pool_obj = Pool(value.label, value.size, free_space, raid, value.fs,
-                            value.mountpoint,
+            pool_obj = Pool(value.label, value.size, value.size, free_space, raid, value.fs, value.mountpoint,
                             "not implemented", drives)
             db.session.add(pool_obj)
             db.session.commit()

dirkules/models.py

@@ -65,6 +65,7 @@ class Pool(db.Model):
     id = db.Column(db.Integer, primary_key=True)
     label = db.Column(db.String)
     size = db.Column(db.Integer)
+    usable = db.Column(db.Integer)
     free = db.Column(db.Integer)
     raid = db.Column(db.String)
     fs = db.Column(db.String)
@@ -72,9 +73,10 @@ class Pool(db.Model):
     mountopt = db.Column(db.String)
     drives = db.Column(db.String)
 
-    def __init__(self, label, size, free, raid, fs, mountpoint, mountopt, drives):
+    def __init__(self, label, size, usable, free, raid, fs, mountpoint, mountopt, drives):
         self.label = label
         self.size = size
+        self.usable = usable
         self.free = free
         self.raid = raid
         self.fs = fs

dirkules/templates/pool.html

@@ -27,7 +27,11 @@
                     <td>{{ pool.size|filesizeformat(true) }}</td>
                 </tr>
                 <tr>
-                    <td>Verfügbarer Speicher</td>
+                    <td>Nutzbarer Speicher</td>
+                    <td>{{ pool.usable|filesizeformat(true) }}</td>
+                </tr>
+                <tr>
+                    <td>Freier Speicher</td>
                     <td>{{ pool.free|filesizeformat(true) }}</td>
                 </tr>
                 <tr>
@@ -61,5 +65,6 @@
                 </tbody>
             </table>
         </div>
+    Es fehlt noch Data ratio, Metadata ratio
     </div>
 {% endblock %}