Change package name

maxnz · maxnz · commit df46b00f3804 · 2020-07-21T17:44:42.000-05:00
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ color.add_color(0xFF00)
 data = AnimationData()
 data.add_color(color)
 
-sender.send_animation(data)
+sender.send_data(data)
 ```
 
 #### `AnimationData` type notes
diff --git a/animatedledstrip/__init__.py b/animatedledstrip/__init__.py
@@ -0,0 +1,8 @@
+from .animation_data import AnimationData
+from .animation_sender import AnimationSender
+from .color_container import ColorContainer
+from .direction import Direction
+from .end_animation import EndAnimation
+from .global_vars import ANIMATION_DATA_PREFIX, ANIMATION_INFO_PREFIX, DELIMITER, \
+    END_ANIMATION_PREFIX, SECTION_PREFIX, STRICT_TYPE_CHECKING, STRIP_INFO_PREFIX
+from .param_usage import ParamUsage
diff --git a/animatedledstrip/animation_data.py b/animatedledstrip/animation_data.py
@@ -19,7 +19,7 @@
 #   THE SOFTWARE.
 
 import json
-from typing import List, Optional, AnyStr
+from typing import AnyStr, List, Optional
 
 from .color_container import ColorContainer
 from .direction import *
diff --git a/animatedledstrip/animation_info.py b/animatedledstrip/animation_info.py
diff --git a/animatedledstrip/animation_sender.py b/animatedledstrip/animation_sender.py
@@ -17,10 +17,11 @@
 #   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #   THE SOFTWARE.
+
 import logging
 import socket
 from threading import Thread
-from typing import Optional, Dict, AnyStr, Callable, Any, List
+from typing import Any, AnyStr, Callable, Dict, List, Optional
 
 from .animation_data import AnimationData
 from .animation_info import AnimationInfo
@@ -78,7 +79,7 @@ def end(self) -> 'AnimationSender':
 
         return self
 
-    def send_animation(self, animation_json: AnyStr) -> 'AnimationSender':
+    def send_data(self, animation_json: AnyStr) -> 'AnimationSender':
         """Send a new animation to the server"""
         json_bytes = bytearray(animation_json, 'utf-8')
         self.connection.sendall(json_bytes)
@@ -98,6 +99,9 @@ def parse_data(self):
             #  they are split up with triple semicolons)
             # TODO: Support partial data
             for split_input in all_input.split(DELIMITER):
+                if len(split_input) == 0:
+                    continue
+
                 if self.receiveCallback:
                     self.receiveCallback(split_input)
 
@@ -141,7 +145,7 @@ def parse_data(self):
                     pass  # TODO
 
                 else:
-                    logging.warning('Unrecognized data type: {}'.format(split_input[:4]))
+                    logging.warning('Unrecognized data type: {} ({})'.format(split_input[:4], split_input))
 
         except socket.timeout:
             pass
diff --git a/animatedledstrip/color_container.py b/animatedledstrip/color_container.py
@@ -18,7 +18,7 @@
 #   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #   THE SOFTWARE.
 
-from led_client.utils import check_data_type
+from .utils import check_data_type
 
 
 class ColorContainer(object):
diff --git a/animatedledstrip/direction.py b/animatedledstrip/direction.py
@@ -18,7 +18,7 @@
 #   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #   THE SOFTWARE.
 
-from enum import Enum, auto
+from enum import auto, Enum
 
 
 class Direction(Enum):
diff --git a/animatedledstrip/end_animation.py b/animatedledstrip/end_animation.py
@@ -21,7 +21,6 @@
 import json
 from typing import AnyStr
 
-from .global_vars import END_ANIMATION_PREFIX
 from .utils import check_data_type
 
 
diff --git a/animatedledstrip/global_vars.py b/animatedledstrip/global_vars.py
diff --git a/animatedledstrip/param_usage.py b/animatedledstrip/param_usage.py
@@ -0,0 +1,26 @@
+#   Copyright (c) 2019-2020 AnimatedLEDStrip
+#
+#   Permission is hereby granted, free of charge, to any person obtaining a copy
+#   of this software and associated documentation files (the "Software"), to deal
+#   in the Software without restriction, including without limitation the rights
+#   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#   copies of the Software, and to permit persons to whom the Software is
+#   furnished to do so, subject to the following conditions:
+#
+#   The above copyright notice and this permission notice shall be included in
+#   all copies or substantial portions of the Software.
+#
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#   THE SOFTWARE.
+
+from enum import auto, Enum
+
+
+class ParamUsage(Enum):
+    NOTUSED = auto()
+    USED = auto()
diff --git a/animatedledstrip/utils.py b/animatedledstrip/utils.py
@@ -19,7 +19,7 @@
 #   THE SOFTWARE.
 
 import logging
-from typing import TypeVar, Any, Optional
+from typing import Any, Optional, TypeVar
 
 from . import global_vars
 
diff --git a/get_raw.py b/get_raw.py
@@ -0,0 +1,16 @@
+from led_client import AnimationSender
+
+
+sender = AnimationSender("10.0.0.55", 6)
+
+
+def receive(data: bytes):
+    print(str(data) + '\n')
+
+
+sender.receiveCallback = receive
+
+sender.start()
+
+while True:
+    sender.send_data('CMD :' + input())
diff --git a/led_client/__init__.py b/led_client/__init__.py
diff --git a/led_client/param_usage.py b/led_client/param_usage.py
diff --git a/test/animatedledstrip/__init__.py b/test/animatedledstrip/__init__.py
diff --git a/test/animatedledstrip/test_animation_data.py b/test/animatedledstrip/test_animation_data.py
@@ -17,9 +17,10 @@
 #   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #   THE SOFTWARE.
+
 from unittest import mock
 
-from led_client import *
+from animatedledstrip import *
 
 
 def test_constructor():
diff --git a/test/animatedledstrip/test_animation_sender.py b/test/animatedledstrip/test_animation_sender.py
@@ -20,8 +20,7 @@
 
 from unittest import mock
 
-from led_client import AnimationSender, AnimationData, Direction
-from led_client.param_usage import ParamUsage
+from animatedledstrip import AnimationSender, AnimationData, Direction, ParamUsage
 
 
 def test_constructor():
@@ -34,7 +33,7 @@ def test_constructor():
 @mock.patch.object(AnimationSender, 'connection')
 def test_send_animation(mock_socket):
     data = AnimationData().json()
-    AnimationSender('10.0.0.254', 5).send_animation(data)
+    AnimationSender('10.0.0.254', 5).send_data(data)
     assert mock_socket.sendall.called
     assert mock_socket.called_with(data)
 
diff --git a/test/animatedledstrip/test_colorcontainer.py b/test/animatedledstrip/test_colorcontainer.py
@@ -21,7 +21,7 @@
 import json
 from unittest import mock
 
-from led_client import ColorContainer
+from animatedledstrip import ColorContainer
 
 
 def test_add_color():
diff --git a/test/animatedledstrip/test_end_animation.py b/test/animatedledstrip/test_end_animation.py
@@ -18,7 +18,7 @@
 #   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #   THE SOFTWARE.
 
-from led_client.end_animation import EndAnimation
+from animatedledstrip import EndAnimation
 
 
 def test_end_animation_json():
diff --git a/test/animatedledstrip/test_utils.py b/test/animatedledstrip/test_utils.py
@@ -0,0 +1,58 @@
+#   Copyright (c) 2019-2020 AnimatedLEDStrip
+#
+#   Permission is hereby granted, free of charge, to any person obtaining a copy
+#   of this software and associated documentation files (the "Software"), to deal
+#   in the Software without restriction, including without limitation the rights
+#   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#   copies of the Software, and to permit persons to whom the Software is
+#   furnished to do so, subject to the following conditions:
+#
+#   The above copyright notice and this permission notice shall be included in
+#   all copies or substantial portions of the Software.
+#
+#   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#   THE SOFTWARE.
+
+from unittest import mock
+
+from animatedledstrip.utils import check_data_type, nullable_str
+
+
+def test_nullable_str_non_null():
+    assert nullable_str(5) == "5"
+    assert nullable_str(False) == "False"
+
+
+def test_nullable_string_null():
+    assert nullable_str(None) == "null"
+
+
+@mock.patch('led_client.global_vars.STRICT_TYPE_CHECKING', False)
+def test_check_data_type_lenient_checking(caplog):
+    assert check_data_type("test", "x", int) is False
+
+    log_messages = {(log.msg, log.levelname) for log in caplog.records}
+    assert log_messages == {("Bad data type for test: <class 'str'> (should be <class 'int'>)", 'ERROR')}
+
+
+@mock.patch('led_client.global_vars.STRICT_TYPE_CHECKING', False)
+def test_check_data_type_lenient_checking_allow_none(caplog):
+    assert check_data_type("test", "x", int, allow_none=True) is False
+
+    log_messages = {(log.msg, log.levelname) for log in caplog.records}
+    print(caplog.records)
+
+    assert log_messages == {("Bad data type for test: <class 'str'> (should be <class 'int'> or None)", 'ERROR')}
+
+
+def test_check_data_type_strict_checking():
+    try:
+        check_data_type("test", "x", int)
+        raise AssertionError
+    except TypeError:
+        pass
diff --git a/test/led_client/test_utils.py b/test/led_client/test_utils.py
