[ status ] fixing meters

Author: soapdog

lib/depject/page/html/render/status.js

@@ -22,23 +22,25 @@ exports.create = function (api) {
     const indexProgress = computed(indexes, calcProgress);
     const pluginIndexes = api.progress.obs.plugins();
     const peer = api.progress.obs.peer();
-    const pluginIndexesDict = Dict();
     const indexesJson = computed(
       [indexes, pluginIndexes],
       (indexes, plugins) => {
-        Object.keys(plugins).forEach((k) => {
-          pluginIndexesDict.put(
-            k,
-            calcProgress({
-              target: indexes.target,
-              start: indexes.start,
-              current: plugins[k],
-            }),
-          );
-        });
         return JSON.stringify({ indexes, plugins }, null, 4);
       },
     );
+    const pluginProgress = computed([indexes, pluginIndexes], (indexes, plugins) => {
+      const keys = Object.keys(plugins)
+      const result = []
+      keys.forEach(k => {
+        const obj = {
+          target: indexes.target,
+          start: indexes.start,
+          current: plugins[k]
+        }
+        result.push([k, calcProgress(obj)])
+      })
+      return result
+    })
     const statusObj = computed([peer], (peer) => {
       return JSON.stringify(peer, null, 4);
     });
@@ -89,23 +91,17 @@ exports.create = function (api) {
               }),
             ]),
 
-            map(dictToCollection(pluginIndexesDict), (item) => {
-              const v = calcProgress({
-                target: indexes.target,
-                start: indexes.start,
-                current: item.value(),
-              });
-              console.log(`${item?.key()}: ${v}`)
+            map(pluginProgress, (item) => {
               return h("ReportItem", [
-                h("span.info", item.key),
+                h("span.info", item[0]),
                 h("meter", {
                   style: { "margin-left": "10px" },
                   min: 0,
                   max: 1,
                   low: 0.5,
                   high: 0.9,
                   optimum: 0.97,
-                  value: v,
+                  value: item[1],
                 }),
               ]);
             }),