Add key as an instance attribute of Commander

MarkKoz · 64json · commit 17a3a930853a · 2019-06-11T15:50:09.000+09:00
* Create a separate command() method that is an instance method
* Change destroy() to an instance method
* Change set() and reset() to instance methods
* Make Tracer pass nothing instead of None for the title when title is
  not given
* Make delay() pass nothing instead of None for the lineNumber when
  lineNumber isn't given
diff --git a/algorithm_visualizer/commander.py b/algorithm_visualizer/commander.py
@@ -1,5 +1,5 @@
 import string
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 from algorithm_visualizer import randomize
 
@@ -14,10 +14,11 @@ class Commander:
 
     def __init__(self, *args):
         self._objectCount += 1
+        self.key = self._keyRandomizer.create()
         self.command(self.__class__.__name__, *args)
 
     @classmethod
-    def command(cls, method: str, *args, key: str = _keyRandomizer.create()):
+    def _command(cls, key: Optional[str], method: str, *args):
         cmd = {
             "key": key,
             "method": method,
@@ -30,7 +31,9 @@ def command(cls, method: str, *args, key: str = _keyRandomizer.create()):
         elif cls._objectCount > _MAX_OBJECTS:
             raise RuntimeError("Too Many Objects")
 
-    @classmethod
-    def destroy(cls):
-        cls._objectCount -= 1
-        cls.command("destroy")
+    def command(self, method: str, *args):
+        self._command(self.key, method, *args)
+
+    def destroy(self):
+        self._objectCount -= 1
+        self.command("destroy")
diff --git a/algorithm_visualizer/tracer.py b/algorithm_visualizer/tracer.py
@@ -10,12 +10,13 @@ def __init__(self, title: str = None):
 
     @classmethod
     def delay(cls, lineNumber: int = None):
-        cls.command("delay", lineNumber)
+        if lineNumber is None:
+            cls._command(None, "delay")
+        else:
+            cls._command(None, "delay", lineNumber)
 
-    @classmethod
-    def set(cls):
-        cls.command("set")
+    def set(self):
+        self.command("set")
 
-    @classmethod
-    def reset(cls):
-        cls.command("reset")
+    def reset(self):
+        self.command("reset")
