Add D900 (IOTMQ) and Ozmo930 Support

.gitignore

@@ -9,3 +9,11 @@ dist
 # Nosetests files
 cover/
 .coverage
+
+# Ignore Vscode files
+.vscode/
+
+# Ignore sucks.egg-info
+sucks.egg-info/
+.noseids
+nosetests.xml

README.md

@@ -99,8 +99,8 @@ shaping the API.
 
 A simple usage might go something like this:
 
-```
-import sucks
+```python
+from sucks import *
 
 config = ...
 

setup.py

@@ -68,6 +68,7 @@
         'requests>=2.18',
         'pycryptodome>=3.4',
         'pycountry-convert>=0.5',
+        'paho-mqtt>=1.4',
         'stringcase>=1.2'
     ],
 

sucks/cli.py

@@ -141,15 +141,16 @@ def cli(debug):
 @click.option('--country-code', prompt='your two-letter country code', default=lambda: current_country())
 @click.option('--continent-code', prompt='your two-letter continent code',
               default=lambda: continent_for_country(click.get_current_context().params['country_code']))
-def login(email, password, country_code, continent_code):
+@click.option('--verify-ssl', prompt='Verify SSL for API requests', default=True)
+def login(email, password, country_code, continent_code, verify_ssl):
     if config_file_exists() and not click.confirm('overwrite existing config?'):
         click.echo("Skipping login.")
         exit(0)
     config = OrderedDict()
     password_hash = EcoVacsAPI.md5(password)
     device_id = EcoVacsAPI.md5(str(time.time()))
     try:
-        EcoVacsAPI(device_id, email, password_hash, country_code, continent_code)
+        EcoVacsAPI(device_id, email, password_hash, country_code, continent_code, verify_ssl)
     except ValueError as e:
         click.echo(e.args[0])
         exit(1)
@@ -158,6 +159,7 @@ def login(email, password, country_code, continent_code):
     config['device_id'] = device_id
     config['country'] = country_code.lower()
     config['continent'] = continent_code.lower()
+    config['verify_ssl'] = verify_ssl
     write_config(config)
     click.echo("Config saved.")
     exit(0)
@@ -179,6 +181,16 @@ def edge(frequency, minutes):
         return CliAction(Edge(), wait=TimeWait(minutes * 60))
 
 
+@cli.command(help='cleans provided area(s), ex: "0,1"',context_settings={"ignore_unknown_options": True}) #ignore_unknown for map coordinates with negatives
+@click.option("--map-position","-p", is_flag=True, help='clean provided map position instead of area, ex: "-602,1812,800,723"')
+@click.argument('area', type=click.STRING, required=True)
+def area(area, map_position):
+    if map_position:
+        return CliAction(SpotArea('start', map_position=area), wait=StatusWait('charge_status', 'returning'))    
+    else:
+        return CliAction(SpotArea('start', area=area), wait=StatusWait('charge_status', 'returning'))
+
+
 @cli.command(help='returns to charger')
 def charge():
     return charge_action()
@@ -209,9 +221,9 @@ def run(actions, debug):
     if actions:
         config = read_config()
         api = EcoVacsAPI(config['device_id'], config['email'], config['password_hash'],
-                         config['country'], config['continent'])
+                         config['country'], config['continent'], verify_ssl=config['verify_ssl'])
         vacuum = api.devices()[0]
-        vacbot = VacBot(api.uid, api.REALM, api.resource, api.user_access_token, vacuum, config['continent'])
+        vacbot = VacBot(api.uid, api.REALM, api.resource, api.user_access_token, vacuum, config['continent'], verify_ssl=config['verify_ssl'])
         vacbot.connect_and_wait_until_ready()
 
         for action in actions:

tests/test_commands.py

@@ -19,6 +19,20 @@ def test_custom_command_inner_tag():
                   b'<ctl td="CustomCommand"><customtag customvar="customvalue" /></ctl>')
 
 
+def test_custom_command_multiple_inner_tag():
+    # Ensure a custom-built command with multiple inner tags generates the expected XML payload
+    c = VacBotCommand('CustomCommand', {"customtag":[{"customvar":"customvalue1"},{"customvar":"customvalue2"}]})
+    logging.info(ElementTree.tostring(c.to_xml()))
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                  b'<ctl td="CustomCommand"><customtag customvar="customvalue1" /><customtag customvar="customvalue2" /></ctl>')
+
+def test_custom_command_args_multiple_inner_tag():
+    # Ensure a custom-built command with args and multiple inner tags generates the expected XML payload
+    c = VacBotCommand('CustomCommand', {"arg1":"value1","customtag":[{"customvar":"customvalue1"},{"customvar":"customvalue2"}]})
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                  b'<ctl arg1="value1" td="CustomCommand"><customtag customvar="customvalue1" /><customtag customvar="customvalue2" /></ctl>')
+
+
 def test_custom_command_noargs():
     # Ensure a custom-built command with no args generates XML without an args element
     c = VacBotCommand('CustomCommand')
@@ -29,22 +43,63 @@ def test_custom_command_noargs():
 def test_clean_command():
     c = Clean()
     assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Clean"><clean speed="standard" type="auto" /></ctl>')  # protocol has attribs in other order
