🐞 fix: 修复一些小问题 & 模式切换提示

Author: imsyy

electron/main/ipc/ipc-file.ts

@@ -222,7 +222,19 @@ const initFileIpc = (): void => {
   // 修改音乐元信息
   ipcMain.handle("set-music-metadata", async (_, path: string, metadata: any) => {
     try {
-      const { name, artist, album, alia, lyric, cover } = metadata;
+      const {
+        name,
+        artist,
+        album,
+        alia,
+        lyric,
+        cover,
+        albumArtist,
+        genre,
+        year,
+        trackNumber,
+        discNumber,
+      } = metadata;
       // 规范化路径
       const songPath = resolve(path);
       const coverPath = cover ? resolve(cover) : undefined;
@@ -233,6 +245,11 @@ const initFileIpc = (): void => {
         album: album || "未知专辑",
         lyric: lyric || "",
         description: alia || "",
+        albumArtist: albumArtist,
+        genre: genre,
+        year: year,
+        trackNumber: trackNumber,
+        discNumber: discNumber,
       };
 
       if (!tools) {
@@ -542,7 +559,7 @@ const initFileIpc = (): void => {
           await mkdir(downloadPath, { recursive: true });
         }
 
-        const finalFilePath = fileType 
+        const finalFilePath = fileType
           ? join(downloadPath, `${fileName}.${fileType}`)
           : join(downloadPath, fileName);
 
@@ -606,20 +623,21 @@ const initFileIpc = (): void => {
 
             // Handle both object (new) and JSON string (legacy/fallback)
             if (typeof progressData === "string") {
-               try {
-                 progressData = JSON.parse(progressData);
-               } catch (e) {
-                 console.error("Failed to parse progress json", e);
-                 return;
-               }
+              try {
+                progressData = JSON.parse(progressData);
+              } catch (e) {
+                console.error("Failed to parse progress json", e);
+                return;
+              }
             }
 
-            if (!progressData || typeof progressData !== 'object') return;
+            if (!progressData || typeof progressData !== "object") return;
 
             // Map snake_case (Rust) to camelCase (JS)
             // Rust struct: { percent, transferred_bytes, total_bytes }
             const percent = progressData.percent;
-            const transferredBytes = progressData.transferredBytes ?? progressData.transferred_bytes ?? 0;
+            const transferredBytes =
+              progressData.transferredBytes ?? progressData.transferred_bytes ?? 0;
             const totalBytes = progressData.totalBytes ?? progressData.total_bytes ?? 0;
 
             win.webContents.send("download-progress", {
@@ -629,12 +647,7 @@ const initFileIpc = (): void => {
               totalBytes: totalBytes,
             });
           } catch (e) {
-            console.error(
-              "Error processing progress callback",
-              e,
-              "Args:",
-              args,
-            );
+            console.error("Error processing progress callback", e, "Args:", args);
           }
         };
 

electron/main/ipc/ipc-window.ts

@@ -121,6 +121,14 @@ const initWindowsIpc = (): void => {
     win.focus();
   });
 
+  // 显示主窗口
+  ipcMain.on("win-show-main", () => {
+    const mainWin = mainWindow.getWin();
+    if (!mainWin) return;
+    mainWin.show();
+    mainWin.focus();
+  });
+
   // 重载
   ipcMain.on("win-reload", (event) => {
     const win = BrowserWindow.fromWebContents(event.sender);
@@ -137,7 +145,7 @@ const initWindowsIpc = (): void => {
   // 向主窗口发送事件
   ipcMain.on("send-to-main-win", (_, eventName, ...args) => {
     const mainWin = mainWindow.getWin();
-    if (!mainWin || mainWin.isDestroyed() || mainWin.webContents.isDestroyed()) return;
+    if (!mainWin) return;
     mainWin.webContents.send(eventName, ...args);
   });
 
@@ -149,7 +157,6 @@ const initWindowsIpc = (): void => {
   const updateProgressBar = () => {
     const mainWin = mainWindow.getWin();
     if (!mainWin) return;
-
     if (currentProgress < 0) {
       mainWin.setProgressBar(-1);
     } else {

electron/main/windows/taskbar-lyric-window.ts

@@ -103,6 +103,10 @@ class TaskbarLyricWindow {
       maximizable: false,
       fullscreenable: false,
       resizable: false,
+      webPreferences: {
+        zoomFactor: 1.0,
+        partition: "persist:taskbar-lyric",
+      },
     });
 
     if (!this.win) return null;

native/tools/index.d.ts

@@ -1,5 +1,5 @@
 /* auto-generated by NAPI-RS */
- 
+/* eslint-disable */
 export declare class DownloadTask {
   constructor()
   cancel(): void
@@ -48,6 +48,11 @@ export interface SongMetadata {
   coverUrl?: string
   lyric?: string
   description?: string
+  albumArtist?: string
+  genre?: string
+  year?: number
+  trackNumber?: number
+  discNumber?: number
 }
 
 export declare function writeMusicMetadata(filePath: string, metadata: SongMetadata, coverPath?: string | undefined | null): Promise<void>

native/tools/src/download.rs

@@ -38,7 +38,7 @@ where
     where
         C: std::fmt::Display,
     {
-        self.map_err(|e| Error::from_reason(format!("{}: {}", context, e)))
+        self.map_err(|e| Error::from_reason(format!("{context}: {e}")))
     }
 }
 
@@ -127,9 +127,19 @@ pub struct SongMetadata {
     pub cover_url: Option<String>,
     pub lyric: Option<String>,
     pub description: Option<String>,
+    pub album_artist: Option<String>,
+    pub genre: Option<String>,
+    pub year: Option<u32>,
+    pub track_number: Option<u32>,
+    pub disc_number: Option<u32>,
 }
 
 #[napi]
+#[allow(
+    clippy::trailing_empty_array,
+    clippy::missing_errors_doc,
+    clippy::option_if_let_else
+)]
 pub async fn write_music_metadata(
     file_path: String,
     metadata: SongMetadata,
@@ -164,13 +174,23 @@ impl DownloadTask {
             token: CancellationToken::new(),
         }
     }
+}
 
+impl Default for DownloadTask {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[napi]
+impl DownloadTask {
     #[napi]
     pub fn cancel(&self) {
         self.token.cancel();
     }
 
     #[napi]
+    #[allow(clippy::too_many_arguments, clippy::missing_errors_doc)]
     pub async fn download(
         &self,
         url: String,
@@ -191,13 +211,10 @@ impl DownloadTask {
         let (total_size, http_version) =
             detect_content_length(&client, &url, referer.as_deref()).await;
 
-        println!(
-            "[Download] URL: {}, Version: {:?}, Size: {}",
-            url, http_version, total_size
-        );
+        println!("[Download] URL: {url}, Version: {http_version:?}, Size: {total_size}");
 
         if total_size > 0 {
-            println!("[Download] Threads: {}", thread_count);
+            println!("[Download] Threads: {thread_count}");
             download_range_stream(
                 self.token.clone(),
                 client.clone(),
@@ -241,9 +258,7 @@ fn build_client(enable_http2: bool) -> Result<reqwest::Client> {
         builder = builder.http1_only();
     }
 
-    builder
-        .build()
-        .context("Failed to build HTTP client")
+    builder.build().context("Failed to build HTTP client")
 }
 
 async fn detect_content_length(
@@ -321,7 +336,7 @@ async fn download_simple_stream(
 
     let process_result = async {
         while let Some(item) = tokio::select! {
-            _ = token.cancelled() => None,
+            () = token.cancelled() => None,
             item = stream.next() => item,
         } {
             let chunk = item.context("Read error")?;
@@ -330,7 +345,10 @@ async fn download_simple_stream(
         }
 
         if token.is_cancelled() {
-            return Err(Error::new(Status::Cancelled, "Download cancelled".to_string()));
+            return Err(Error::new(
+                Status::Cancelled,
+                "Download cancelled".to_string(),
+            ));
         }
 
         file.flush().await.context("Flush failed")?;
@@ -348,6 +366,7 @@ async fn download_simple_stream(
     Ok(())
 }
 
+#[allow(clippy::too_many_arguments)]
 async fn download_range_stream(
     token: CancellationToken,
     client: reqwest::Client,
@@ -390,7 +409,10 @@ async fn download_range_stream(
         while let Some(result) = stream.next().await {
             let (offset, data) = result?;
             if token.is_cancelled() {
-                return Err(Error::new(Status::Cancelled, "Download cancelled".to_string()));
+                return Err(Error::new(
+                    Status::Cancelled,
+                    "Download cancelled".to_string(),
+                ));
             }
 
             file.seek(SeekFrom::Start(offset))
@@ -407,7 +429,7 @@ async fn download_range_stream(
     if let Err(e) = process_result {
         drop(file);
         let _ = tokio::fs::remove_file(&file_path).await;
-        return Err(Error::from_reason(format!("Range download failed: {}", e)));
+        return Err(Error::from_reason(format!("Range download failed: {e}")));
     }
 
     tracker.finish();
@@ -427,10 +449,13 @@ async fn download_chunk_with_retry(
 
     while attempts < MAX_RETRIES {
         if token.is_cancelled() {
-            return Err(Error::new(Status::Cancelled, "Download cancelled".to_string()));
+            return Err(Error::new(
+                Status::Cancelled,
+                "Download cancelled".to_string(),
+            ));
         }
 
-        let range_header = format!("bytes={}-{}", start, end);
+        let range_header = format!("bytes={start}-{end}");
         let mut req = client.get(&url).header("Range", &range_header);
         if let Some(ref r) = referer {
             req = req.header("Referer", r);
@@ -448,7 +473,7 @@ async fn download_chunk_with_retry(
                 match resp.bytes().await {
                     Ok(bytes) => return Ok((start, bytes)),
                     Err(e) => {
-                        last_error = format!("Read bytes failed: {}", e);
+                        last_error = format!("Read bytes failed: {e}");
                     }
                 }
             }
@@ -461,8 +486,7 @@ async fn download_chunk_with_retry(
         tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
     }
     Err(Error::from_reason(format!(
-        "Chunk {}-{} failed after {} retries. Last error: {}",
-        start, end, MAX_RETRIES, last_error
+        "Chunk {start}-{end} failed after {MAX_RETRIES} retries. Last error: {last_error}"
     )))
 }
 
@@ -532,6 +556,26 @@ fn write_metadata(path: &str, meta: SongMetadata, cover_data: Option<bytes::Byte
     tag.set_artist(meta.artist);
     tag.set_album(meta.album);
 
+    if let Some(album_artist) = meta.album_artist {
+        tag.insert_text(ItemKey::AlbumArtist, album_artist);
+    }
+
+    if let Some(genre) = meta.genre {
+        tag.set_genre(genre);
+    }
+
+    if let Some(year) = meta.year {
+        tag.set_year(year);
+    }
+
+    if let Some(track) = meta.track_number {
+        tag.set_track(track);
+    }
+
+    if let Some(disc) = meta.disc_number {
+        tag.set_disk(disc);
+    }
+
     if let Some(desc) = meta.description {
         tag.set_comment(desc);
     }