Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: #593 by adding global flag to remove cache #602

Merged
merged 3 commits into from
Jul 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { markdownEngine } from "./webview/markdownEngine";

export async function activate(context: vscode.ExtensionContext): Promise<void> {
try {
if (!await leetCodeExecutor.meetRequirements()) {
if (!await leetCodeExecutor.meetRequirements(context)) {
throw new Error("The environment doesn't meet requirements.");
}

Expand Down
25 changes: 21 additions & 4 deletions src/leetCodeExecutor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@

import * as cp from "child_process";
import * as fse from "fs-extra";
import * as os from "os";
import * as path from "path";
import * as requireFromString from "require-from-string";
import { ExtensionContext } from "vscode";
import { ConfigurationChangeEvent, Disposable, MessageItem, window, workspace, WorkspaceConfiguration } from "vscode";
import { Endpoint, IProblem, supportedPlugins } from "./shared";
import { Endpoint, IProblem, leetcodeHasInited, supportedPlugins } from "./shared";
import { executeCommand, executeCommandWithProgress } from "./utils/cpUtils";
import { DialogOptions, openUrl } from "./utils/uiUtils";
import * as wsl from "./utils/wslUtils";
Expand Down Expand Up @@ -34,7 +36,11 @@ class LeetCodeExecutor implements Disposable {
return `"${path.join(this.leetCodeRootPath, "bin", "leetcode")}"`;
}

public async meetRequirements(): Promise<boolean> {
public async meetRequirements(context: ExtensionContext): Promise<boolean> {
const hasInited: boolean | undefined = context.globalState.get(leetcodeHasInited);
if (!hasInited) {
await this.removeOldCache();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems a little different.The command way use leetcode-cli way not delete the whole dir, let me check if it works fine too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jdneo
delete cache only delete the user session but not the plugin.js cache, still have that issue. So I think we can not use it..
image

Copy link
Member

@jdneo jdneo Jul 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we need to change the implementation of the command delete cache. Considering that the current implementation does not clean entirely?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, current one only clean the user info(include session), but we change the delete cache also have one problem beacuse user may have two account one leetcode one leetcode-cn, if we change that. both will clean, but user may only want to clean the current cache.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. So let's keep the implementation. Maybe later we can provide two option in this command. Something like Session and All. Anyway it's not a high priority

}
if (this.nodeExecutable !== "node") {
if (!await fse.pathExists(this.nodeExecutable)) {
throw new Error(`The Node.js executable does not exist on path ${this.nodeExecutable}`);
Expand All @@ -60,10 +66,13 @@ class LeetCodeExecutor implements Disposable {
for (const plugin of supportedPlugins) {
try { // Check plugin
await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "plugin", "-e", plugin]);
} catch (error) { // Download plugin and activate
} catch (error) { // Remove old cache that may cause the error download plugin and activate
await this.removeOldCache();
await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "plugin", "-i", plugin]);
}
}
// Set the global state HasInited true to skip delete old cache after init
context.globalState.update(leetcodeHasInited, true);
return true;
}

Expand All @@ -76,7 +85,7 @@ class LeetCodeExecutor implements Disposable {
}

public async signOut(): Promise<string> {
return await await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "user", "-L"]);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that its an old typo so I changed it too, am I right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

return await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "user", "-L"]);
}

public async listProblems(showLocked: boolean): Promise<string> {
Expand Down Expand Up @@ -194,6 +203,14 @@ class LeetCodeExecutor implements Disposable {
}
return await executeCommandWithProgress(message, command, args, options);
}

private async removeOldCache(): Promise<void> {
const oldPath: string = path.join(os.homedir(), ".lc");
if (await fse.pathExists(oldPath)) {
await fse.remove(oldPath);
}
}

}

export const leetCodeExecutor: LeetCodeExecutor = new LeetCodeExecutor();
2 changes: 2 additions & 0 deletions src/shared.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,5 @@ export enum DescriptionConfiguration {
Both = "Both",
None = "None",
}

export const leetcodeHasInited: string = "leetcode.hasInited";