+                  b'<ctl td="Clean"><clean act="s" speed="standard" type="auto" /></ctl>')  # protocol has attribs in other order
+
     c = Clean('edge', 'high')
     assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Clean"><clean speed="strong" type="border" /></ctl>')  # protocol has attribs in other order
+                  b'<ctl td="Clean"><clean act="s" speed="strong" type="border" /></ctl>')  # protocol has attribs in other order
+
+    c = Clean(iotmq=True)
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                  b'<ctl td="Clean"><clean act="s" speed="standard" type="auto" /></ctl>') # test for iot act is added                         
+
+
+def test_spotarea_command():
+    assert_raises(ValueError, SpotArea, 'start') #Value error if SpotArea doesn't include a mid or p
+
+    c = SpotArea('start', '0')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                b'<ctl td="Clean"><clean act="s" mid="0" speed="standard" type="SpotArea" /></ctl>')  #Test namedarea clean
+
+    c = SpotArea('start', area='0')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                b'<ctl td="Clean"><clean act="s" mid="0" speed="standard" type="SpotArea" /></ctl>')  #Test namedarea keyword clean
+
+    c = SpotArea('start', '', '-602,1812,800,723')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                b'<ctl td="Clean"><clean act="s" deep="1" p="-602,1812,800,723" speed="standard" type="SpotArea" /></ctl>')  #Test customarea clean
+
+    c = SpotArea('start', '', '-602,1812,800,723', '2')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                b'<ctl td="Clean"><clean act="s" deep="2" p="-602,1812,800,723" speed="standard" type="SpotArea" /></ctl>')  #Test customarea clean with deep 2
+
+    c = SpotArea('start', '', map_position='-602,1812,800,723')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                b'<ctl td="Clean"><clean act="s" deep="1" p="-602,1812,800,723" speed="standard" type="SpotArea" /></ctl>')  #Test customarea keyword clean with deep default
+
+    c = SpotArea('start', map_position='-602,1812,800,723', cleanings='2')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                b'<ctl td="Clean"><clean act="s" deep="2" p="-602,1812,800,723" speed="standard" type="SpotArea" /></ctl>')  #Test customarea keyword and cleanings keyword clean with deep default
+
+    c = SpotArea('start', area='0', map_position='-602,1812,800,723', cleanings='2')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                b'<ctl td="Clean"><clean act="s" mid="0" speed="standard" type="SpotArea" /></ctl>')  #Test all keywords specified, should default to only mid
+
+    c = SpotArea('start', '0', '-602,1812,800,723','2')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                b'<ctl td="Clean"><clean act="s" mid="0" speed="standard" type="SpotArea" /></ctl>')  #Test all keywords specified, should default to only mid
 
 
 def test_edge_command():
     c = Edge()
     assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Clean"><clean speed="strong" type="border" /></ctl>')  # protocol has attribs in other order
+                  b'<ctl td="Clean"><clean act="s" speed="strong" type="border" /></ctl>')  # protocol has attribs in other order
 
 
 def test_spot_command():
     c = Spot()
     assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Clean"><clean speed="strong" type="spot" /></ctl>')  # protocol has attribs in other order
+                  b'<ctl td="Clean"><clean act="s" speed="strong" type="spot" /></ctl>')  # protocol has attribs in other order
 
 
 def test_charge_command():
@@ -56,7 +111,7 @@ def test_charge_command():
 def test_stop_command():
     c = Stop()
     assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Clean"><clean speed="standard" type="stop" /></ctl>')
+                  b'<ctl td="Clean"><clean act="s" speed="standard" type="stop" /></ctl>')
 
 
 def test_play_sound_command():
@@ -89,7 +144,6 @@ def test_get_battery_state_command():
                   b'<ctl td="GetBatteryInfo" />')
 
 
-
 def test_move_command():
     c = Move(action='left')
     assert_equals(ElementTree.tostring(c.to_xml()),
@@ -103,6 +157,9 @@ def test_move_command():
     c = Move(action='forward')
     assert_equals(ElementTree.tostring(c.to_xml()),
                   b'<ctl td="Move"><move action="forward" /></ctl>')
+    c = Move(action='backward')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                  b'<ctl td="Move"><move action="backward" /></ctl>')
     c = Move(action='stop')
     assert_equals(ElementTree.tostring(c.to_xml()),
                   b'<ctl td="Move"><move action="stop" /></ctl>')
@@ -112,9 +169,16 @@ def test_get_lifepsan_command():
     c = GetLifeSpan('main_brush')
     assert_equals(ElementTree.tostring(c.to_xml()),
                   b'<ctl td="GetLifeSpan" type="Brush" />')
+
     c = GetLifeSpan('side_brush')
     assert_equals(ElementTree.tostring(c.to_xml()),
                   b'<ctl td="GetLifeSpan" type="SideBrush" />')
+
     c = GetLifeSpan('filter')
     assert_equals(ElementTree.tostring(c.to_xml()),
                   b'<ctl td="GetLifeSpan" type="DustCaseHeap" />')
+
+def test_set_time_command():
+    c = SetTime('1234', 'GMT-5')
+    assert_equals(ElementTree.tostring(c.to_xml()),
+                  b'<ctl td="SetTime"><time t="1234" tz="GMT-5" /></ctl>')