author name in stats

iliakan · iliakan · commit ca6903daf2f6 · 2019-04-08T16:48:31.000+03:00
diff --git a/handlers/contributors.js b/handlers/contributors.js
@@ -26,14 +26,15 @@ exports.get = async function (ctx) {
 
   debug('repo', repoName, repo);
 
-  const {files, emailToGithubUser} = Stats.instance().get(repoName).contributors;
+  const {files, emailToGithubUser, emailToName} = Stats.instance().get(repoName).contributors;
 
   let statsByAuthor = Object.create(null);
+  // let authorEmailToName = Object.create(null);
 
   // console.log(files);
 
   for(let file in files) {
-    let fileStats = files[file];
+    let {fileStats} = files[file];
     for (let author in fileStats) {
       statsByAuthor[author] = (statsByAuthor[author] || 0) + fileStats[author];
     }
@@ -90,6 +91,7 @@ exports.get = async function (ctx) {
 
   for (let value of result.values()) {
     value.percent = (value.linesCount / linesTotal * 100).toFixed(2);
+    value.name = emailToName[value.githubEmail];
   }
 
   // console.log(result.entries());
diff --git a/lib/countAuthors.js b/lib/countAuthors.js
@@ -61,9 +61,11 @@ async function countAuthors(repoPath, contributorsCache) {
   })).trim(); // output ends with \n
 
   let statsByAuthor = Object.create(null);
+  let emailToName = Object.create(null);
 
   for(let file in contributorsCache.files) {
-    let fileStats = contributorsCache.files[file];
+    let {fileStats, authorEmailToName} = contributorsCache.files[file];
+    Object.assign(emailToName, authorEmailToName);
     for (let author in fileStats) {
       statsByAuthor[author] = (statsByAuthor[author] || 0) + fileStats[author];
     }
@@ -110,6 +112,7 @@ async function countAuthors(repoPath, contributorsCache) {
   }
 
   contributorsCache.emailToGithubUser = emailToGithubUser;
+  contributorsCache.emailToName = emailToName;
 
   debug(contributorsCache);
 
diff --git a/lib/countFileAuthorStats.js b/lib/countFileAuthorStats.js
@@ -36,12 +36,16 @@ async function countFileAuthorStats(repoPath, filePath) {
 
     if (!commits[hash]) {
       i++;
-      let authorEmail;
+      let authorEmail, authorName;
 
       while(lines[i][0] !== '\t') { // source line starts prefixed by tab
         if (lines[i].startsWith('author-mail ')) {
           authorEmail = lines[i].slice('author-mail <'.length, -1);
         }
+
+        if (lines[i].startsWith('author ')) {
+          authorName = lines[i].slice('author '.length);
+        }
         i++;
       }
 
@@ -54,7 +58,8 @@ async function countFileAuthorStats(repoPath, filePath) {
       // next lines from same commit may be non-empty, but there will be no commit info
       commits[hash] = {
         linesCount: sourceLine ? 1 : 0, // ignore blank lines
-        authorEmail
+        authorEmail,
+        authorName
       };
 
     } else {
@@ -67,21 +72,25 @@ async function countFileAuthorStats(repoPath, filePath) {
     }
 
     assert(commits[hash].authorEmail);
+    assert(commits[hash].authorName);
 
     // some commits may have no lines yet
   }
 
 
+  let fileStats = Object.create(null);
+  let authorEmailToName = Object.create(null);
 
-  let stats = Object.create(null);
   for (let hash in commits) {
     let commit = commits[hash];
     if (!commit.linesCount) continue; // ignore commit with blank lines only
-    stats[commit.authorEmail] = (stats[commit.authorEmail] || 0) + commit.linesCount;
+    authorEmailToName[commit.authorEmail] = commit.authorName;
+    fileStats[commit.authorEmail] = (fileStats[commit.authorEmail] || 0) + commit.linesCount;
   }
 
-  debug(stats);
-  return stats;
+  debug(fileStats);
+
+  return {fileStats, authorEmailToName};
 }
 
 module.exports = countFileAuthorStats;
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "javascript-tutorial-translate-hook",
+  "name": "javascript-tutorial-stats",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "javascript-tutorial-translate-hook",`
	`2`	`+ "name": "javascript-tutorial-stats",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "index.js",`