Create send method on AnimationSender

Author: maxnz

.travis.yml

@@ -13,7 +13,7 @@ branches:
 
 stages:
   - name: test
-  - name: deploy python
+  - name: deploy
     if: branch =~ ^v.*$
 
 jobs:
@@ -23,7 +23,7 @@ jobs:
       script: tox
       after_success: bash <(curl -s https://codecov.io/bash)
 
-    - stage: deploy python
+    - stage: deploy
       install: skip
       script: skip
       deploy:

animatedledstrip/animation_sender.py

@@ -21,22 +21,24 @@
 import logging
 import socket
 from threading import Thread
-from typing import Any, AnyStr, Callable, Dict, List, Optional
+from typing import Any, AnyStr, Callable, Dict, List, Optional, Union
 
 from .animation_info import AnimationInfo
 from .animation_to_run_params import AnimationToRunParams
+from .client_params import ClientParams
 from .command import Command
 from .current_strip_color import CurrentStripColor
 from .end_animation import EndAnimation
 from .global_vars import *
 from .json_decoder import ALSJsonDecoder
+from .json_encoder import ALSJsonEncoder
 from .message import Message
 from .running_animation_params import RunningAnimationParams
 from .section import Section
 from .strip_info import StripInfo
 
 
-class AnimationSender(object):
+class AnimationSender:
     """Handles communications with the server"""
 
     def __init__(self, ip_address: str, port_num: int):
@@ -65,6 +67,7 @@ def __init__(self, ip_address: str, port_num: int):
         self.on_new_section_callback: Optional[Callable[['Section'], Any]] = None
         self.on_new_strip_info_callback: Optional[Callable[['StripInfo'], Any]] = None
 
+        self._encoder: 'ALSJsonEncoder' = ALSJsonEncoder()
         self._recv_thread: Optional['Thread'] = None
         self._partial_data: bytes = b''
 
@@ -120,9 +123,16 @@ def end(self) -> 'AnimationSender':
 
         return self
 
-    def send_data(self, animation_json: AnyStr) -> 'AnimationSender':
-        """Send a new animation to the server"""
-        json_bytes = bytearray(animation_json + ";;;", 'utf-8')
+    def send(self, data: Union['AnimationToRunParams', 'ClientParams',
+                               'Command', 'EndAnimation', 'Section']) -> 'AnimationSender':
+        """Send data to the server"""
+        self.send_json(self._encoder.encode(data))
+
+        return self
+
+    def send_json(self, json: AnyStr) -> 'AnimationSender':
+        """Send encoded JSON to the server"""
+        json_bytes = bytearray(json + ";;;", 'utf-8')
         self.connection.sendall(json_bytes)
 
         return self

get_raw.py

@@ -1,7 +1,10 @@
 from animatedledstrip import AnimationSender, Command
 from animatedledstrip.json_encoder import ALSJsonEncoder
 
-sender = AnimationSender("10.0.0.91", 6)
+ip = input('Enter IP address: ')
+port = int(input('Enter port: '))
+
+sender = AnimationSender(ip, port)
 encoder = ALSJsonEncoder()
 
 
@@ -14,4 +17,6 @@ def receive(data: bytes):
 sender.start()
 
 while True:
-    sender.send_data(encoder.encode(Command(input())))
+    cmd = input('Enter command: ')
+    if cmd != '':
+        sender.send(Command(cmd))