Tweaked cli output

CJNE · Sep 20, 2021 · 91dcb3d · 91dcb3d
1 parent f5cda7a
commit 91dcb3d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/pymyenergi/cli.py b/pymyenergi/cli.py
@@ -36,7 +36,7 @@ async def main(args):
                 if args.json:
                     print(json.dumps(device.data, indent=2))
                 else:
-                    print(device.show())
+                    print(device.show(True))
         elif args.command == "overview":
             out = await client.show()
             print(out)

diff --git a/pymyenergi/eddi.py b/pymyenergi/eddi.py
@@ -160,14 +160,17 @@ async def start_boost(self, target: int, time: int):
         )
         return True
 
-    def show(self):
+    def show(self, short_format=False):
         """Returns a string with all data in human readable format"""
         ret = ""
         name = ""
         if self.name:
             name = f" {self.name}"
-        ret = ret + f"Eddi{name} "
-        ret = ret + f"S/N {self.serial_number} version {self.firmware_version}\n\n"
+        ret = ret + f"Eddi S/N {self.serial_number}"
+        ret = ret + f"{name} version {self.firmware_version}\n\n"
+        if short_format:
+            return ret
+        ret = ret.center(80, "-") + "\n"
         ret = ret + f"Active heater: {self.active_heater}"
         ret = ret + f"Priority: {self.priority}"
         if self.is_boosting:

diff --git a/pymyenergi/harvi.py b/pymyenergi/harvi.py
@@ -34,14 +34,17 @@ def ct3(self):
     def prefix(self):
         return "H"
 
-    def show(self):
+    def show(self, short_format=False):
         """Returns a string with all data in human readable format"""
         ret = ""
         name = ""
         if self.name:
             name = f" {self.name}"
-        ret = ret + f"Harvi{name} "
-        ret = ret + f"S/N {self.serial_number} version {self.firmware_version}\n\n"
+        ret = ret + f"Harvi S/N {self.serial_number}"
+        ret = ret + f"{name}"
+        if short_format:
+            return ret
+        ret = ret.center(80, "-") + "\n"
         ret = ret + f"CT 1 {self.ct1.name} {self.ct1.power}W phase {self.ct1.phase}\n"
         ret = ret + f"CT 2 {self.ct2.name} {self.ct2.power}W phase {self.ct2.phase}\n"
         ret = ret + f"CT 3 {self.ct3.name} {self.ct3.power}W phase {self.ct3.phase}\n"

diff --git a/pymyenergi/zappi.py b/pymyenergi/zappi.py
@@ -245,14 +245,17 @@ def zsh(self):
     def zsl(self):
         return self._data.get("zsl")
 
-    def show(self):
+    def show(self, short_format=False):
         """Returns a string with all data in human readable format"""
-        ret = ""
         name = ""
+        ret = ""
         if self.name:
             name = f" {self.name}"
-        ret = ret + f"Zappi{name} "
-        ret = ret + f"S/N {self.serial_number} version {self.firmware_version}\n\n"
+        ret = ret + f"Zappi S/N {self.serial_number}"
+        ret = ret + f"{name} version {self.firmware_version}"
+        if short_format:
+            return ret
+        ret = ret.center(80, "-") + "\n"
         ret = ret + f"Status: {self.status}\n"
         ret = ret + f"Plug status: {self.plug_status}\n"
         ret = ret + f"Locked: {self.locked}\n"