🐞 fix(local): delete library

Signed-off-by: YXL <[email protected]> #974
YXL76 · May 28, 2024 · c076995 · c076995
1 parent 91788db
commit c076995
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/packages/client/src/activate/local.ts b/packages/client/src/activate/local.ts
@@ -15,17 +15,16 @@ export function initLocal(context: ExtensionContext): void {
         await window.showOpenDialog({ canSelectFiles: false, canSelectFolders: true, canSelectMany: false })
       )?.shift()?.fsPath;
       if (!path) return;
-      try {
-        const folders = await LocalProvider.addFolder(path);
-        if (folders) await context.globalState.update(LOCAL_FOLDER_KEY, folders);
-      } catch {}
+      const folders = await LocalProvider.addFolder(path);
+      if (folders) await context.globalState.update(LOCAL_FOLDER_KEY, folders);
     }),
 
     commands.registerCommand("cloudmusic.refreshLocalLibrary", () => LocalProvider.refresh()),
 
-    commands.registerCommand("cloudmusic.deleteLocalLibrary", ({ label }: LocalLibraryTreeItem) =>
-      LocalProvider.deleteFolder(label),
-    ),
+    commands.registerCommand("cloudmusic.deleteLocalLibrary", ({ label }: LocalLibraryTreeItem) => {
+      const folders = LocalProvider.deleteFolder(label);
+      if (folders !== undefined) void context.globalState.update(LOCAL_FOLDER_KEY, folders);
+    }),
 
     commands.registerCommand(
       "cloudmusic.openLocalLibrary",

diff --git a/packages/client/src/treeview/local.ts b/packages/client/src/treeview/local.ts
@@ -37,20 +37,23 @@ export class LocalProvider implements TreeDataProvider<Content> {
   static async addFolder(path: string): Promise<string[] | undefined> {
     if (!this._folders.has(path)) {
       try {
-        await stat(path);
-        this._folders.add(path);
-        this.refresh();
-        return [...this._folders];
+        if ((await stat(path)).isDirectory()) {
+          this._folders.add(path);
+          this.refresh();
+          return [...this._folders];
+        }
       } catch {}
     }
     return;
   }
 
-  static deleteFolder(path: string): void {
+  static deleteFolder(path: string): string[] | undefined {
     if (this._folders.has(path)) {
       this._folders.delete(path);
       this.refresh();
+      return [...this._folders];
     }
+    return;
   }
 
   static refresh(): void {