From 5add7b7a5c40e11afc5db2751f405d384c10be2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= <im.hanxi@gmail.com>
Date: Mon, 1 Jul 2024 00:40:21 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=BA=93=20MiService?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pdm.lock               | 12 ++++++------
 requirements.txt       | 12 ++++++------
 xiaomusic/xiaomusic.py | 23 +----------------------
 3 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/pdm.lock b/pdm.lock
index a788ed3..76dc310 100644
--- a/pdm.lock
+++ b/pdm.lock
@@ -519,7 +519,7 @@ files = [
 
 [[package]]
 name = "miservice-fork"
-version = "2.6.0"
+version = "2.6.1"
 requires_python = ">=3.8"
 summary = "XiaoMi Cloud Service fork from https://github.com/Yonsm/MiService"
 dependencies = [
@@ -528,8 +528,8 @@ dependencies = [
     "rich",
 ]
 files = [
-    {file = "miservice_fork-2.6.0-py3-none-any.whl", hash = "sha256:98169a77ea41a7b9392e1b1fab8cb80a4165fed8a9e882d9ada9a16dd1120347"},
-    {file = "miservice_fork-2.6.0.tar.gz", hash = "sha256:a59d337d1f7a92566aa147e96595a8d2f5bf3f7000ae5e7dd9ed451f18d6e2fd"},
+    {file = "miservice_fork-2.6.1-py3-none-any.whl", hash = "sha256:9b2cc4208486bbbf788d1bde6e2cbc70f241ce10db4dca6f918076a2d2942a39"},
+    {file = "miservice_fork-2.6.1.tar.gz", hash = "sha256:1702281e1e9827958eb3e82bc3242cd013c018e9aa1de8509b4805b5ccf5e60c"},
 ]
 
 [[package]]
@@ -832,7 +832,7 @@ files = [
 
 [[package]]
 name = "yt-dlp"
-version = "2024.6.24.232830.dev0"
+version = "2024.6.30.232744.dev0"
 requires_python = ">=3.8"
 summary = "A feature-rich command-line audio/video downloader"
 dependencies = [
@@ -846,6 +846,6 @@ dependencies = [
     "websockets>=12.0",
 ]
 files = [
-    {file = "yt_dlp-2024.6.24.232830.dev0-py3-none-any.whl", hash = "sha256:efffecef44ce688e9ee3c02226eb1ba4ad64b37744726e9e4df5c2bd04ea93c5"},
-    {file = "yt_dlp-2024.6.24.232830.dev0.tar.gz", hash = "sha256:0e89b46958984954393692a8c41e0f6d76a773be2df381c3d3a4ff24ce89aa32"},
+    {file = "yt_dlp-2024.6.30.232744.dev0-py3-none-any.whl", hash = "sha256:62e0086b18ac5449277e9d9366ead4eb9e1ba0db23c607ad076da07f945fc1ea"},
+    {file = "yt_dlp-2024.6.30.232744.dev0.tar.gz", hash = "sha256:06dedc2e6b007a64d7f4019fe4f5773f1d6b9421d9f5f58df9e3233ce9683d5b"},
 ]
diff --git a/requirements.txt b/requirements.txt
index fde20cd..9cca28b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -305,9 +305,9 @@ MarkupSafe==2.1.4 \
 mdurl==0.1.2 \
     --hash=sha256:84008a41e51615a49fc9966191ff91509e3c40b939176e643fd50a5c2196b8f8 \
     --hash=sha256:bb413d29f5eea38f31dd4754dd7377d4465116fb207585f97bf925588687c1ba
-miservice-fork==2.6.0 \
-    --hash=sha256:98169a77ea41a7b9392e1b1fab8cb80a4165fed8a9e882d9ada9a16dd1120347 \
-    --hash=sha256:a59d337d1f7a92566aa147e96595a8d2f5bf3f7000ae5e7dd9ed451f18d6e2fd
+miservice-fork==2.6.1 \
+    --hash=sha256:1702281e1e9827958eb3e82bc3242cd013c018e9aa1de8509b4805b5ccf5e60c \
+    --hash=sha256:9b2cc4208486bbbf788d1bde6e2cbc70f241ce10db4dca6f918076a2d2942a39
 multidict==6.0.4 \
     --hash=sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9 \
     --hash=sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8 \
@@ -472,6 +472,6 @@ yarl==1.9.2 \
     --hash=sha256:d4e2c6d555e77b37288eaf45b8f60f0737c9efa3452c6c44626a5455aeb250b9 \
     --hash=sha256:e9fdc7ac0d42bc3ea78818557fab03af6181e076a2944f43c38684b4b6bed8e3 \
     --hash=sha256:ee4afac41415d52d53a9833ebae7e32b344be72835bbb589018c9e938045a560
-yt-dlp==2024.6.24.232830.dev0 \
-    --hash=sha256:0e89b46958984954393692a8c41e0f6d76a773be2df381c3d3a4ff24ce89aa32 \
-    --hash=sha256:efffecef44ce688e9ee3c02226eb1ba4ad64b37744726e9e4df5c2bd04ea93c5
+yt-dlp==2024.6.30.232744.dev0 \
+    --hash=sha256:06dedc2e6b007a64d7f4019fe4f5773f1d6b9421d9f5f58df9e3233ce9683d5b \
+    --hash=sha256:62e0086b18ac5449277e9d9366ead4eb9e1ba0db23c607ad076da07f945fc1ea
diff --git a/xiaomusic/xiaomusic.py b/xiaomusic/xiaomusic.py
index 7f2202b..0eb4ac9 100644
--- a/xiaomusic/xiaomusic.py
+++ b/xiaomusic/xiaomusic.py
@@ -34,7 +34,6 @@ from xiaomusic.utils import (
     find_best_match,
     fuzzyfinder,
     get_local_music_duration,
-    get_random,
     get_web_music_duration,
     parse_cookie_string,
     walk_to_depth,
@@ -673,30 +672,10 @@ class XiaoMusic:
                 return True
         return False
 
-    async def _play_by_music_url(self, device_id, url):
-        audio_id = get_random(30)
-        audio_type = ""
-        if self.config.hardware in ["LX04", "X10A", "X08A"]:
-            audio_type = "MUSIC"
-        music = {
-            "payload": {
-                "audio_items": [
-                    {"item_id": {"audio_id": audio_id}, "stream": {"url": url}}
-                ],
-                "audio_type": audio_type,
-            }
-        }
-        return await self.mina_service.ubus_request(
-            device_id,
-            "player_play_music",
-            "mediaplayer",
-            {"startaudioid": audio_id, "music": json.dumps(music)},
-        )
-
     async def play_url(self, **kwargs):
         url = kwargs.get("arg1", "")
         if self.config.use_music_api:
-            ret = await self._play_by_music_url(self.device_id, url)
+            ret = await self.mina_service.play_by_music_url(self.device_id, url)
             self.log.debug(
                 f"play_url play_by_music_url {self.config.hardware}. ret:{ret} url:{url}"
             )