From 7af08292aff0e39ff283e527764c7cdf9217981b Mon Sep 17 00:00:00 2001
From: CyanSalt <c.salt@hotmail.com>
Date: Fri, 19 Jan 2024 09:53:56 +0800
Subject: [PATCH] feat: multiple artists matching

---
 src/renderer/components/App.vue  | 19 +++++++------------
 src/renderer/utils/connection.ts | 25 ++++++++++++++++++++++---
 src/renderer/vendors/kugou.ts    |  2 +-
 src/renderer/vendors/netease.ts  |  2 +-
 src/renderer/vendors/types.ts    |  2 +-
 5 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/renderer/components/App.vue b/src/renderer/components/App.vue
index e359a88..c1f8c05 100644
--- a/src/renderer/components/App.vue
+++ b/src/renderer/components/App.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { findLastIndex } from 'lodash-es'
+import { difference, findLastIndex } from 'lodash-es'
 import { LucideCloud, LucideCloudOff, LucideMaximize, LucideMinimize, LucideMonitor, LucideMonitorOff, LucideMonitorPause, LucideMonitorPlay, LucideMoon, LucideMove, LucidePause, LucidePin, LucidePinOff, LucidePlay, LucideSun, LucideX } from 'lucide-vue-next'
 import type { CSSProperties } from 'vue'
 import { nextTick, watchEffect } from 'vue'
@@ -258,7 +258,7 @@ async function load(query: string, properties?: MusicInfo) {
   const song = songs.find(item => {
     const transformed = service.transform(item)
     if (properties?.album && transformed.album !== properties.album) return false
-    if (properties?.artist && transformed.artist !== properties.artist) return false
+    if (properties?.artists && difference(properties.artists, transformed.artists ?? []).length) return false
     return true
   }) ?? songs[0]
   if (!song) return
@@ -317,16 +317,11 @@ watchEffect(onInvalidate => {
     const timer = setInterval(async () => {
       const result = await getConnectedData()
       if (result) {
-        isPlaying = result[0] === 'playing'
-        currentTime = result[1]
-        if (!connectedInfo || connectedInfo.key !== result[2] || connectedInfo.name !== result[3]) {
-          keyword = result[3]
-          connectedInfo = {
-            key: result[2],
-            name: result[3],
-            artist: result[4],
-            album: result[5],
-          }
+        isPlaying = result.isPlaying
+        currentTime = result.currentTime
+        if (!connectedInfo || connectedInfo.key !== result.info.key || connectedInfo.name !== result.info.name) {
+          connectedInfo = result.info
+          keyword = result.info.name
           load(keyword, connectedInfo)
         }
       } else {
diff --git a/src/renderer/utils/connection.ts b/src/renderer/utils/connection.ts
index c2e368d..85c6f2b 100644
--- a/src/renderer/utils/connection.ts
+++ b/src/renderer/utils/connection.ts
@@ -1,3 +1,5 @@
+import type { MusicInfo } from '../vendors/types'
+
 export function checkConnectable() {
   return worldBridge.platform === 'darwin'
 }
@@ -10,7 +12,13 @@ export function pauseConnected() {
   worldBridge.applescript('if application "Music" is running then tell application "Music" to pause')
 }
 
-export type ConnectedData = [
+export interface ConnectedData {
+  isPlaying: boolean,
+  currentTime: number,
+  info: MusicInfo,
+}
+
+export type AppleMusicData = [
   playerState: 'playing' | 'paused',
   playerPosition: number,
   trackId: number,
@@ -19,6 +27,17 @@ export type ConnectedData = [
   trackAlbum: string,
 ]
 
-export function getConnectedData() {
-  return worldBridge.applescript<ConnectedData | undefined>('if application "Music" is running then tell application "Music" to get player state & (get player position) & (get {id, name, artist, album} of current track)')
+export async function getConnectedData(): Promise<ConnectedData | undefined> {
+  const result = await worldBridge.applescript<AppleMusicData | undefined>('if application "Music" is running then tell application "Music" to get player state & (get player position) & (get {id, name, artist, album} of current track)')
+  if (!result) return undefined
+  return {
+    isPlaying: result[0] === 'playing',
+    currentTime: result[1],
+    info: {
+      key: result[2],
+      name: result[3],
+      artists: result[4].split(' & '),
+      album: result[5],
+    },
+  }
 }
diff --git a/src/renderer/vendors/kugou.ts b/src/renderer/vendors/kugou.ts
index 4d2793a..767fb62 100644
--- a/src/renderer/vendors/kugou.ts
+++ b/src/renderer/vendors/kugou.ts
@@ -30,7 +30,7 @@ export default defineMusicService<{
     return {
       key: song.hash,
       name: song.songname,
-      artist: song.singername,
+      artists: song.singername.split('、'),
       album: song.group?.[0]?.album_name,
     }
   },
diff --git a/src/renderer/vendors/netease.ts b/src/renderer/vendors/netease.ts
index b4a7c39..6f5f495 100644
--- a/src/renderer/vendors/netease.ts
+++ b/src/renderer/vendors/netease.ts
@@ -22,7 +22,7 @@ export default defineMusicService<{
     return {
       key: song.id,
       name: song.name,
-      artist: song.artists?.[0]?.name,
+      artists: song.artists?.map(artist => artist.name),
       album: song.album?.name,
     }
   },
diff --git a/src/renderer/vendors/types.ts b/src/renderer/vendors/types.ts
index 6f30f49..1c00394 100644
--- a/src/renderer/vendors/types.ts
+++ b/src/renderer/vendors/types.ts
@@ -1,7 +1,7 @@
 export interface MusicInfo {
   key: any,
   name: string,
-  artist?: string,
+  artists?: string[],
   album?: string,
 }