[WIP] Adjust NuclearMeta

nukeop · Aug 27, 2024 · 129ee02 · 129ee02
1 parent ca09d7c
commit 129ee02
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 19 deletions.
diff --git a/packages/core/src/types/index.ts b/packages/core/src/types/index.ts
@@ -14,7 +14,7 @@ export interface NuclearStatus {
 
 export interface NuclearMeta {
   uuid: string;
-  artist: string;
+  artists: string[];
   streams?: Array<{ duration: number }>;
   name?: string;
   position?: number;

diff --git a/packages/main/src/controllers/player.ts b/packages/main/src/controllers/player.ts
@@ -76,7 +76,7 @@ class IpcPlayer {
       return;
     }
 
-    this.window.setTitle(`${arg.artist} - ${arg.name} - Nuclear Music Player`);
+    this.window.setTitle(`${arg.artists[0]} - ${arg.name} - Nuclear Music Player`);
     this.systemApi.sendMetadata && this.systemApi.sendMetadata(arg);
     this.discord.trackChange(arg);
     this.trayMenu.update({track: arg});

diff --git a/packages/main/src/services/discord/index.ts b/packages/main/src/services/discord/index.ts
@@ -82,7 +82,7 @@ class Discord {
     this.baseStart = Date.now();
     this.pausedTotal = 0;
     this.activity = {
-      details: `${track.artist} - ${track.name}`,
+      details: `${track.artists[0]} - ${track.name}`,
       startTimestamp: this.baseStart,
       largeImageKey: 'logo'
     };

diff --git a/packages/main/src/services/local-library/index.ts b/packages/main/src/services/local-library/index.ts
@@ -74,7 +74,7 @@ class LocalLibrary {
       }(),
       position: common.track.no,
       album: common.album,
-      artist: common.artist || 'unknown',
+      artists: [common.artist] || ['unknown'],
       imageData: common.picture && common.picture[0].data,
       lastScanned: +Date.now()
     };
@@ -124,7 +124,7 @@ class LocalLibrary {
 
       if (data && data.recordings && data.recordings.length) {
         meta.name = data.recordings[0].name;
-        meta.artist = data.recordings[0].artists?.[0].name || 'unknown';
+        meta.artists = data.recordings[0].artists?.map(artist => artist.name) || ['unknown'];
       }
 
       if (!meta.name) {

diff --git a/packages/main/src/services/trayMenu/index.ts b/packages/main/src/services/trayMenu/index.ts
@@ -64,7 +64,7 @@ class TrayMenu {
         enabled: false
       });
       template.push({
-        label: `by ${this.playerContext.track.artist}`,
+        label: `by ${this.playerContext.track.artists[0]}`,
         enabled: false
       });
     } else {
@@ -137,7 +137,7 @@ class TrayMenu {
 
   getToolTipString() {
     return this.playerContext.track ? 
-      `${this.playerContext.isPlaying ? 'Playing: ' : ''} ${this.playerContext.track.name} - ${this.playerContext.track.artist}` :
+      `${this.playerContext.isPlaying ? 'Playing: ' : ''} ${this.playerContext.track.name} - ${this.playerContext.track.artists[0]}` :
       this.config.title ;
   }
 

diff --git a/packages/scanner/index.d.ts b/packages/scanner/index.d.ts
@@ -1,6 +1,6 @@
 export type LocalTrack = {
     uuid: string;
-    artist: string;
+    artists: string[];
     title?: string;
     album?: string;
     duration?: number;

diff --git a/packages/scanner/src/js.rs b/packages/scanner/src/js.rs
@@ -56,12 +56,34 @@ pub fn set_optional_field_buffer(
     }
 }
 
+pub fn set_optional_field_string_array(
+    cx: &mut FunctionContext,
+    obj: &mut Handle<JsObject>,
+    field_name: &str,
+    value: Option<Vec<String>>,
+) {
+    match value {
+        Some(v) => {
+            let field_value = cx.empty_array();
+            for (i, str) in v.iter().enumerate() {
+                let js_str = cx.string(&str);
+                field_value.set(cx, i as u32, js_str).unwrap();
+            }
+            obj.set(cx, field_name, field_value).unwrap();
+        }
+        None => {
+            let undefined = cx.undefined();
+            obj.set(cx, field_name, undefined).unwrap();
+        }
+    }
+}
+
 pub fn set_properties_from_metadata(
     cx: &mut FunctionContext,
     obj: &mut Handle<JsObject>,
     metadata: &AudioMetadata,
 ) {
-    set_optional_field_str(cx, obj, "artist", metadata.artist.clone());
+    set_optional_field_string_array(cx, obj, "artists", metadata.artists.clone());
     set_optional_field_str(cx, obj, "title", metadata.title.clone());
     set_optional_field_str(cx, obj, "album", metadata.album.clone());
 

diff --git a/packages/scanner/src/metadata.rs b/packages/scanner/src/metadata.rs
@@ -22,7 +22,7 @@ use crate::{
 #[derive(Default, Debug, Clone, Builder)]
 #[builder(setter(strip_option))]
 pub struct AudioMetadata {
-    pub artist: Option<String>,
+    pub artists: Option<Vec<String>>,
     pub title: Option<String>,
     pub album: Option<String>,
     pub duration: Option<u32>,
@@ -35,7 +35,7 @@ pub struct AudioMetadata {
 impl AudioMetadata {
     pub fn new() -> Self {
         Self {
-            artist: None,
+            artists: None,
             title: None,
             album: None,
             duration: None,
@@ -74,7 +74,7 @@ impl MetadataExtractor for Mp3MetadataExtractor {
         let tag = tag.unwrap();
         let mut metadata = AudioMetadata::new();
 
-        metadata.artist = tag.artist().map(|s| s.to_string());
+        metadata.artists = tag.artist().map(|s| s.to_string()).and_then(|s| Some(vec![s]));
         metadata.title = tag.title().map(|s| s.to_string());
         metadata.album = tag.album().map(|s| s.to_string());
         let duration = mp3_duration::from_path(&path).map(|duration| duration.as_secs() as u32);
@@ -139,7 +139,7 @@ impl MetadataExtractor for FlacMetadataExtractor {
 
         let tag = tag.unwrap();
         let mut metadata = AudioMetadata::new();
-        metadata.artist = Self::extract_string_metadata(&tag, "ARTIST", Some("ALBUMARTIST"));
+        metadata.artists = Self::extract_string_metadata(&tag, "ARTIST", Some("ALBUMARTIST")).and_then(|s| Some(vec![s]));
         metadata.title = Self::extract_string_metadata(&tag, "TITLE", None);
         metadata.album = Self::extract_string_metadata(&tag, "ALBUM", None);
         let total_samples = tag.get_streaminfo().unwrap().total_samples;
@@ -213,7 +213,7 @@ impl MetadataExtractor for OggMetadataExtractor {
                             metadata.title = Some(tag.value.to_string());
                         }
                         Some(StandardTagKey::Artist) => {
-                            metadata.artist = Some(tag.value.to_string());
+                            metadata.artists = Some(vec![tag.value.to_string()]);
                         }
                         Some(StandardTagKey::Album) => {
                             metadata.album = Some(tag.value.to_string());
@@ -257,7 +257,7 @@ impl MetadataExtractor for Mp4MetadataExtractor {
         let tag = tag.unwrap();
         let mut metadata = AudioMetadata::new();
 
-        metadata.artist = tag.artist().map(|s| s.to_string());
+        metadata.artists = tag.artist().map(|s| s.to_string()).and_then(|s| Some(vec![s]));
         metadata.title = tag.title().map(|s| s.to_string());
         metadata.album = tag.album().map(|s| s.to_string());
         metadata.duration = tag.duration().map(|d| d.as_secs() as u32);

diff --git a/packages/scanner/src/scanner.rs b/packages/scanner/src/scanner.rs
@@ -44,7 +44,7 @@ where
 
     if let Ok(mut metadata) = metadata {
         metadata.title = metadata.title.clone().or(Some(filename.clone()));
-        metadata.artist = metadata.artist.clone().or(Some("unknown".to_string()));
+        metadata.artists = metadata.artists.clone().or(Some(vec!["unknown".to_string()]));
         Ok(LocalTrack {
             uuid: Uuid::new_v4().to_string(),
             metadata: metadata,
@@ -112,7 +112,7 @@ mod tests {
     pub fn test_extractor_from_path(_path: &str) -> Option<Box<dyn MetadataExtractor>> {
         Some(Box::new(TestMetadataExtractor::new(
             AudioMetadataBuilder::default()
-                .artist("Test Artist".to_string())
+                .artists(vec!["Test Artist".to_string()])
                 .title("Test Title".to_string())
                 .album("Test Album".to_string())
                 .duration(10)
@@ -131,7 +131,7 @@ mod tests {
         let thumbnails_dir: String = "tests/thumbnails".to_string();
         let local_track = visit_file(path, test_extractor_from_path, &thumbnails_dir).unwrap();
         assert_eq!(local_track.filename, "test.mp3");
-        assert_eq!(local_track.metadata.artist, Some("Test Artist".to_string()));
+        assert_eq!(local_track.metadata.artists, Some(vec!["Test Artist".to_string()]));
         assert_eq!(local_track.metadata.title, Some("Test Title".to_string()));
         assert_eq!(local_track.metadata.album, Some("Test Album".to_string()));
         assert_eq!(local_track.metadata.duration, Some(10));
@@ -157,7 +157,7 @@ mod tests {
         let local_track =
             visit_file(path, test_extractor_from_path_no_metadata, &thumbnails_dir).unwrap();
         assert_eq!(local_track.filename, "test.mp3");
-        assert_eq!(local_track.metadata.artist, Some("unknown".to_string()));
+        assert_eq!(local_track.metadata.artists, Some(vec!["unknown".to_string()]));
         assert_eq!(local_track.metadata.title, Some("test.mp3".to_string()));
         assert_eq!(local_track.metadata.album, None);
         assert_eq!(local_track.metadata.duration, None);