feat: saving of author names (#156)

* feat: sending of author name

* fix: emailstate

* fix: email add

* fix: author contrustor

Author: anatolystansler

src/main/kotlin/app/hashers/CommitCrawler.kt

@@ -4,6 +4,7 @@
 package app.hashers
 
 import app.Logger
+import app.model.Author
 import app.model.Commit
 import app.model.DiffContent
 import app.model.DiffFile
@@ -49,8 +50,8 @@ object CommitCrawler {
         throw Exception("No remote default or local master branch found")
     }
 
-    fun fetchRehashesAndEmails(git: Git):
-        Pair<LinkedList<String>, HashSet<String>> {
+    fun fetchRehashesAndAuthors(git: Git):
+        Pair<LinkedList<String>, HashSet<Author>> {
         val head: RevCommit = RevWalk(git.repository)
             .parseCommit(getDefaultBranchHead(git))
 
@@ -59,17 +60,31 @@ object CommitCrawler {
 
         val commitsRehashes = LinkedList<String>()
         val emails = hashSetOf<String>()
+        val names = hashMapOf<String, String>()
 
         var commit: RevCommit? = revWalk.next()
         while (commit != null) {
             commitsRehashes.add(DigestUtils.sha256Hex(commit.name))
-            emails.add(commit.authorIdent.emailAddress)
+            val email = commit.authorIdent.emailAddress
+            val name = commit.authorIdent.name
+            if (!emails.contains(email)) {
+                emails.add(email)
+                names.put(email, name)
+            } else {
+                if (name.length > names[email]!!.length) {
+                    names[email] = name
+                }
+            }
+
             commit.disposeBody()
             commit = revWalk.next()
         }
         revWalk.dispose()
 
-        return Pair(commitsRehashes, emails)
+        val authors = emails.map { email -> Author(names[email]!!, email) }
+            .toHashSet()
+
+        return Pair(commitsRehashes, authors)
     }
 
     fun getJGitObservable(git: Git,

src/main/kotlin/app/hashers/RepoHasher.kt

@@ -31,7 +31,7 @@ class RepoHasher(private val localRepo: LocalRepo, private val api: Api,
         Logger.info { "Hashing of repo started" }
         val git = loadGit(localRepo.path)
         try {
-            val (rehashes, emails) = CommitCrawler.fetchRehashesAndEmails(git)
+            val (rehashes, authors) = CommitCrawler.fetchRehashesAndAuthors(git)
 
             localRepo.parseGitConfig(git.repository.config)
             initServerRepo(rehashes.last)
@@ -43,8 +43,9 @@ class RepoHasher(private val localRepo: LocalRepo, private val api: Api,
             postRepoFromServer()
 
             // Send all repo emails for invites.
-            postAuthorsToServer(emails)
+            postAuthorsToServer(authors)
 
+            val emails = authors.map { author -> author.email }.toHashSet()
             val filteredEmails = filterEmails(emails)
 
             // Common error handling for subscribers.
@@ -106,9 +107,10 @@ class RepoHasher(private val localRepo: LocalRepo, private val api: Api,
         Logger.debug { serverRepo.toString() }
     }
 
-    private fun postAuthorsToServer(emails: HashSet<String>) {
-        api.postAuthors(emails.map { email ->
-            Author(email = email, repo = serverRepo)
+    private fun postAuthorsToServer(authors: HashSet<Author>) {
+        api.postAuthors(authors.map { author ->
+            author.repo = serverRepo
+            author
         }).onErrorThrow()
     }
 

src/main/kotlin/app/model/Author.kt

@@ -18,6 +18,7 @@ data class Author(
     @Throws(InvalidParameterException::class)
     constructor(proto: Protos.Author) : this() {
         email = proto.email
+        name = proto.name
         repo = Repo(proto.repoRehash)
     }
 
@@ -29,6 +30,7 @@ data class Author(
     fun getProto(): Protos.Author {
         return Protos.Author.newBuilder()
             .setEmail(email)
+            .setName(name)
             .setRepoRehash(repo.rehash)
             .build()
     }

src/main/kotlin/app/ui/EmailState.kt

@@ -52,8 +52,8 @@ class EmailState constructor(private val context: Context,
                     configEmails.add(email)
                 }
                 // Fetch and save emails from repo for "no-email" warning.
-                val (_, emails) = CommitCrawler.fetchRehashesAndEmails(git)
-                reposEmails.put(repo, emails)
+                val (_, authors) = CommitCrawler.fetchRehashesAndAuthors(git)
+                reposEmails.put(repo, authors.map { it.email }.toHashSet())
             } catch (e: Exception) {
                 Logger.error(e, "Error while parsing repo")
             } finally {

src/main/proto/sourcerer.proto

@@ -75,6 +75,7 @@ message FactGroup {
 // Used to authors for invitational procedures.
 message Author {
     string email = 1;
+    string name = 3;
     string repo_rehash = 2;
 }