update

Author: ccagml

src/childProcessCall/commands/plugin.ts

@@ -50,7 +50,7 @@ class PluginCommand {
   handler = function (argv) {
     session.argv = argv;
 
-    let plugins = myPluginBase.plugins;
+    let all_plugin = myPluginBase.installed;
     const name = argv.name;
 
     // if (argv.install) {
@@ -64,21 +64,22 @@ class PluginCommand {
     //   return;
     // }
 
-    if (name) plugins = plugins.filter(x => x.name === name);
-    if (plugins.length === 0) return log.fatal('Plugin not found!');
-
-    const p = plugins[0];
-    if (p.missing && (argv.enable || argv.disable))
-      return log.fatal('Plugin missing, install it first');
+    if (name) {
+      all_plugin = all_plugin.filter(x => x.name === name);
+    };
+    if (all_plugin.length === 0) {
+      return log.fatal('Plugin not found!');
+    }
 
+    const p = all_plugin[0];
     if (argv.enable) {
       p.enabled = true;
       p.save();
     } else if (argv.disable) {
       p.enabled = false;
       p.save();
     } else if (argv.delete) {
-      p.delete();
+      // p.delete();
       p.save();
       myPluginBase.init();
     } else if (argv.config) {

src/childProcessCall/file.ts

@@ -69,10 +69,6 @@ class File {
     return path.join(this.homeDir(), 'config.json');
   };
 
-  public pluginFile(name) {
-    return path.join(this.codeDir('lib/plugins'), path.basename(name));
-  };
-
   public listCodeDir(dir) {
     dir = this.codeDir(dir);
     return this.list(dir).map(function (f) {
@@ -145,7 +141,7 @@ class File {
   };
 
   public render(tpl, data) {
-    const tplfile = path.join(__dirname, "..", "..", "..", "..", "resources", "templates", tpl + '.tpl');
+    const tplfile = path.join(__dirname, "..", "..", "..", "resources", "templates", tpl + '.tpl');
     let result = _.template(this.data(tplfile).replace(/\r\n/g, '\n'))(data);
     if (this.isWindows()) {
       result = result.replace(/\n/g, '\r\n');

src/childProcessCall/my_plugin_base.ts

@@ -23,11 +23,11 @@ export class MyPluginBase {
   desc;
   enabled;
   deleted;
-  missing;
   builtin;
   deps;
   next;
   plugins: Array<any> = [];
+  installed: Array<MyPluginBase> = [];
   head; // 插件头 是core
   config;
   constructor() {
@@ -37,7 +37,6 @@ export class MyPluginBase {
     const stats = cache.get(helper.KEYS.plugins) || {};
 
     if (this.deleted) delete stats[this.name];
-    else if (this.missing) return;
     else stats[this.name] = this.enabled;
 
     cache.set(helper.KEYS.plugins, stats);
@@ -51,8 +50,8 @@ export class MyPluginBase {
   public base_init(head?) {
     head = head || require('./core').corePlugin;
     const stats = cache.get(helper.KEYS.plugins) || {};
-    let installed: Array<MyPluginBase> = [];
     let file_plugin: Array<any> = file.listCodeDir('plugins');
+    this.installed = [];
     for (let f of file_plugin) {
       const p = f.data;
       if (!p) continue;
@@ -65,19 +64,19 @@ export class MyPluginBase {
           p.enabled = false;
         }
       }
-      installed.push(p);
+      this.installed.push(p);
     }
     // 根据id大小排序, 大的前面
-    installed = underscore.sortBy(installed, x => -x.id);
+    this.installed = underscore.sortBy(this.installed, x => -x.id);
     // 从小的开始init
-    for (let i = installed.length - 1; i >= 0; --i) {
-      const p = installed[i];
+    for (let i = this.installed.length - 1; i >= 0; --i) {
+      const p = this.installed[i];
       if (p.enabled) {
         p.init();
       }
     }
     // 连成链表状
-    this.plugins = installed.filter(x => x.enabled);
+    this.plugins = this.installed.filter(x => x.enabled);
     let last = head;
     for (let p of this.plugins) {
       last.setNext(p);

src/controller/EventController.ts

@@ -8,6 +8,7 @@
  */
 
 import { eventService } from "../service/EventService";
+// 事件的控制器
 class EventContorller {
     /**
      * 监听事件

src/controller/FileButtonController.ts

@@ -9,23 +9,21 @@
 
 
 import { ConfigurationChangeEvent, Disposable, languages, workspace } from "vscode";
-import { fileButtonService, FileButtonService } from "../service/FileButtonService";
-
+import { fileButtonService } from "../service/FileButtonService";
+// 文件按钮的控制器
 class FileButtonController implements Disposable {
-    private internalProvider: FileButtonService;
+
     private registeredProvider: Disposable | undefined;
     private configurationChangeListener: Disposable;
 
     constructor() {
-        this.internalProvider = fileButtonService;
-
         this.configurationChangeListener = workspace.onDidChangeConfiguration((event: ConfigurationChangeEvent) => {
             if (event.affectsConfiguration("leetcode-problem-rating.editor.shortcuts")) {
-                this.internalProvider.refresh();
+                fileButtonService.refresh();
             }
         }, this);
 
-        this.registeredProvider = languages.registerCodeLensProvider({ scheme: "file" }, this.internalProvider);
+        this.registeredProvider = languages.registerCodeLensProvider({ scheme: "file" }, fileButtonService);
     }
 
     public dispose(): void {

src/controller/LoginController.ts

@@ -30,7 +30,7 @@ class LoginContorller {
         picks.push(
             {
                 label: "LeetCode Account",
-                detail: "Use LeetCode account to login (US endpoint is not supported)",
+                detail: "只能登录leetcode.cn",
                 value: "LeetCode",
             },
             {
@@ -157,7 +157,7 @@ class LoginContorller {
             window.showInformationMessage("Successfully signed out.");
             eventService.emit("statusChanged", UserStatus.SignedOut, undefined);
         } catch (error) {
-            promptForOpenOutputChannel(`Failed to signOut. Please open the output channel for details`, DialogType.error);
+            // promptForOpenOutputChannel(`Failed to signOut. Please open the output channel for details`, DialogType.error);
         }
     }
 

src/controller/MainController.ts

@@ -27,14 +27,13 @@ class MainContorller {
         }
     }
 
+    // 初始化上下文
     public initialize(context: ExtensionContext) {
         treeDataService.initialize(context);
     }
 
 
-    /**
-     * name
-     */
+    // 删除缓存
     public async deleteCache() {
         await executeService.deleteCache();
     }

src/extension.ts

@@ -27,14 +27,18 @@ import { loginContorller } from "./controller/LoginController";
 import { getLeetCodeEndpoint } from "./utils/ConfigUtils";
 import { DialogType } from "./model/Model";
 
-
+// 激活插件
 export async function activate(context: ExtensionContext): Promise<void> {
     try {
 
+        // 初始化控制器
+        mainContorller.initialize(context);
+        // 检查node环境
         await mainContorller.checkNodeEnv(context);
+        // 事件监听
         eventController.add_event();
-        mainContorller.initialize(context);
 
+        // 资源管理
         context.subscriptions.push(
             statusBarService,
             logOutput,
@@ -68,7 +72,9 @@ export async function activate(context: ExtensionContext): Promise<void> {
             commands.registerCommand("leetcode.problems.sort", () => treeViewController.switchSortingStrategy()),
         );
 
+        // 设置站点
         await executeService.switchEndpoint(getLeetCodeEndpoint());
+        // 获取登录状态
         await loginContorller.getLoginStatus();
     } catch (error) {
         logOutput.appendLine(error.toString());

src/service/TreeDataService.ts

@@ -51,7 +51,7 @@ export class TreeDataService implements vscode.TreeDataProvider<NodeModel> {
                 collapsibleState: vscode.TreeItemCollapsibleState.None,
                 command: {
                     command: "leetcode.signin",
-                    title: "Sign in to LeetCode",
+                    title: "未登录",
                 },
             };
         }
@@ -80,7 +80,7 @@ export class TreeDataService implements vscode.TreeDataProvider<NodeModel> {
             return [
                 new NodeModel(Object.assign({}, defaultProblem, {
                     id: "notSignIn",
-                    name: "Sign in to LeetCode",
+                    name: "未登录",
                 }), false),
             ];
         }