erichardson/py-eagle-mqtt
1
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Packages Projects Releases 11 Wiki Activity

Refactor code to be more readable #46

Closed
erichardson wants to merge 4 commits from refactor-code into master
pull from: refactor-code
merge into: erichardson:master
Conversation 0 Commits 4 Files Changed 4 +52 -94
1 changed files with 52 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 961692c938 - Show all commits

146
Docker/src/python/tHome/eagle/get.py
View File

@@ -1,110 +1,68 @@
from . import config from . import config
from . import messages as msg from . import messages as msg
#from . import convert
#from .DeviceData import DeviceData
#from .DeviceInfo import DeviceInfo
#from .InstantDemand import InstantDemand
#from .Reading import Reading
#from .Total import Total
import defusedxml.ElementTree as ET import defusedxml.ElementTree as ET
import socket import socket
#==========================================================================
def all(): def all():
# Newlines are required xmlCmd = "<LocalCommand>\n<Name>get_device_data</Name>\n" \
xmlCmd = "<LocalCommand>\n<Name>get_device_data</Name>\n" \ "<MacId>%s</MacId>\n</LocalCommand>\n" % config.macAddress
"<MacId>%s</MacId>\n</LocalCommand>\n" % ( config.macAddress ) xmlData = sendXml(xmlCmd)
xmlData = sendXml( xmlCmd ) xmlData = "<root>%s</root>" % xmlData
root = ET.fromstring(xmlData)
return msg.DeviceData(root)
# Add fake wrapper for parsing list of elements
xmlData = "<root>%s</root>" % xmlData
root = ET.fromstring( xmlData )
return DeviceData( root )
#==========================================================================
def device(): def device():
# Newlines are required xmlCmd = "<LocalCommand>\n<Name>list_devices</Name>\n</LocalCommand>\n"
xmlCmd = "<LocalCommand>\n<Name>list_devices</Name>\n</LocalCommand>\n" xmlData = sendXml(xmlCmd)
xmlData = sendXml( xmlCmd ) root = ET.fromstring(xmlData)
root = ET.fromstring( xmlData ) return msg.DeviceInfo(root)
return msg.DeviceInfo( root )
#==========================================================================
def instant(): def instant():
# Newlines are required xmlCmd = "<LocalCommand>\n<Name>get_instantaneous_demand</Name>\n" \
xmlCmd = "<LocalCommand>\n<Name>get_instantaneous_demand</Name>\n" \ "<MacId>%s</MacId>\n</LocalCommand>\n" % config.macAddress
"<MacId>%s</MacId>\n</LocalCommand>\n" % ( config.macAddress ) xmlData = sendXml(xmlCmd)
xmlData = sendXml( xmlCmd ) root = ET.fromstring(xmlData)
root = ET.fromstring( xmlData ) return msg.InstantaneousDemand(root)
return msg.InstantaneousDemand( root ) def history(start):
startHex = convert.fromTime(start)
xmlCmd = "<LocalCommand>\n<Name>get_history_data</Name>\n" \
"<MacId>%s</MacId>\n<StartTime>%s</StartTime>\n" \
"</LocalCommand>\n" % (config.macAddress, startHex)
xmlData = sendXml(xmlCmd)
root = ET.fromstring(xmlData)
return [msg.Total(child) for child in root]
#========================================================================== def instantHistory(interval):
def history( start ): assert interval in ['hour', 'day', 'week']
"start == datetime in utc" xmlCmd = "<LocalCommand>\n<Name>get_demand_values</Name>\n" \
startHex = convert.fromTime( start ) "<MacId>%s</MacId>\n</LocalCommand>\n" % config.macAddress
xmlData = sendXml(xmlCmd)
# Newlines are required xmlData = "<root>%s</root>" % xmlData
xmlCmd = "<LocalCommand>\n<Name>get_history_data</Name>\n" \ root = ET.fromstring(xmlData)
"<MacId>%s</MacId>\n<StartTime>%s</StartTime>\n" \ return msg.Reading.xmlToList(root)
"</LocalCommand>\n" % ( config.macAddress, startHex )
xmlData = sendXml( xmlCmd )
# Add fake wrapper for parsing list of elements def totalHistory(interval):
root = ET.fromstring( xmlData ) assert interval in ['day', 'week', 'month', 'year']
xmlCmd = "<LocalCommand>\n<Name>get_summation_values</Name>\n" \
"<MacId>%s</MacId>\n</LocalCommand>\n" % config.macAddress
xmlData = sendXml(xmlCmd)
xmlData = "<root>%s</root>" % xmlData
root = ET.fromstring(xmlData)
return msg.Reading.xmlToList(root)
return [ Total( child ) for child in root ] def sendXml(xmlCmd):
sock = socket.create_connection((config.host, config.port))
#========================================================================== try:
def instantHistory( interval ): sock.send(xmlCmd.encode())
"interval = 'hour', 'day', 'week'"
assert( interval in [ 'hour', 'day', 'week' ] )
# Newlines are required buf = b""
xmlCmd = "<LocalCommand>\n<Name>get_demand_values</Name>\n" \ while True:
"<MacId>%s</MacId>\n</LocalCommand>\n" % ( config.macAddress ) s = sock.recv(1024)
xmlData = sendXml( xmlCmd ) if not s:
break
buf += s
finally:
sock.close()
# Add fake wrapper for parsing list of elements return buf.decode()
xmlData = "<root>%s</root>" % xmlData
root = ET.fromstring( xmlData )
return msg.Reading.xmlToList( root )
#==========================================================================
def totalHistory( interval ):
"interval = 'day', 'week', 'month', 'year'"
assert( interval in [ 'day', 'week', 'month', 'year' ] )
# Newlines are required
xmlCmd = "<LocalCommand>\n<Name>get_summation_values</Name>\n" \
"<MacId>%s</MacId>\n</LocalCommand>\n" % ( config.macAddress )
xmlData = sendXml( xmlCmd )
# Add fake wrapper for parsing list of elements
xmlData = "<root>%s</root>" % xmlData
root = ET.fromstring( xmlData )
return msg.Reading.xmlToList( root )
#==========================================================================
def sendXml( xmlCmd ):
sock = socket.create_connection( ( config.host, config.port ) )
try:
sock.send( xmlCmd )
buf = ""
while True:
s = sock.recv( 1024 )
if not s:
break
buf += s
finally:
sock.close()
return buf
#==========================================================================