Add remove devices impl (#155)

Adding implementation for adding/removing devices from/to account

Author: akpdw

soundcork/datastore.py

@@ -1,7 +1,7 @@
 import logging
 import re
 import xml.etree.ElementTree as ET
-from os import mkdir, path, walk
+from os import mkdir, path, remove, rmdir, walk
 from typing import Optional
 
 from soundcork.config import Settings
@@ -352,3 +352,13 @@ def add_device(self, account: str, device_id: str, device_info_xml: str) -> bool
             "w",
         ) as device_info_file:
             device_info_file.write(device_info_xml)
+
+    def remove_device(self, account: str, device_id: str) -> bool:
+        logger.debug(f"removing device {device_id} from account {account}")
+        if not self.device_exists(account, device_id):
+            return False
+
+        # TODO: add error handling if you can't delete the files
+        remove(path.join(self.account_device_dir(account, device_id), DEVICE_INFO_FILE))
+        rmdir(path.join(self.account_devices_dir(account), device_id))
+        return True

soundcork/devices.py

@@ -9,6 +9,7 @@
 import urllib.request
 import xml.etree.ElementTree as ET
 from subprocess import run
+from typing import Optional
 from urllib.parse import urlparse
 
 import upnpclient
@@ -136,6 +137,17 @@ def get_bose_devices() -> list[upnpclient.upnp.Device]:
     return bose_devices
 
 
+def get_device_by_id(device_id: str) -> Optional[upnpclient.upnp.Device]:
+    devices = get_bose_devices()
+    for device in devices:
+        try:
+            info_elem = ET.fromstring(read_device_info(device))
+            if info_elem.attrib.get("deviceID", "") == device_id:
+                return device
+        except:
+            pass
+
+
 def show_upnp_devices() -> None:
     """Print a list of devices, specifying reachable ones."""
     devices = get_bose_devices()

soundcork/main.py

@@ -299,30 +299,44 @@ async def post_account_recent(
     "/marge/streaming/account/{account}/device/",
     response_class=BoseXMLResponse,
     tags=["marge"],
+    status_code=HTTPStatus.CREATED,
     dependencies=[
         Depends(
             Etag(
                 etag_gen=etag_for_account,
                 weak=False,
+                extra_headers={
+                    "method_name": "addDevice",
+                    "access-control-expose-headers": "Credentials",
+                },
             )
         )
     ],
 )
 async def post_account_device(
-    account: Annotated[str, Path(pattern=ACCOUNT_RE)], request: Request
+    account: Annotated[str, Path(pattern=ACCOUNT_RE)],
+    request: Request,
 ):
     xml = await request.body()
-    xml_resp = add_device_to_account(datastore, account, xml)
+    device_id, xml_resp = add_device_to_account(datastore, account, xml)
+
     return bose_xml_str(xml_resp)
 
 
-@app.delete("/marge/streaming/account/{account}/device/{device}/", tags=["marge"])
+@app.delete("/marge/streaming/account/{account}/device/{device}", tags=["marge"])
 async def delete_account_device(
     account: Annotated[str, Path(pattern=ACCOUNT_RE)],
     device: Annotated[str, Path(pattern=DEVICE_RE)],
+    response: Response,
 ):
     xml_resp = remove_device_from_account(datastore, account, device)
-    return {"ok": True}
+    response.headers["method_name"] = "removeDevice"
+    response.headers["location"] = (
+        f"{settings.base_url}/marge/account/{account}/device/{device}"
+    )
+    response.body = ""
+    response.status_code = HTTPStatus.OK
+    return response
 
 
 @app.get("/bmx/registry/v1/services", response_model_exclude_none=True, tags=["bmx"])

soundcork/marge.py

@@ -8,6 +8,7 @@
 
 from soundcork.config import Settings
 from soundcork.constants import PROVIDERS
+from soundcork.devices import get_device_by_id, read_device_info
 from soundcork.model import (
     ConfiguredSource,
     ContentItem,
@@ -404,9 +405,9 @@ def add_device_to_account(
     new_device_elem = ET.fromstring(source_xml)
     device_id = new_device_elem.attrib.get("deviceid", "")
     name = new_device_elem.find("name").text
-
-    # TODO implement
-    # datastore.add_device(account, device_id, name)
+    device = get_device_by_id(device_id)
+    device_xml = read_device_info(device)
+    datastore.add_device(account, device_id, device_xml)
 
     created_on = datetime.fromtimestamp(
         datetime.now().timestamp(), timezone.utc
@@ -419,14 +420,12 @@ def add_device_to_account(
     ET.SubElement(return_elem, "name").text = name
     ET.SubElement(return_elem, "updatedOn").text = created_on
 
-    return return_elem
+    return (device_id, return_elem)
 
 
 def remove_device_from_account(datastore: "DataStore", account: str, device: str):
-    # TODO implement
-    # datastore.remove_device(account, device)
-    return {"ok"}
-
+    removed = datastore.remove_device(account, device)
+    return {"ok": removed}
 
 def strip_element_text(elem: ET.Element) -> str:
     if elem == None: