add --no-template option and default-template global config option

Tatamo · Tatamo · commit ede69ed81f30 · 2018-11-23T02:35:18.000+09:00
diff --git a/src/cli/index.ts b/src/cli/index.ts
@@ -15,8 +15,9 @@ commander
 	.option("-f, --force", "ignore existent directories")
 	.option("-d, --contest-dirname-format <format>", "specify the format to name contest directory. defaults to \"{ContestID}\"")
 	.option("-t, --task-dirname-format <format>", "specify the format to name task directories. defaults to \"{tasklabel}\"")
-	.option("--template <name>", "specify the provisioning template")
 	.option("--no-tests", "skip downloading sample cases by using online-judge-tools")
+	.option("--template <name>", "specify the provisioning template")
+	.option("--no-template", "do not use templates, even if specified by global config")
 	.description("create new contest project directory")
 	.on("--help", function () {
 		console.log("");
@@ -36,8 +37,9 @@ commander
 	.option('-c, --choice <choice>', "how to choice tasks to add", /^(inquire|all|none|rest|next)$/i)
 	.option("-f, --force", "ignore existent directories")
 	.option("-t, --task-dirname-format <format>", "specify the format to name task directories. defaults to \"{tasklabel}\"")
-	.option("--template <name>", "specify the provisioning template")
 	.option("--no-tests", "skip downloading sample cases by using online-judge-tools")
+	.option("--template <name>", "specify the provisioning template")
+	.option("--no-template", "do not use templates, even if specified by global config")
 	.description("add new directory for the task in the project directory")
 	.on("--help", function () {
 		console.log("");
diff --git a/src/commands.ts b/src/commands.ts
@@ -317,7 +317,7 @@ function checkValidChoiceOption(choice: any): choice is Choices {
 	return false;
 }
 
-export async function setup(contest_id: string, options: { choice: Choices, force?: boolean, contestDirnameFormat?: string, taskDirnameFormat?: string, template?: string, tests?: boolean }) {
+export async function setup(contest_id: string, options: { choice: Choices, force?: boolean, contestDirnameFormat?: string, taskDirnameFormat?: string, template?: string | boolean, tests?: boolean }) {
 	try {
 		const {contest} = await init(contest_id, options);
 		console.log(`create project of ${contest.title}`);
@@ -327,7 +327,7 @@ export async function setup(contest_id: string, options: { choice: Choices, forc
 	}
 }
 
-export async function add(options: { choice?: Choices | boolean, force?: boolean, taskDirnameFormat?: string, template?: string, tests?: boolean }) {
+export async function add(options: { choice?: Choices | boolean, force?: boolean, taskDirnameFormat?: string, template?: string | boolean, tests?: boolean }) {
 	try {
 		const {path, data} = await findProjectJSON();
 		const {contest, tasks} = data;
@@ -344,9 +344,17 @@ export async function add(options: { choice?: Choices | boolean, force?: boolean
 			}
 			return await selectTasks(tasks, c, options.force);
 		})(options.choice);
-		const template = options.template !== undefined ? (await getTemplate(options.template).catch((e) => {
-			throw new Error(`Failed to load template "${options.template}".\n  ${e}`);
-		})) : undefined;
+		const template = await (async t => {
+			// --no-templateオプションが指定された場合は何も選ばない
+			if (t === false) return undefined;
+			// 未指定の場合はコンフィグよりデフォルト値を取得
+			if (t === undefined || t === true) t = (await getConfig()).get("default-template") as string | undefined;
+			// デフォルト値も指定されていなければ何も選ばない
+			if (t === undefined) return undefined;
+			return await getTemplate(t).catch((e) => {
+				throw new Error(`Failed to load template "${t}".\n  ${e}`);
+			});
+		})(options.template);
 		// 更新があった問題の数を数えておく
 		let count = 0;
 		for (const {index, task} of choices) {
diff --git a/src/config.ts b/src/config.ts
@@ -7,7 +7,8 @@ export const defaults = {
 	["default-contest-dirname-format"]: "{ContestID}",
 	["default-task-dirname-format"]: "{tasklabel}",
 	["default-test-dirname-format"]: "tests",
-	["default-task-choice"]: "inquire"
+	["default-task-choice"]: "inquire",
+	["default-template"]: undefined
 };
 
 /**
