aioamazondevices 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

aioamazondevices/__init__.py

@@ -1,6 +1,6 @@
 """aioamazondevices library."""
 
-__version__ = "0.2.0"
+__version__ = "0.4.0"
 
 
 from .api import AmazonDevice, AmazonEchoApi

aioamazondevices/api.py

@@ -185,21 +185,43 @@ class AmazonEchoApi:
             url,
             data=input_data,
         )
+        content_type = resp.headers.get("Content-Type", "")
+        _LOGGER.debug("Response content type: %s", content_type)
+
+        if "text/html" in content_type:
+            await self._save_to_file(
+                resp.text,
+                url,
+            )
+        elif content_type == "application/json":
+            await self._save_to_file(
+                orjson.dumps(
+                    orjson.loads(resp.text),
+                    option=orjson.OPT_INDENT_2,
+                ).decode("utf-8"),
+                url,
+                extension="json",
+            )
 
-        await self._save_to_file(
-            resp.text,
-            url,
-        )
         return BeautifulSoup(resp.content, "html.parser"), resp
 
-    async def _save_to_file(self, html_code: str, url: str) -> None:
-        """Sage HTML data to disk."""
+    async def _save_to_file(
+        self,
+        html_code: str,
+        url: str,
+        extension: str = "html",
+        output_path: str = "out",
+    ) -> None:
+        """Save response data to disk."""
         if not self._save_html:
             return
 
+        output_dir = Path(output_path)
+        output_dir.mkdir(parents=True, exist_ok=True)
+
         url_split = url.split("/")
-        filename = f"{url_split[3]}-{url_split[4].split('?')[0]}.html"
-        with Path.open(Path(filename), "w+") as file:
+        filename = f"{url_split[3]}-{url_split[4].split('?')[0]}.{extension}"
+        with Path.open(output_dir / filename, "w+") as file:
             file.write(html_code)
             file.write("\n")
 
@@ -275,12 +297,19 @@ class AmazonEchoApi:
                 "GET",
                 f"https://alexa.amazon.{self._domain}{URI_QUERIES[key]}",
             )
+            _LOGGER.debug("Response URL: %s", raw_resp.url)
+            response_code = raw_resp.status_code
+            _LOGGER.debug("Response code: %s", response_code)
+
+            response_data = raw_resp.text
+            _LOGGER.debug("Response data: |%s|", response_data)
+            json_data = {} if len(raw_resp.content) == 0 else raw_resp.json()
+
+            _LOGGER.debug("JSON data: |%s|", json_data)
 
             devices.update(
                 {
-                    key: orjson.loads(
-                        raw_resp.text,
-                    ),
+                    key: json_data,
                 },
             )
 

{aioamazondevices-0.2.0.dist-info → aioamazondevices-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioamazondevices
-Version: 0.2.0
+Version: 0.4.0
 Summary: Python library to control Amazon devices
 Home-page: https://github.com/chemelli74/aioamazondevices
 License: Apache Software License 2.0

aioamazondevices-0.4.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+aioamazondevices/__init__.py,sha256=DSS6phrrmu0Q8zWGTzUhabNcQr2KgMV-Gpc6TF9EkR0,276
+aioamazondevices/api.py,sha256=XAUw079QI2CC6eL532_LVg566B-Nxo4WmO_IP2zL_P8,10789
+aioamazondevices/const.py,sha256=bZaeO8AeJbDc5hdlbJ3cMwM9teTgYhExSR1oEpRFMLk,1089
+aioamazondevices/exceptions.py,sha256=tERMur_gry9TmU3UyzndJO_CLViISn4b8ClrRbryFy8,444
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices-0.4.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-0.4.0.dist-info/METADATA,sha256=iN60iBJz_Zu6J3_fbheEZrWGmvJ5WgKv9dBU5TRgjl8,4680
+aioamazondevices-0.4.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+aioamazondevices-0.4.0.dist-info/RECORD,,

aioamazondevices-0.2.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-aioamazondevices/__init__.py,sha256=Zw6lQsQsOiDmSNnKKCTznWyMHgQ3us0XQsAww3w6YkU,276
-aioamazondevices/api.py,sha256=0du0a0tWEtT-5sIHIfk8K5Zf0ntIBpYgY3nwER_Pcm4,9735
-aioamazondevices/const.py,sha256=bZaeO8AeJbDc5hdlbJ3cMwM9teTgYhExSR1oEpRFMLk,1089
-aioamazondevices/exceptions.py,sha256=tERMur_gry9TmU3UyzndJO_CLViISn4b8ClrRbryFy8,444
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices-0.2.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-0.2.0.dist-info/METADATA,sha256=ypYsMxLoVYrWxQdLA8cHM0-ysCPWVzIN3yxYxMLs_M8,4680
-aioamazondevices-0.2.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-aioamazondevices-0.2.0.dist-info/RECORD,,