Made some Git functions prettier

1 files changed, 125 insertions, 138 deletions

diff --git a/api/git.js b/api/git.js
index 8d7fcfe..5c6f0d9 100644
--- a/api/git.js
+++ b/api/git.js
@@ -10,42 +10,36 @@ function addRepoDirSuffix(repo_name)
 	return repo_name;
 }
 
-function getLog(base_dir, repo_name)
+async function getLog(base_dir, repo_name)
 {
-	return new Promise(async (resolve) =>
-	{
-		const repo = await git.Repository.openBare(`${base_dir}/${repo_name}`)
-
-		const walker = git.Revwalk.create(repo);
-		walker.pushHead();
-
-		const raw_commits = await walker.getCommits();
-		
-		const commits = Promise.all(raw_commits.map(async commit => ({
-			commit: commit.sha(),
-			author_full: commit.author().toString(),
-			author_name: commit.author().name(),
-			author_email: commit.author().email(),
-			date: commit.date(),
-			message: commit.message().replace(/\n/g, ""),
-			insertions: (await (await commit.getDiff())[0].getStats()).insertions(),
-			deletions: (await (await commit.getDiff())[0].getStats()).deletions(),
-			files_changed: (await (await commit.getDiff())[0].getStats()).filesChanged()
-		})));		
-
-		resolve(await commits);
-	});
+	const repo = await git.Repository.openBare(`${base_dir}/${repo_name}`)
+
+	const walker = git.Revwalk.create(repo);
+	walker.pushHead();
+
+	const raw_commits = await walker.getCommits();
+	
+	const commits = Promise.all(raw_commits.map(async commit => ({
+		commit: commit.sha(),
+		author_full: commit.author().toString(),
+		author_name: commit.author().name(),
+		author_email: commit.author().email(),
+		date: commit.date(),
+		message: commit.message().replace(/\n/g, ""),
+		insertions: (await (await commit.getDiff())[0].getStats()).insertions(),
+		deletions: (await (await commit.getDiff())[0].getStats()).deletions(),
+		files_changed: (await (await commit.getDiff())[0].getStats()).filesChanged()
+	})));		
+
+	return await commits;
 }
 
-function getTimeSinceLatestCommit(base_dir, repo_name)
+async function getTimeSinceLatestCommit(base_dir, repo_name)
 {
-	return new Promise(async (resolve) =>
-	{
-		const repo = await git.Repository.openBare(`${base_dir}/${repo_name}`)
-		const master_commit = await repo.getMasterCommit();
+	const repo = await git.Repository.openBare(`${base_dir}/${repo_name}`)
+	const master_commit = await repo.getMasterCommit();
 
-		resolve(formatDistance(new Date(), master_commit.date()));
-	});
+	return formatDistance(new Date(), master_commit.date());
 }
 
 function getRepoFile(base_dir, repo, file)
@@ -118,129 +112,122 @@ function parseHunkAddDel(hunk)
 	return { new: new_lines, deleted: deleted_lines, hunk: hunk.join("\n") };
 }
 
