improvement in error handling

Tatamo · Tatamo · commit 169fe0d92f9a · 2018-12-02T07:06:02.000+09:00
diff --git a/src/commands.ts b/src/commands.ts
@@ -181,10 +181,8 @@ export async function format(format_string: string, contest_id: string, task_id?
 				console.error(e.toString());
 			}
 		} catch {
-			if (contest === null || tasks === null) {
-				console.error("failed to get contest information.");
-				return;
-			}
+			// TODO: もう少し良いエラーハンドリングができないものか
+			console.error("failed to get contest information.");
 		}
 	}
 }
diff --git a/src/project.ts b/src/project.ts
@@ -140,28 +140,25 @@ export async function validateProjectJSON(data: ContestProject): Promise<[true,
 export async function init(contest_id: string, options: { force?: boolean, contestDirnameFormat?: string }): Promise<ContestProject> {
 	const atcoder = new AtCoder();
 	if (!await atcoder.checkSession()) await atcoder.login();
+	const [contest, tasks] = await Promise.all([atcoder.contest(contest_id), atcoder.tasks(contest_id)]).catch(() => {
+		throw new Error("failed to get contest information.");
+	});
+	const format = options.contestDirnameFormat !== undefined ? options.contestDirnameFormat : (await getConfig()).get("default-contest-dirname-format");
+	const dirname = formatContestDirname(format, contest);
 	try {
-		const [contest, tasks] = await Promise.all([atcoder.contest(contest_id), atcoder.tasks(contest_id)]);
-		const format = options.contestDirnameFormat !== undefined ? options.contestDirnameFormat : (await getConfig()).get("default-contest-dirname-format");
-		const dirname = formatContestDirname(format, contest);
-		try {
-			await promisify(mkdir)(dirname);
-		}
-		catch {
-			// forceオプションがtrueでない場合のみエラーで停止する
-			if (options.force !== true) {
-				throw new Error(`${dirname} file/directory already exists.`)
-			}
-		}
-		process.chdir(dirname);
-		const data = {contest, tasks};
-		await saveProjectJSON(data, process.cwd());
-		console.log(`${dirname}/${PROJECT_JSON_FILE_NAME} created.`);
-		return data;
+		await promisify(mkdir)(dirname);
 	}
 	catch {
-		throw new Error("failed to get contest information.");
+		// forceオプションがtrueでない場合のみエラーで停止する
+		if (options.force !== true) {
+			throw new Error(`${dirname} file/directory already exists.`)
+		}
 	}
+	process.chdir(dirname);
+	const data = {contest, tasks};
+	await saveProjectJSON(data, process.cwd());
+	console.log(`${dirname}/${PROJECT_JSON_FILE_NAME} created.`);
+	return data;
 }
 
 interface DetailedTask {

Original file line number	Diff line number	Diff line change
`@@ -181,10 +181,8 @@ export async function format(format_string: string, contest_id: string, task_id?`
`181`	`181`	`console.error(e.toString());`
`182`	`182`	`}`
`183`	`183`	`} catch {`
`184`		`- if (contest === null \|\| tasks === null) {`
`185`		`- console.error("failed to get contest information.");`
`186`		`- return;`
`187`		`- }`
	`184`	`+ // TODO: もう少し良いエラーハンドリングができないものか`
	`185`	`+ console.error("failed to get contest information.");`
`188`	`186`	`}`
`189`	`187`	`}`
`190`	`188`	`}`