aioamazondevices 0.12.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

aioamazondevices/__init__.py

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

aioamazondevices/api.py

@@ -2,7 +2,6 @@
 
 import base64
 import hashlib
-import json
 import mimetypes
 import secrets
 import uuid
@@ -29,7 +28,7 @@ from .const import (
     AMAZON_DEVICE_TYPE,
     DEFAULT_ASSOC_HANDLE,
     DEFAULT_HEADERS,
-    DOMAIN_BY_COUNTRY,
+    DOMAIN_BY_ISO3166_COUNTRY,
     HTML_EXTENSION,
     JSON_EXTENSION,
     NODE_BLUETOOTH,
@@ -66,14 +65,14 @@ class AmazonEchoApi:
         login_country_code: str,
         login_email: str,
         login_password: str,
-        login_data_file: str | None,
+        login_data: dict[str, Any] | None = None,
         save_raw_data: bool = False,
     ) -> None:
         """Initialize the scanner."""
         # Force country digits as lower case
         country_code = login_country_code.lower()
 
-        locale = DOMAIN_BY_COUNTRY.get(country_code)
+        locale = DOMAIN_BY_ISO3166_COUNTRY.get(country_code)
         domain = locale["domain"] if locale else country_code
 
         if locale and (assoc := locale.get("openid.assoc_handle")):
@@ -85,28 +84,15 @@ class AmazonEchoApi:
         self._login_email = login_email
         self._login_password = login_password
         self._domain = domain
-        self._url = f"https://www.amazon.{domain}"
         self._cookies = self._build_init_cookies()
         self._headers = DEFAULT_HEADERS
         self._save_raw_data = save_raw_data
-        self._login_stored_data: dict[str, Any] = self._load_data_file(login_data_file)
+        self._login_stored_data = login_data
         self._serial = self._serial_number()
         self._website_cookies: dict[str, Any] = self._load_website_cookies()
 
         self.session: AsyncClient
 
-    def _load_data_file(self, data_file: str | None) -> dict[str, Any]:
-        """Load stored login data from file."""
-        if not data_file or not (file := Path(data_file)).exists():
-            _LOGGER.debug(
-                "Cannot find previous login data file <%s>",
-                data_file,
-            )
-            return {}
-
-        with Path.open(file, "rb") as f:
-            return cast(dict[str, Any], json.load(f))
-
     def _load_website_cookies(self) -> dict[str, Any]:
         """Get website cookies, if avaliables."""
         if not self._login_stored_data:
@@ -248,7 +234,11 @@ class AmazonEchoApi:
             cookies=self._website_cookies,
         )
         content_type: str = resp.headers.get("Content-Type", "")
-        _LOGGER.debug("Response content type: %s", content_type)
+        _LOGGER.debug(
+            "Response %s with content type: %s",
+            resp.status_code,
+            content_type,
+        )
 
         await self._save_to_file(
             resp.text,
@@ -266,7 +256,7 @@ class AmazonEchoApi:
         output_path: str = SAVE_PATH,
     ) -> None:
         """Save response data to disk."""
-        if not self._save_raw_data:
+        if not self._save_raw_data or not raw_data:
             return
 
         output_dir = Path(output_path)

aioamazondevices/const.py

@@ -6,12 +6,12 @@ _LOGGER = logging.getLogger(__package__)
 
 DEFAULT_ASSOC_HANDLE = "amzn_dp_project_dee_ios"
 
-DOMAIN_BY_COUNTRY = {
+DOMAIN_BY_ISO3166_COUNTRY = {
     "us": {
         "domain": "com",
         "openid.assoc_handle": DEFAULT_ASSOC_HANDLE,
     },
-    "uk": {
+    "gb": {
         "domain": "co.uk",
     },
     "au": {

{aioamazondevices-0.12.0.dist-info → aioamazondevices-1.0.0.dist-info}/METADATA

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

aioamazondevices-1.0.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+aioamazondevices/__init__.py,sha256=XbJRDlStfKsLjiOzztTl_ZThVv3tQtDrUsHqBgQcUco,276
+aioamazondevices/api.py,sha256=h3KtDQwERROb8HEkcnSY4pWpRWte3FRo70j_rtDxBUU,19407
+aioamazondevices/auth.py,sha256=vLJh7iOEUYu-44WOvmrmZZueOcwz5dmHAGQmqs9fJME,10099
+aioamazondevices/const.py,sha256=ikFYN9ZLAirnETkzOiuv-tJo6DYVDlEJyXWGRdbxI4A,1981
+aioamazondevices/exceptions.py,sha256=qK_Hak9pc-lC2FPW-0i4rYIwNpEOHMmA9Rii8F2lkQo,1260
+aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+aioamazondevices-1.0.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
+aioamazondevices-1.0.0.dist-info/METADATA,sha256=0DhyVc7ZfnhIdGAJOsHxJ2_tC-Nq_H77wu98dRE7iZw,4742
+aioamazondevices-1.0.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+aioamazondevices-1.0.0.dist-info/RECORD,,

aioamazondevices-0.12.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-aioamazondevices/__init__.py,sha256=oTQmfo7zpoQEBsdVdofolttfpX1O1x_nG2aDZlt_7wY,277
-aioamazondevices/api.py,sha256=ZcCCvbljaDjteUFcnDOzixtYD6VTbELNubc4cMDWsBA,19831
-aioamazondevices/auth.py,sha256=vLJh7iOEUYu-44WOvmrmZZueOcwz5dmHAGQmqs9fJME,10099
-aioamazondevices/const.py,sha256=pY3CTWW8mOaWbaDV_oZunX9hGcDZIhImzTXZEf-mXDU,1973
-aioamazondevices/exceptions.py,sha256=qK_Hak9pc-lC2FPW-0i4rYIwNpEOHMmA9Rii8F2lkQo,1260
-aioamazondevices/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-aioamazondevices-0.12.0.dist-info/LICENSE,sha256=sS48k5sp9bFV-NSHDfAJuTZZ_-AP9ZDqUzQ9sffGlsg,11346
-aioamazondevices-0.12.0.dist-info/METADATA,sha256=s3SMoDBFlSYDHLkjs7bsUAU1F6JAXfogkHU55SwjQ7w,4743
-aioamazondevices-0.12.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-aioamazondevices-0.12.0.dist-info/RECORD,,