-function getCommit(base_dir, repo_name, commit_oid)
+async function getCommit(base_dir, repo_name, commit_oid)
 {
-	return new Promise(async (resolve) =>
-	{
-		repo_name = addRepoDirSuffix(repo_name);
+	repo_name = addRepoDirSuffix(repo_name);
 
-		const repo = await git.Repository.openBare(`${base_dir}/${repo_name}`)
-		const commit = await repo.getCommit(commit_oid);
-		const diff = (await commit.getDiff())[0];
-		const all_patches = (await diff.toBuf(1)).split('\n');
+	const repo = await git.Repository.openBare(`${base_dir}/${repo_name}`)
+	const commit = await repo.getCommit(commit_oid);
+	const diff = (await commit.getDiff())[0];
+	const all_patches = (await diff.toBuf(1)).split('\n');
 
-		// Get the count of lines for all of patches's headers
-		const patch_headers = (await diff.toBuf(2)).split('\n');
-		const patch_header_data = await patch_headers.reduce((acc, line, index) =>
+	// Get the count of lines for all of patches's headers
+	const patch_headers = (await diff.toBuf(2)).split('\n');
+	const patch_header_data = await patch_headers.reduce((acc, line, index) =>
+	{
+		return acc.then((arr) =>
 		{
-			return acc.then((arr) =>
-			{
-				if(/^diff\ --git/.test(line)) {
-					arr[0].push(all_patches.indexOf(line));
-					
-					if(arr[2] != undefined) {
-						arr[1].push(patch_headers.slice(arr[2], index).length);
-					}
-					arr[2] = index;
-				}
-				else if(index == patch_headers.length - 1 && arr[2] != undefined) {
+			if(/^diff --git/.test(line)) {
+				arr[0].push(all_patches.indexOf(line));
+				
+				if(arr[2] != undefined) {
 					arr[1].push(patch_headers.slice(arr[2], index).length);
 				}
-				return arr;
-			});
-		}, Promise.resolve([[], [], undefined]));
-		
-		console.log(patch_header_data);
+				arr[2] = index;
+			}
+			else if(index == patch_headers.length - 1 && arr[2] != undefined) {
+				arr[1].push(patch_headers.slice(arr[2], index).length);
+			}
+			return arr;
+		});
+	}, Promise.resolve([ [], [], undefined ]));
+	
+	console.log(patch_header_data);
 
-		const patches = await diff.patches();
-		const test = patches.reduce((acc, patch, patch_index) =>
+	const patches = await diff.patches();
+	const parsed_patches = patches.reduce((acc, patch, patch_index) =>
+	{
+		return acc.then((arr) =>
 		{
-			return acc.then((arr) =>
+			return patch.hunks().then((hunks) =>
 			{
-				return patch.hunks().then((hunks) =>
-				{
-					console.log("\n" + patch.newFile().path());
+				console.log("\n" + patch.newFile().path());
+				
+				const patch_start = patch_header_data[0][patch_index] + patch_header_data[1][patch_index];
+				const patch_end = (patch_header_data[0][patch_index + 1] !== undefined) ? patch_header_data[0][patch_index + 1] : all_patches.length - 1;
+				const patch_content = all_patches.slice(patch_start, patch_end);
+
+				console.log(patch_content.length);
+				if(patch_content.length > 5000) {
+					console.log("Collapsed!");
 					
-					const patch_start = patch_header_data[0][patch_index] + patch_header_data[1][patch_index];
-					const patch_end = (patch_header_data[0][patch_index + 1] !== undefined) ? patch_header_data[0][patch_index + 1] : all_patches.length - 1;
-					const patch_content = all_patches.slice(patch_start, patch_end);
-
-					console.log(patch_content.length);
-					if(patch_content.length > 5000) {
-						console.log("Collapsed!");
-						
-						arr.push({
-							from: patch.oldFile().path(),
-							to: patch.newFile().path(),
-							additions: patch.lineStats()["total_additions"],
-							deletions: patch.lineStats()["total_deletions"],
-							too_large: true,
-							hunks: null
-						});
-						return arr;
-					}
+					arr.push({
+						from: patch.oldFile().path(),
+						to: patch.newFile().path(),
+						additions: patch.lineStats()["total_additions"],
+						deletions: patch.lineStats()["total_deletions"],
+						too_large: true,
+						hunks: null
+					});
+					return arr;
+				}
 
-					// Go through all of the patch's hunks
-					// Patches are split into parts of where in the file the change is made. Those parts are called hunks.
-					return hunks.reduce((acc, hunk, hunk_index) =>
-					{
-						return acc.then((hunks_data) =>
-						{
-							const hunk_header = hunk.header();
-							const hunk_header_index = patch_content.indexOf(hunk_header.replace(/\n/g, ""));
-
-							if(hunks_data[0] !== undefined) {
-								const prev_hunk = hunks[hunk_index - 1];
-								hunks_data[1].push(Object.assign({
-									new_start: prev_hunk.newStart(),
-									new_lines: prev_hunk.newLines(),
-									old_start: prev_hunk.oldStart(),
-									old_lines: prev_hunk.oldLines(),
-								}, parseHunkAddDel(patch_content.slice(hunks_data[0], hunk_header_index))));
-
-								hunks_data[2] = hunks_data + patch_content.slice(hunks_data[0], hunk_header_index).length;
-							}
-	
-							hunks_data[0] = hunk_header_index;
-							return hunks_data;
-						});
-					}, Promise.resolve([undefined, [], 0])).then((hunks_data) =>
+				// Go through all of the patch's hunks
+				// Patches are split into parts of where in the file the change is made. Those parts are called hunks.
+				return hunks.reduce((acc, hunk, hunk_index) =>
+				{
+					return acc.then((hunks_data) =>
 					{
-						const prev_hunk = hunks[hunks.length - 1];
-						hunks_data[1].push(Object.assign({
-							new_start: prev_hunk.newStart(),
-							new_lines: prev_hunk.newLines(),
-							old_start: prev_hunk.oldStart(),
-							old_lines: prev_hunk.oldLines(),
-						}, parseHunkAddDel(patch_content.slice(hunks_data[0], patch_end))));
-
-						arr.push({
-							from: patch.oldFile().path(),
-							to: patch.newFile().path(),
-							additions: patch.lineStats()["total_additions"],
-							deletions: patch.lineStats()["total_deletions"],
-							too_large: false,
-							hunks: hunks_data[1]
-						});
-
-						return arr;
+						const hunk_header = hunk.header();
+						const hunk_header_index = patch_content.indexOf(hunk_header.replace(/\n/g, ""));
+
+						if(hunks_data[0] !== undefined) {
+							const prev_hunk = hunks[hunk_index - 1];
+							hunks_data[1].push(Object.assign({
+								new_start: prev_hunk.newStart(),
+								new_lines: prev_hunk.newLines(),
+								old_start: prev_hunk.oldStart(),
+								old_lines: prev_hunk.oldLines(),
+							}, parseHunkAddDel(patch_content.slice(hunks_data[0], hunk_header_index))));
+
+							hunks_data[2] = hunks_data + patch_content.slice(hunks_data[0], hunk_header_index).length;
+						}
+
+						hunks_data[0] = hunk_header_index;
+						return hunks_data;
+					});
+				}, Promise.resolve([ undefined, [], 0 ])).then((hunks_data) =>
+				{
+					const prev_hunk = hunks[hunks.length - 1];
+					hunks_data[1].push(Object.assign({
+						new_start: prev_hunk.newStart(),
+						new_lines: prev_hunk.newLines(),
+						old_start: prev_hunk.oldStart(),
+						old_lines: prev_hunk.oldLines(),
+					}, parseHunkAddDel(patch_content.slice(hunks_data[0], patch_end))));
+
+					arr.push({
+						from: patch.oldFile().path(),
+						to: patch.isDeleted() ? "/dev/null" : patch.newFile().path(),
+						additions: patch.lineStats()["total_additions"],
+						deletions: patch.lineStats()["total_deletions"],
+						too_large: false,
+						hunks: hunks_data[1]
 					});
-				});
-			});
-		}, Promise.resolve([]));
 
-		test.then((result) =>
-		{
-			resolve({
-				hash: commit.sha(),
-				author: commit.author().toString(),
-				message: commit.message(),
-				date: commit.date(),
-				patches: result
+					return arr;
+				});
 			});
-			//console.log(result);
 		});
-	});
+	}, Promise.resolve([]));
+
+	return {
+		hash: commit.sha(),
+		author: commit.author().toString(),
+		message: commit.message(),
+		date: commit.date(),
+		patches: await parsed_patches
+	};
 }
 
 module.exports.getLog = getLog;