handle commentary from the pr

Author: rytilahti

mirobo/vacuum.py

@@ -2,6 +2,7 @@
 import math
 import time
 from typing import List
+import enum
 
 from .vacuumcontainers import (VacuumStatus, ConsumableStatus,
                                CleaningSummary, CleaningDetails, Timer)
@@ -14,6 +15,10 @@ class VacuumException(DeviceException):
     pass
 
 
+class TimerState(enum.Enum):
+    On = "on"
+    Off = "off"
+
 class Vacuum(Device):
     """Main class representing the vacuum."""
 
@@ -139,20 +144,22 @@ def timer(self) -> List[Timer]:
 
         return timers
 
-    def add_timer(self, cron, command, parameters):
+    def add_timer(self, cron: str, command: str, parameters: str):
+        """Add a timer."""
         import time
         ts = int(round(time.time() * 1000))
         return self.send("set_timer", [
             [str(ts), [cron, [command, parameters]]]
         ])
 
     def delete_timer(self, timer_id: int):
+        """Delete a timer."""
         return self.send("del_timer", [str(timer_id)])
 
-    def update_timer(self, timer_id: int, mode):
-        if mode != "on" and mode != "off":
-            raise DeviceException("'on' or 'off are only allowed")
-        return self.send("upd_timer", [str(timer_id), mode])
+    def update_timer(self, timer_id: int, mode: TimerState):
+        if mode != TimerState.On and mode != TimerState.Off:
+            raise DeviceException("Only 'On' or 'Off' are  allowed")
+        return self.send("upd_timer", [str(timer_id), mode.value])
 
     def dnd_status(self):
         """Returns do-not-disturb status."""

mirobo/vacuum_cli.py

@@ -302,16 +302,13 @@ def timer(ctx, vac: mirobo.Vacuum):
     if ctx.invoked_subcommand is not None:
         return
     timers = vac.timer()
+    click.echo("Timezone: %s\n" % vac.timezone())
     for idx, timer in enumerate(timers):
         color = "green" if timer.enabled else "yellow"
-        #  Note ts == ID for changes
         click.echo(click.style("Timer #%s, id %s (ts: %s)" % (
             idx, timer.id, timer.ts), bold=True, fg=color))
-        print("  %s" % timer.cron)
+        click.echo("  %s" % timer.cron)
         min, hr, x, y, days = timer.cron.split(' ')
-        # hr is in gmt+8 (chinese time), TODO convert to local
-        if hr != '*':
-            hr = (int(hr) - 8) % 24
         cron = "%s %s %s %s %s" % (min, hr, x, y, days)
         click.echo("  %s" % pretty_cron.prettify_cron(cron))
 
@@ -322,29 +319,30 @@ def timer(ctx, vac: mirobo.Vacuum):
 @click.option('--params', default='', required=False)
 @pass_dev
 def add(vac: mirobo.Vacuum, cron, command, params):
-    """Schedule vacuuming.."""
+    """Add a timer."""
     click.echo(vac.add_timer(cron, command, params))
 
 
 @timer.command()
 @click.argument('timer_id', type=int, required=True)
 @pass_dev
 def delete(vac: mirobo.Vacuum, timer_id):
-    """Delete existing schedule."""
+    """Delete a timer."""
     click.echo(vac.delete_timer(timer_id))
 
 
 @timer.command()
 @click.argument('timer_id', type=int, required=True)
-@click.option('--on', is_flag=True)
-@click.option('--off', is_flag=True)
+@click.option('--enable', is_flag=True)
+@click.option('--disable', is_flag=True)
 @pass_dev
-def update(vac: mirobo.Vacuum, timer_id, on, off):
-    """Update (on or off) an existing scheduled."""
-    if on and not off:
-        vac.update_timer(timer_id, "on")
-    elif off and not on:
-        vac.update_timer(timer_id, "off")
+def update(vac: mirobo.Vacuum, timer_id, enable, disable):
+    """Enable/disable a timer."""
+    from mirobo.vacuum import TimerState
+    if enable and not disable:
+        vac.update_timer(timer_id, TimerState.On)
+    elif disable and not enable:
+        vac.update_timer(timer_id, TimerState.Off)
     else:
         click.echo("Only 'on' and 'off' are valid for timer")