[EGIT] [apps/evisum] master 01/01: disk: oops sorting by cpu % was broke :)

[Alastair Poole]

netstar pushed a commit to branch master.

http://git.enlightenment.org/apps/evisum.git/commit/?id=1e5a4a2d0db8512f250ab8ba12df9004cc59c800

commit 1e5a4a2d0db8512f250ab8ba12df9004cc59c800
Author: Alastair Poole <nets...@gmail.com>
Date:   Sat Jan 9 09:19:35 2021 +0000

    disk: oops sorting by cpu % was broke :)
---
 src/bin/ui/ui.c      |  1 -
 src/bin/ui/ui_disk.c | 23 +++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index 2368cb9..4bd12fe 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -402,7 +402,6 @@ evisum_ui_main_menu_create(Ui *ui, Evas_Object *parent, 
Evas_Object *obj)
    elm_box_pack_end(hbox, btn);
    elm_box_pack_end(bx, hbox);
 
-
    Menu_Inst *inst = calloc(1, sizeof(Menu_Inst));
    if (!inst) return NULL;
    inst->timer = ecore_timer_add(0.5, _main_menu_focus_timer_cb, inst);
diff --git a/src/bin/ui/ui_disk.c b/src/bin/ui/ui_disk.c
index 19fc532..d6eb3f4 100644
--- a/src/bin/ui/ui_disk.c
+++ b/src/bin/ui/ui_disk.c
@@ -389,6 +389,25 @@ _sort_by_used(const void *p1, const void *p2)
    return 0;
 }
 
+static int
+_sort_by_cpu_usage(const void *p1, const void *p2)
+{
+   const File_System *fs1, *fs2;
+   int64_t used1 = 0, used2 = 0;
+
+   fs1 = p1; fs2 = p2;
+
+   if (fs1->usage.used && fs1->usage.total)
+     used1 = fs1->usage.used / (fs1->usage.total / 100);
+   if (fs2->usage.used && fs2->usage.total)
+     used2 = fs2->usage.used / (fs2->usage.total / 100);
+
+   if (used1 > used2) return 1;
+   if (used1 < used2) return -1;
+
+   return 0;
+}
+
 static int
 _sort_by_free(const void *p1, const void *p2)
 {
@@ -528,10 +547,10 @@ _btn_usage_clicked_cb(void *data EINA_UNUSED, Evas_Object 
*obj,
 {
    Ui_Data *pd = data;
 
-   if (pd->sort_cb == _sort_by_total)
+   if (pd->sort_cb == _sort_by_cpu_usage)
      pd->sort_reverse = !pd->sort_reverse;
 
-   pd->sort_cb = _sort_by_total;
+   pd->sort_cb = _sort_by_cpu_usage;
    _btn_icon_state_set(obj, pd->sort_reverse);
    _disks_poll_update(pd);
 }

--