-
Notifications
You must be signed in to change notification settings - Fork 669
fix: #593 by adding global flag to remove cache #602
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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, globalStateLeetcodeIsUserFresh, IProblem, supportedPlugins } from "./shared"; | ||
import { executeCommand, executeCommandWithProgress } from "./utils/cpUtils"; | ||
import { DialogOptions, openUrl } from "./utils/uiUtils"; | ||
import * as wsl from "./utils/wslUtils"; | ||
|
@@ -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 isUserFresh: boolean | undefined = context.globalState.get(globalStateLeetcodeIsUserFresh); | ||
if (isUserFresh !== false) { | ||
await this.removeOldCache(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Reuse the command we have? https://github.com/LeetCode-OpenSource/vscode-leetcode/blob/master/src/extension.ts#L51 There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @jdneo There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe we need to change the implementation of the command There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 |
||
} | ||
if (this.nodeExecutable !== "node") { | ||
if (!await fse.pathExists(this.nodeExecutable)) { | ||
throw new Error(`The Node.js executable does not exist on path ${this.nodeExecutable}`); | ||
|
@@ -61,9 +67,11 @@ class LeetCodeExecutor implements Disposable { | |
try { // Check plugin | ||
await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "plugin", "-e", plugin]); | ||
} catch (error) { // Download plugin and activate | ||
await this.removeOldCache(); | ||
await this.executeCommandEx(this.nodeExecutable, [await this.getLeetCodeBinaryPath(), "plugin", "-i", plugin]); | ||
} | ||
} | ||
context.globalState.update(globalStateLeetcodeIsUserFresh, false); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In the end of activate() I set it to false, in the first it should be undefined so I use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Then instead of calling it The aim of that is to avoid the two falsy value There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Got it. |
||
return true; | ||
} | ||
|
||
|
@@ -194,6 +202,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(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (!isUserFresh)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jdneo
Seems not the same logic if use if (!isUserFresh)