From ae0c83917256a28b64fae4cc5159e1b1c98ba1e5 Mon Sep 17 00:00:00 2001
From: RememBerBer <rememberber@163.com>
Date: Thu, 25 Nov 2021 23:09:10 +0800
Subject: [PATCH] Some code optimization

---
 .../moo/info/ui/form/MemoryForm.java          |  1 +
 .../moo/info/ui/form/PowerSourceForm.java     | 26 +++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/MemoryForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/MemoryForm.java
index a32e6eb..d871c8e 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/form/MemoryForm.java
+++ b/src/main/java/com/luoboduner/moo/info/ui/form/MemoryForm.java
@@ -166,6 +166,7 @@ public class MemoryForm {
         StringBuilder builder = new StringBuilder();
         GlobalMemory globalMemory = App.si.getHardware().getMemory();
 
+        builder.append("<br/>");
         builder.append("<b>Total: </b>").append(DataSizeUtil.format(globalMemory.getTotal()));
         builder.append("<br/><b>Page Size: </b>").append(DataSizeUtil.format(globalMemory.getPageSize()));
         builder.append("<br/>");
diff --git a/src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java b/src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java
index 29b9983..04a49e3 100644
--- a/src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java
+++ b/src/main/java/com/luoboduner/moo/info/ui/form/PowerSourceForm.java
@@ -140,8 +140,8 @@ public class PowerSourceForm {
             powerInfoBuilder.append("<b>Name: </b>").append(powerSource.getName());
             powerInfoBuilder.append("<br/><b>Device Name: </b>").append(powerSource.getDeviceName());
             powerInfoBuilder.append("<br/><b>Remaining Capacity Percent: </b>").append(powerSource.getRemainingCapacityPercent() * 100).append("%");
-            powerInfoBuilder.append("<br/><b>Time Remaining: </b>").append(powerSource.getTimeRemainingEstimated());
-            powerInfoBuilder.append("<br/><b>Time Remaining Instant: </b>").append(powerSource.getTimeRemainingInstant());
+            powerInfoBuilder.append("<br/><b>Time Remaining: </b>").append(formatTimeRemaining(powerSource.getTimeRemainingEstimated()));
+            powerInfoBuilder.append("<br/><b>Time Remaining Instant: </b>").append(formatTimeRemaining(powerSource.getTimeRemainingInstant()));
             powerInfoBuilder.append("<br/><b>Power Usage Rate: </b>").append(powerSource.getPowerUsageRate());
             powerInfoBuilder.append("<br/><b>Voltage: </b>").append(powerSource.getVoltage());
             powerInfoBuilder.append("<br/><b>Amperage: </b>").append(powerSource.getAmperage());
@@ -160,6 +160,28 @@ public class PowerSourceForm {
         return powerInfoBuilder.toString();
     }
 
+
+    /**
+     * copied from oshi
+     * Estimated time remaining on power source, formatted as HH:mm
+     *
+     * @param timeInSeconds The time remaining, in seconds
+     * @return formatted String of time remaining
+     */
+    private static String formatTimeRemaining(double timeInSeconds) {
+        String formattedTimeRemaining;
+        if (timeInSeconds < -1.5) {
+            formattedTimeRemaining = "Charging";
+        } else if (timeInSeconds < 0) {
+            formattedTimeRemaining = "Unknown";
+        } else {
+            int hours = (int) (timeInSeconds / 3600);
+            int minutes = (int) (timeInSeconds % 3600 / 60);
+            formattedTimeRemaining = String.format("%d:%02d", hours, minutes);
+        }
+        return formattedTimeRemaining;
+    }
+
     {
 // GUI initializer generated by IntelliJ IDEA GUI Designer
 // >>> IMPORTANT!! <<<