aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Zinoviev <me@ch1p.io>2021-03-23 02:16:27 +0300
committerEvgeny Zinoviev <me@ch1p.io>2021-03-23 02:16:27 +0300
commitd33f28a1bf69861ecdc6c3a97b3d4313dba907f7 (patch)
treeea0ffde6b64d6267127f4a3c5a308d1f0960812d
parent71a26b49d933eb4f9c59e8d7e18c4fcd2d149d34 (diff)
upd
-rw-r--r--e3372.py16
-rw-r--r--main.py4
2 files changed, 15 insertions, 5 deletions
diff --git a/e3372.py b/e3372.py
index 61be161..eb3093b 100644
--- a/e3372.py
+++ b/e3372.py
@@ -3,6 +3,7 @@ import sys
from datetime import datetime
from bs4 import BeautifulSoup
+from bs4.element import Tag
def build_request(params: dict):
@@ -12,6 +13,16 @@ def build_request(params: dict):
return '<request>'+''.join(items)+'</request>'
+def xml2dict(node):
+ data = {}
+
+ for c in node.children:
+ if isinstance(c, Tag):
+ data[c.name] = c.get_text()
+
+ return data
+
+
class WebAPI:
def __init__(self, ip: str):
self.ip = ip
@@ -29,11 +40,10 @@ class WebAPI:
self.headers['Content-Type'] = 'text/xml'
def device_information(self):
- return self.request('device/information')
+ return xml2dict(self.request('device/information'))
def device_signal(self):
- return self.request('device/signal')
-
+ return xml2dict(self.request('device/signal'))
def get_sms(self, count=10, page=1):
request = build_request({
diff --git a/main.py b/main.py
index 2d8bf8c..16cce4f 100644
--- a/main.py
+++ b/main.py
@@ -16,8 +16,8 @@ def main():
info = client.device_information()
signal = client.device_signal()
- print(info)
- print(signal)
+ pprint(info)
+ pprint(signal)
# messages = client.get_sms()
#