feat: 支持多设备分开播放 see #65

hanxi · Jul 11, 2024 · 043a930 · 043a930
1 parent aa69866
commit 043a930
Show file tree

Hide file tree

Showing 11 changed files with 904 additions and 678 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,7 +2,8 @@ name: ci
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - "*"
   workflow_dispatch:
 
 jobs:

diff --git a/config-example.json b/config-example.json
@@ -1,81 +1,81 @@
 {
-    "hardware": "L07A",
-    "account": "",
-    "password": "",
-    "mi_did": "",
-    "cookie": "",
-    "verbose": false,
-    "music_path": "music",
-    "conf_path": null,
-    "hostname": "192.168.2.5",
-    "port": 8090,
-    "public_port": 0,
-    "proxy": null,
-    "search_prefix": "bilisearch:",
-    "ffmpeg_location": "./ffmpeg/bin",
-    "active_cmd": "play,random_play,playlocal,play_music_list,stop",
-    "exclude_dirs": "@eaDir",
-    "music_path_depth": 10,
-    "disable_httpauth": true,
-    "httpauth_username": "admin",
-    "httpauth_password": "admin",
-    "music_list_url": "",
-    "music_list_json": "",
-    "disable_download": false,
-    "key_word_dict": {
-        "播放歌曲": "play",
-        "播放本地歌曲": "playlocal",
-        "关机": "stop",
-        "下一首": "play_next",
-        "单曲循环": "set_play_type_one",
-        "全部循环": "set_play_type_all",
-        "随机播放": "random_play",
-        "分钟后关机": "stop_after_minute",
-        "播放列表": "play_music_list",
-        "刷新列表": "gen_music_list",
-        "set_volume#": "set_volume",
-        "get_volume#": "get_volume",
-        "本地播放歌曲": "playlocal",
-        "放歌曲": "play",
-        "暂停": "stop",
-        "停止": "stop",
-        "停止播放": "stop",
-        "测试自定义口令": "exec#code1(\"hello\")",
-        "测试链接": "exec#httpget(\"https://github.com/hanxi/xiaomusic\")"
-    },
-    "key_match_order": [
-        "set_volume#",
-        "get_volume#",
-        "分钟后关机",
-        "播放歌曲",
-        "下一首",
-        "单曲循环",
-        "全部循环",
-        "随机播放",
-        "关机",
-        "刷新列表",
-        "播放列表",
-        "播放本地歌曲",
-        "本地播放歌曲",
-        "放歌曲",
-        "暂停",
-        "停止",
-        "停止播放",
-        "测试自定义口令",
-        "测试链接"
-    ],
-    "use_music_api": false,
-    "use_music_audio_id": "1582971365183456177",
-    "use_music_id": "355454500",
-    "log_file": "/tmp/xiaomusic.txt",
-    "fuzzy_match_cutoff": 0.6,
-    "enable_fuzzy_match": true,
-    "stop_tts_msg": "收到,再见",
-    "keywords_playlocal": "播放本地歌曲,本地播放歌曲",
-    "keywords_play": "播放歌曲,放歌曲",
-    "keywords_stop": "关机,暂停,停止,停止播放",
-    "user_key_word_dict": {
-        "测试自定义口令": "exec#code1(\"hello\")",
-        "测试链接": "exec#httpget(\"https://github.com/hanxi/xiaomusic\")"
-    }
+  "account": "",
+  "password": "",
+  "mi_did": "",
+  "cookie": "",
+  "verbose": false,
+  "music_path": "music",
+  "download_path": "",
+  "conf_path": null,
+  "hostname": "192.168.2.5",
+  "port": 8090,
+  "public_port": 0,
+  "proxy": null,
+  "search_prefix": "bilisearch:",
+  "ffmpeg_location": "./ffmpeg/bin",
+  "active_cmd": "play,set_random_play,playlocal,play_music_list,stop",
+  "exclude_dirs": "@eaDir",
+  "music_path_depth": 10,
+  "disable_httpauth": true,
+  "httpauth_username": "",
+  "httpauth_password": "",
+  "music_list_url": "",
+  "music_list_json": "",
+  "disable_download": false,
+  "key_word_dict": {
+    "播放歌曲": "play",
+    "播放本地歌曲": "playlocal",
+    "关机": "stop",
+    "下一首": "play_next",
+    "单曲循环": "set_play_type_one",
+    "全部循环": "set_play_type_all",
+    "随机播放": "set_random_play",
+    "分钟后关机": "stop_after_minute",
+    "播放列表": "play_music_list",
+    "刷新列表": "gen_music_list",
+    "本地播放歌曲": "playlocal",
+    "放歌曲": "play",
+    "暂停": "stop",
+    "停止": "stop",
+    "停止播放": "stop",
+    "测试自定义口令": "exec#code1(\"hello\")",
+    "测试链接": "exec#httpget(\"https://github.com/hanxi/xiaomusic\")"
+  },
+  "key_match_order": [
+    "分钟后关机",
+    "播放歌曲",
+    "下一首",
+    "单曲循环",
+    "全部循环",
+    "随机播放",
+    "关机",
+    "刷新列表",
+    "播放列表",
+    "播放本地歌曲",
+    "本地播放歌曲",
+    "放歌曲",
+    "暂停",
+    "停止",
+    "停止播放",
+    "测试自定义口令",
+    "测试链接"
+  ],
+  "use_music_api": false,
+  "use_music_audio_id": "1582971365183456177",
+  "use_music_id": "355454500",
+  "log_file": "/tmp/xiaomusic.txt",
+  "fuzzy_match_cutoff": 0.6,
+  "enable_fuzzy_match": true,
+  "stop_tts_msg": "收到,再见",
+  "enable_config_example": true,
+  "keywords_playlocal": "播放本地歌曲,本地播放歌曲",
+  "keywords_play": "播放歌曲,放歌曲",
+  "keywords_stop": "关机,暂停,停止,停止播放",
+  "user_key_word_dict": {
+    "测试自定义口令": "exec#code1(\"hello\")",
+    "测试链接": "exec#httpget(\"https://github.com/hanxi/xiaomusic\")"
+  },
+  "enable_force_stop": false,
+  "devices": {},
+  "group_list": ""
 }
