Merge pull request #6 from rccoleman/async

Re-enable polling and switch to PyCryptodome

lmdirect/aescipher.py

@@ -1,5 +1,5 @@
 import base64
-from Cryptodome.Cipher import AES
+from Crypto.Cipher import AES
 from math import ceil
 
 import logging

parse.py

@@ -1,14 +1,15 @@
-import json
-import codecs
-import re
-import logging
+import json, codecs, re, logging
 from lmdirect.aescipher import AESCipher
 
 _LOGGER = logging.getLogger(__name__)
 _LOGGER.setLevel(logging.DEBUG)
 
+PHONE_IP = "192.168.1.150"
+LM_IP = "192.168.1.215"
+FILE = "config.json"
+
 try:
-    with open("config.json") as config_file:
+    with open(FILE) as config_file:
         data = json.load(config_file)
 
         key = data["key"]
@@ -18,7 +19,7 @@
 
 cipher = AESCipher(key)
 
-SOURCE_MAP = {"192.168.1.150": "\nApp", "192.168.1.215": "Machine"}
+SOURCE_MAP = {PHONE_IP: "\nApp", LM_IP: "Machine"}
 
 # Opening JSON file
 with open("version.json") as json_file:

requirements.txt

@@ -1 +1 @@
-cryptodomex>=3.9.9
+pycryptodome>=3.9.9

setup.py

@@ -1,29 +1,29 @@
 from setuptools import setup
 
-with open('README.md', 'r') as f:
+with open("README.md", "r") as f:
     readme = f.read()
 
 setup(
-    name='lmdirect',
-    version='v0.1',
-    description='A Python implementation of the local La Marzocco API',
+    name="lmdirect",
+    version="v0.1",
+    description="A Python implementation of the local La Marzocco API",
     long_description=readme,
-    url='https://github.com/rccoleman/lmdirect',
-    author='Rob Coleman',
-    author_email='[email protected]',
-    license='MIT',
+    url="https://github.com/rccoleman/lmdirect",
+    author="Rob Coleman",
+    author_email="[email protected]",
+    license="MIT",
     classifiers=[
-        'Development Status :: 1 - Experimental',
-        'Intended Audience :: Developers',
-        'Natural Language :: English',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: Implementation :: CPython',
+        "Development Status :: 3 - Alpha",
+        "Intended Audience :: Developers",
+        "Natural Language :: English",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: Implementation :: CPython",
     ],
-    packages=['lmdirect'],
-    install_requires=[
-        'pycryptodomex>=3.9.9; python_version > "3.8"'
-    ],
-    package_data={'license': ['LICENSE'],},
+    packages=["lmdirect"],
+    install_requires=["pycryptodome>=3.9.9"],
+    package_data={
+        "license": ["LICENSE"],
+    },
 )

test.py

@@ -1,8 +1,5 @@
-import asyncio
 from lmdirect import LMDirect
-import json
-import sys
-import logging
+import asyncio, json, sys, logging
 from lmdirect.cmds import ON, OFF
 
 logging.basicConfig(level=logging.DEBUG)
@@ -37,7 +34,7 @@ async def main():
     lmdirect = LMDirect(key)
     lmdirect.register_callback(update)
     await lmdirect.connect(ip_addr)
-    # await lmdirect.create_polling_task()
+    await lmdirect.create_polling_task()
 
     while True:
         try: