mijiaAPI 1.4.1__tar.gz → 1.4.3__tar.gz

{mijiaapi-1.4.1 → mijiaapi-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mijiaAPI
-Version: 1.4.1
+Version: 1.4.3
 Summary: A Python API for Xiaomi Mijia
 License: GPLv3
 Author: Do1e

{mijiaapi-1.4.1 → mijiaapi-1.4.3}/mijiaAPI/__main__.py

@@ -15,8 +15,8 @@ def parse_args(args):
     parser.add_argument(
         '-p', '--auth_path',
         type=str,
-        default=os.path.join(os.path.expanduser("~"), ".config", "mijia-api-auth.json"),
-        help="认证文件保存路径，默认保存在~/.config/mijia-api-auth.json",
+        default=os.path.join(os.path.expanduser("~"), ".config/mijia-api", "mijia-api-auth.json"),
+        help="认证文件保存路径，默认保存在~/.config/mijia-api/mijia-api-auth.json",
     )
     parser.add_argument(
         '-l', '--list_devices',
@@ -77,8 +77,8 @@ def parse_args(args):
     get.add_argument(
         '-p', '--auth_path',
         type=str,
-        default=os.path.join(os.path.expanduser("~"), ".config", "mijia-api-auth.json"),
-        help="认证文件保存路径，默认保存在~/.config/mijia-api-auth.json",
+        default=os.path.join(os.path.expanduser("~"), ".config/mijia-api", "mijia-api-auth.json"),
+        help="认证文件保存路径，默认保存在~/.config/mijia-api/mijia-api-auth.json",
     )
     get.add_argument(
         '--dev_name',
@@ -101,8 +101,8 @@ def parse_args(args):
     set.add_argument(
         '-p', '--auth_path',
         type=str,
-        default=os.path.join(os.path.expanduser("~"), ".config", "mijia-api-auth.json"),
-        help="认证文件保存路径，默认保存在~/.config/mijia-api-auth.json",
+        default=os.path.join(os.path.expanduser("~"), ".config/mijia-api", "mijia-api-auth.json"),
+        help="认证文件保存路径，默认保存在~/.config/mijia-api/mijia-api-auth.json",
     )
     set.add_argument(
         '--dev_name',

{mijiaapi-1.4.1 → mijiaapi-1.4.3}/mijiaAPI/devices.py

@@ -1,5 +1,6 @@
 from typing import Union, Optional
 import json
+import os
 import re
 import requests
 from time import sleep
@@ -169,7 +170,7 @@ class mijiaDevices(object):
             raise ValueError(f'Unsupported property: {name}, available properties: {list(self.prop_list.keys())}')
         prop = self.prop_list[name]
         if 'w' not in prop.rw:
-            raise ValueError(f'Property {name} is read-only')
+            raise ValueError(f'Property {name} can not be written')
         if prop.value_list:
             if value not in [item['value'] for item in prop.value_list]:
                 raise ValueError(f'Invalid value: {value}, should be in {prop.value_list}')
@@ -273,7 +274,7 @@ class mijiaDevices(object):
             raise ValueError(f'Unsupported property: {name}, available properties: {list(self.prop_list.keys())}')
         prop = self.prop_list[name]
         if 'r' not in prop.rw:
-            raise ValueError(f'Property {name} is write-only')
+            raise ValueError(f'Property {name} can not be read')
         method = prop.method.copy()
         method['did'] = did
         result = self.api.get_devices_prop([method])[0]
@@ -370,12 +371,13 @@ class mijiaDevices(object):
         return result['code'] == 0
 
 
-def get_device_info(device_model: str) -> dict:
+def get_device_info(device_model: str, cache_path: Optional[str] = os.path.join(os.path.expanduser("~"), ".config/mijia-api")) -> dict:
     """
     获取设备信息，用于初始化mijiaDevices对象。
 
     Args:
         device_model (str): 设备型号，从get_devices_list获取。
+        cache_path (str, optional): 缓存文件路径。默认为~/.config/mijia-api，设置为None则不使用缓存。
 
     Returns:
         dict: 设备信息字典。
@@ -383,6 +385,11 @@ def get_device_info(device_model: str) -> dict:
     Raises:
         RuntimeError: 如果获取设备信息失败。
     """
+    if cache_path is not None:
+        cache_file = os.path.join(cache_path, f'{device_model}.json')
+        if os.path.exists(cache_file):
+            with open(cache_file, 'r', encoding='utf-8') as f:
+                return json.load(f)
     response = requests.get(deviceURL + device_model)
     if response.status_code != 200:
         raise RuntimeError(f'Failed to get device info')
@@ -392,9 +399,15 @@ def get_device_info(device_model: str) -> dict:
     content = content.group(1)
     content = json.loads(content.replace('"', '"'))
 
+    if content['props']['product']:
+        name = content['props']['product']['name']
+        model = content['props']['product']['model']
+    else:
+        name = content['props']['spec']['name']
+        model = device_model
     result = {
-        'name': content['props']['product']['name'],
-        'model': content['props']['product']['model'],
+        'name': name,
+        'model': model,
         'properties': [],
         'actions': []
     }
@@ -446,4 +459,9 @@ def get_device_info(device_model: str) -> dict:
                         'aiid': int(aiid)
                     }
                 })
+    if cache_path is not None:
+        cache_file = os.path.join(cache_path, f'{device_model}.json')
+        os.makedirs(cache_path, exist_ok=True)
+        with open(cache_file, 'w', encoding='utf-8') as f:
+            json.dump(result, f, indent=2, ensure_ascii=False)
     return result

{mijiaapi-1.4.1 → mijiaapi-1.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mijiaAPI"
-version = "1.4.1"
+version = "1.4.3"
 description = "A Python API for Xiaomi Mijia"
 readme = "README.md"
 requires-python = ">=3.9,<4.0"
@@ -15,7 +15,7 @@ mijiaAPI = "mijiaAPI.__main__:cli"
 
 [tool.poetry]
 name = "mijiaAPI"
-version = "1.4.1"
+version = "1.4.3"
 description = "A Python API for Xiaomi Mijia"
 authors = ["Do1e <dpj.email@qq.com>"]
 license = "GPLv3"