diff --git a/xiaomusic/config.py b/xiaomusic/config.py
@@ -18,12 +18,10 @@ def default_key_word_dict():
         "下一首": "play_next",
         "单曲循环": "set_play_type_one",
         "全部循环": "set_play_type_all",
-        "随机播放": "random_play",
+        "随机播放": "set_random_play",
         "分钟后关机": "stop_after_minute",
         "播放列表": "play_music_list",
         "刷新列表": "gen_music_list",
-        "set_volume#": "set_volume",
-        "get_volume#": "get_volume",
     }
 
 
@@ -43,8 +41,6 @@ def default_user_key_word_dict():
 # 口令匹配优先级
 def default_key_match_order():
     return [
-        "set_volume#",
-        "get_volume#",
         "分钟后关机",
         "播放歌曲",
         "下一首",
@@ -57,12 +53,22 @@ def default_key_match_order():
     ]
 
 
+@dataclass
+class Device:
+    did: str = ""
+    device_id: str = ""
+    hardware: str = ""
+    name: str = ""
+    play_type: int = ""
+    cur_music: str = ""
+    cur_playlist: str = ""
+
+
 @dataclass
 class Config:
     account: str = os.getenv("MI_USER", "")
     password: str = os.getenv("MI_PASS", "")
     mi_did: str = os.getenv("MI_DID", "")  # 逗号分割支持多设备
-    hardware: str = os.getenv("MI_HARDWARE", "L07A")  # 逗号分割支持多设备
     cookie: str = ""
     verbose: bool = os.getenv("XIAOMUSIC_VERBOSE", "").lower() == "true"
     music_path: str = os.getenv(
@@ -79,7 +85,7 @@ class Config:
     )  # "bilisearch:" or "ytsearch:"
     ffmpeg_location: str = os.getenv("XIAOMUSIC_FFMPEG_LOCATION", "./ffmpeg/bin")
     active_cmd: str = os.getenv(
-        "XIAOMUSIC_ACTIVE_CMD", "play,random_play,playlocal,play_music_list,stop"
+        "XIAOMUSIC_ACTIVE_CMD", "play,set_random_play,playlocal,play_music_list,stop"
     )
     exclude_dirs: str = os.getenv("XIAOMUSIC_EXCLUDE_DIRS", "@eaDir")
     music_path_depth: int = int(os.getenv("XIAOMUSIC_MUSIC_PATH_DEPTH", "10"))
@@ -123,7 +129,10 @@ class Config:
     enable_force_stop: bool = (
         os.getenv("XIAOMUSIC_ENABLE_FORCE_STOP", "false").lower() == "true"
     )
-    play_type: int = int(os.getenv("XIAOMUSIC_PLAY_TYPE", "2"))
+    devices: dict[str, Device] = field(default_factory=dict)
+    group_list: str = os.getenv(
+        "XIAOMUSIC_GROUP_LIST", ""
+    )  # did2:group_name,did2:group_name
 
     def append_keyword(self, keys, action):
         for key in keys.split(","):
@@ -150,7 +159,7 @@ def __post_init__(self) -> None:
         if self.enable_config_example:
             with open("config-example.json", "w") as f:
                 data = asdict(self)
-                json.dump(data, f, ensure_ascii=False, indent=4)
+                json.dump(data, f, ensure_ascii=False, indent=2)
 
     @classmethod
     def from_options(cls, options: argparse.Namespace) -> Config:
@@ -171,6 +180,10 @@ def convert_value(cls, k, v, type_hints):
                     converted_value = False
                     if str(v).lower() == "true":
                         converted_value = True
+                elif expected_type == dict[str, Device]:
+                    converted_value = {}
+                    for kk, vv in v.items():
+                        converted_value[kk] = Device(**vv)
                 else:
                     converted_value = expected_type(v)
                 return converted_value
@@ -192,7 +205,7 @@ def read_from_file(cls, config_path: str) -> dict:
         return result
 
     def update_config(self, data):
-        type_hints = get_type_hints(self)
+        type_hints = get_type_hints(self, globals(), locals())
 
         for k, v in data.items():
             converted_value = self.convert_value(k, v, type_hints)

diff --git a/xiaomusic/const.py b/xiaomusic/const.py
@@ -9,3 +9,13 @@
 
 LATEST_ASK_API = "https://userprofile.mina.mi.com/device_profile/v2/conversation?source=dialogu&hardware={hardware}&timestamp={timestamp}&limit=2"
 COOKIE_TEMPLATE = "deviceId={device_id}; serviceToken={service_token}; userId={user_id}"
+
+PLAY_TYPE_ONE = 0  # 单曲循环
+PLAY_TYPE_ALL = 1  # 全部循环
+PLAY_TYPE_RND = 2  # 随机播放
+
+PLAY_TYPE_TTS = {
+    PLAY_TYPE_ONE: "已经设置为单曲循环",
+    PLAY_TYPE_ALL: "已经设置为全部循环",
+    PLAY_TYPE_RND: "已经设置为随机播放",
+}