update log

pyproject.toml

@@ -1,12 +1,11 @@
 [project]
 name = "xiaomusic"
-version = "0.1.49"
+version = "0.1.50"
 description = "Play Music with xiaomi AI speaker"
 authors = [
     {name = "涵曦", email = "im.hanxi@gmail.com"},
 ]
 dependencies = [
-    "rich>=13.6.0",
     "requests>=2.31.0",
     "aiohttp>=3.8.6",
     "miservice-fork>=2.5.0",
@@ -29,7 +28,7 @@ lint = [
     "ruff>=0.4.8",
 ]
 [tool.ruff]
-select = [
+lint.select = [
         "B", # flake8-bugbear
         "C4", # flake8-comprehensions
         "E", # pycodestyle - Error
@@ -38,13 +37,13 @@ select = [
         "W", # pycodestyle - Warning
         "UP", # pyupgrade
 ]
-ignore = [
+lint.ignore = [
         "E501", # line-too-long
         "W191", # tab-indentation
 ]
 include = ["**/*.py", "**/*.pyi", "**/pyproject.toml"]
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "google"
 
 [tool.pdm.scripts]

requirements.txt

@@ -368,9 +368,9 @@ pycryptodomex==3.19.0 \
 pygments==2.16.1 \
     --hash=sha256:13fc09fa63bc8d8671a6d247e1eb303c4b343eaee81d861f3404db2935653692 \
     --hash=sha256:1daff0494820c69bc8941e407aa20f577374ee88364ee10a98fdbe0aece96e29
-requests==2.31.0 \
-    --hash=sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f \
-    --hash=sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1
+requests==2.32.3 \
+    --hash=sha256:55365417734eb18255590a9ff9eb97e9e1da868d4ccd6402399eaf68af20a760 \
+    --hash=sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6
 rich==13.7.1 \
     --hash=sha256:4edbae314f59eb482f54e9e30bf00d33350aaa94f4bfcd4e9e3110e64d0d7222 \
     --hash=sha256:9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432
@@ -469,6 +469,6 @@ yarl==1.9.2 \
     --hash=sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9 \
     --hash=sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3 \
     --hash=sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560
-yt-dlp==2024.5.16.232713.dev0 \
-    --hash=sha256:42d3c27ab77583ff67ee2ddc94e376ea2a76a561ed8b1836ee04fd1cd23ad88c \
-    --hash=sha256:d431187fa703c9f52225080ae56471272679e44d9363f97b7b3187d37a5e6480
+yt-dlp==2024.6.17.232743.dev0 \
+    --hash=sha256:2f6f44eff755a7b051cdcd3c4375771033dbeb64d6164351022efdc67cce0c52 \
+    --hash=sha256:dd6e7e194b96e778691f58a0cb6b42956cf956b22f6bb1a12bdef5ab3ac0c9ad

xiaomusic/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.49"
+__version__ = "0.1.50"

xiaomusic/xiaomusic.py

@@ -14,7 +14,6 @@
 import mutagen
 from aiohttp import ClientSession, ClientTimeout
 from miservice import MiAccount, MiIOService, MiNAService, miio_command
-from rich.logging import RichHandler
 
 from xiaomusic import (
     __version__,
@@ -30,9 +29,9 @@
 )
 from xiaomusic.httpserver import StartHTTPServer
 from xiaomusic.utils import (
+    custom_sort_key,
     fuzzyfinder,
     parse_cookie_string,
-    custom_sort_key,
 )
 
 EOF = object()
@@ -85,9 +84,8 @@ def __init__(self, config: Config):
 
         # setup logger
         logging.basicConfig(
-            format=f"[{__version__}]\t%(message)s",
+            format=f"%(asctime)s [{__version__}] [%(levelname)s] %(message)s",
             datefmt="[%X]",
-            handlers=[RichHandler(rich_tracebacks=True)],
         )
         self.log = logging.getLogger("xiaomusic")
         self.log.setLevel(logging.DEBUG if config.verbose else logging.INFO)
@@ -202,13 +200,12 @@ async def get_latest_ask_from_xiaoai(self, session):
         for i in range(retries):
             try:
                 timeout = ClientTimeout(total=15)
-                r = await session.get(
-                    LATEST_ASK_API.format(
-                        hardware=self.config.hardware,
-                        timestamp=str(int(time.time() * 1000)),
-                    ),
-                    timeout=timeout,
+                url = LATEST_ASK_API.format(
+                    hardware=self.config.hardware,
+                    timestamp=str(int(time.time() * 1000)),
                 )
+                self.log.debug(f"url:{url}")
+                r = await session.get(url, timeout=timeout)
             except Exception as e:
                 self.log.warning(
                     "Execption when get latest ask from xiaoai: %s", str(e)