Add a new config: 'outputFolder' to support generate file into a customized folder (LeetCode-OpenSource#123)

ringcrl · jdneo · commit 1cdca10c26fa · 2019-02-16T21:00:40.000+08:00
diff --git a/package.json b/package.json
@@ -247,6 +247,11 @@
                             "leetcode-cn"
                         ],
                         "description": "Endpoint of the user account."
+                    },
+                    "leetcode.outputFolder": {
+                        "type": "string",
+                        "scope": "application",
+                        "description": "Specify the relative path to save the problem files."
                     }
                 }
             }
diff --git a/src/commands/show.ts b/src/commands/show.ts
@@ -2,8 +2,10 @@
 // Licensed under the MIT license.
 
 import * as fse from "fs-extra";
+import * as path from "path";
 import * as vscode from "vscode";
 import { LeetCodeNode } from "../explorer/LeetCodeNode";
+import { leetCodeChannel } from "../leetCodeChannel";
 import { leetCodeExecutor } from "../leetCodeExecutor";
 import { leetCodeManager } from "../leetCodeManager";
 import { IProblem, IQuickItemEx, languages, ProblemState } from "../shared";
@@ -16,15 +18,15 @@ export async function showProblem(node?: LeetCodeNode): Promise<void> {
     if (!node) {
         return;
     }
-    await showProblemInternal(node.id);
+    await showProblemInternal(node);
 }
 
 export async function searchProblem(): Promise<void> {
     if (!leetCodeManager.getUser()) {
         promptForSignIn();
         return;
     }
-    const choice: IQuickItemEx<string> | undefined = await vscode.window.showQuickPick(
+    const choice: IQuickItemEx<IProblem> | undefined = await vscode.window.showQuickPick(
         parseProblemsToPicks(list.listProblems()),
         {
             matchOnDetail: true,
@@ -37,7 +39,7 @@ export async function searchProblem(): Promise<void> {
     await showProblemInternal(choice.value);
 }
 
-async function showProblemInternal(id: string): Promise<void> {
+async function showProblemInternal(node: IProblem): Promise<void> {
     try {
         const leetCodeConfig: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration("leetcode");
         let defaultLanguage: string | undefined = leetCodeConfig.get<string>("defaultLanguage");
@@ -49,9 +51,21 @@ async function showProblemInternal(id: string): Promise<void> {
             return;
         }
 
-        const outDir: string = await selectWorkspaceFolder();
+        let outDir: string = await selectWorkspaceFolder();
+        let relativePath: string = (leetCodeConfig.get<string>("outputFolder") || "").trim();
+        const matchResult: RegExpMatchArray | null = relativePath.match(/\$\{(.*?)\}/);
+        if (matchResult) {
+            const resolvedPath: string | undefined = await resolveRelativePath(matchResult[1].toLocaleLowerCase(), node, language);
+            if (!resolvedPath) {
+                leetCodeChannel.appendLine("Showing problem canceled by user.");
+                return;
+            }
+            relativePath = resolvedPath;
+        }
+
+        outDir = path.join(outDir, relativePath);
         await fse.ensureDir(outDir);
-        const result: string = await leetCodeExecutor.showProblem(id, language, outDir);
+        const result: string = await leetCodeExecutor.showProblem(node.id, language, outDir);
         const reg: RegExp = /\* Source Code:\s*(.*)/;
         const match: RegExpMatchArray | null = result.match(reg);
         if (match && match.length >= 2) {
@@ -76,17 +90,17 @@ async function showProblemInternal(id: string): Promise<void> {
             }
         }
     } catch (error) {
-        await promptForOpenOutputChannel("Failed to fetch the problem information. Please open the output channel for details.", DialogType.error);
+        await promptForOpenOutputChannel("Failed to show the problem. Please open the output channel for details.", DialogType.error);
     }
 }
 
-async function parseProblemsToPicks(p: Promise<IProblem[]>): Promise<Array<IQuickItemEx<string>>> {
-    return new Promise(async (resolve: (res: Array<IQuickItemEx<string>>) => void): Promise<void> => {
-        const picks: Array<IQuickItemEx<string>> = (await p).map((problem: IProblem) => Object.assign({}, {
+async function parseProblemsToPicks(p: Promise<IProblem[]>): Promise<Array<IQuickItemEx<IProblem>>> {
+    return new Promise(async (resolve: (res: Array<IQuickItemEx<IProblem>>) => void): Promise<void> => {
+        const picks: Array<IQuickItemEx<IProblem>> = (await p).map((problem: IProblem) => Object.assign({}, {
             label: `${parseProblemDecorator(problem.state, problem.locked)}${problem.id}.${problem.name}`,
             description: "",
             detail: `AC rate: ${problem.passRate}, Difficulty: ${problem.difficulty}`,
-            value: problem.id,
+            value: problem,
         }));
         resolve(picks);
     });
@@ -102,3 +116,28 @@ function parseProblemDecorator(state: ProblemState, locked: boolean): string {
             return locked ? "$(lock) " : "";
     }
 }
+
+async function resolveRelativePath(value: string, node: IProblem, selectedLanguage: string): Promise<string | undefined> {
+    switch (value) {
+        case "tag":
+            if (node.tags.length === 1) {
+                return node.tags[0];
+            }
+            return await vscode.window.showQuickPick(
+                node.tags,
+                {
+                    matchOnDetail: true,
+                    placeHolder: "Multiple tags available, please select one",
+                    ignoreFocusOut: true,
+                },
+            );
+        case "language":
+            return selectedLanguage;
+        case "difficulty":
+            return node.difficulty;
+        default:
+            const errorMsg: string = `The config '${value}' is not supported.`;
+            leetCodeChannel.appendLine(errorMsg);
+            throw new Error(errorMsg);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -247,6 +247,11 @@`
`247`	`247`	`"leetcode-cn"`
`248`	`248`	`],`
`249`	`249`	`"description": "Endpoint of the user account."`
	`250`	`+ },`
	`251`	`+ "leetcode.outputFolder": {`
	`252`	`+ "type": "string",`
	`253`	`+ "scope": "application",`
	`254`	`+ "description": "Specify the relative path to save the problem files."`
`250`	`255`	`}`
`251`	`256`	`}`
`252`	`257`	`}`