Optimized WeMo plugin
This commit is contained in:
parent
fc360e3e43
commit
08119add97
1 changed files with 5 additions and 4 deletions
|
@ -1,4 +1,5 @@
|
||||||
import enum
|
import enum
|
||||||
|
import re
|
||||||
import textwrap
|
import textwrap
|
||||||
|
|
||||||
from xml.dom.minidom import parseString
|
from xml.dom.minidom import parseString
|
||||||
|
@ -70,6 +71,7 @@ class SwitchWemoPlugin(SwitchPlugin):
|
||||||
for device in self._devices.values()
|
for device in self._devices.values()
|
||||||
]
|
]
|
||||||
|
|
||||||
|
# noinspection PyShadowingNames
|
||||||
def _exec(self, device: str, action: SwitchAction, port: int = _default_port, value=None):
|
def _exec(self, device: str, action: SwitchAction, port: int = _default_port, value=None):
|
||||||
if device not in self._addresses:
|
if device not in self._addresses:
|
||||||
try:
|
try:
|
||||||
|
@ -87,7 +89,7 @@ class SwitchWemoPlugin(SwitchPlugin):
|
||||||
'Content-Type': 'text/xml; charset="utf-8"',
|
'Content-Type': 'text/xml; charset="utf-8"',
|
||||||
'SOAPACTION': '\"urn:Belkin:service:basicevent:1#{}\"'.format(action.value),
|
'SOAPACTION': '\"urn:Belkin:service:basicevent:1#{}\"'.format(action.value),
|
||||||
},
|
},
|
||||||
data=textwrap.dedent(
|
data=re.sub('\s+', ' ', textwrap.dedent(
|
||||||
'''
|
'''
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"
|
<s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/"
|
||||||
|
@ -99,8 +101,7 @@ class SwitchWemoPlugin(SwitchPlugin):
|
||||||
></s:Body>
|
></s:Body>
|
||||||
</s:Envelope>
|
</s:Envelope>
|
||||||
'''.format(action=action.value, state=state_name,
|
'''.format(action=action.value, state=state_name,
|
||||||
value=value if value is not None else ''))
|
value=value if value is not None else ''))))
|
||||||
)
|
|
||||||
|
|
||||||
dom = parseString(response.text)
|
dom = parseString(response.text)
|
||||||
return dom.getElementsByTagName(state_name).item(0).firstChild.data
|
return dom.getElementsByTagName(state_name).item(0).firstChild.data
|
||||||
|
@ -116,7 +117,7 @@ class SwitchWemoPlugin(SwitchPlugin):
|
||||||
'name': name if name != addr else self.get_name(addr).output,
|
'name': name if name != addr else self.get_name(addr).output,
|
||||||
'on': self.get_state(addr).output,
|
'on': self.get_state(addr).output,
|
||||||
}
|
}
|
||||||
for (name, addr) in self._devices.items()
|
for (name, addr) in devices.items()
|
||||||
]
|
]
|
||||||
|
|
||||||
return ret[0] if device else ret
|
return ret[0] if device else ret
|
||||||
|
|
Loading…
Reference in a new issue