feat: add stats extractors, add commit diff calculation, add contribu… #12
Conversation
…tors hashing filter
src/main/kotlin/app/Main.kt
Outdated
| if (!Configurator.isFirstLaunch()) { | ||
| println("Are you sure that you want to setup Sourcerer again? [y/n]") | ||
| if ((readLine() ?: "").toLowerCase() == "y") { | ||
| if(UiHelper.confirm("Are you sure that you want to setup Sourcerer " |
src/main/kotlin/app/RepoHasher.kt
Outdated
| .find { it.rehash == repo.rehash } != null | ||
| } | ||
|
|
||
| private fun findFirstOverlapCommit(): Commit? { |
| private fun findFirstOverlapCommit(): Commit? { | ||
| val serverHistoryCommits = repo.commits.toHashSet() | ||
| return getObservableCommits() | ||
| .skipWhile { commit -> !serverHistoryCommits.contains(commit) } |
| .pairWithNext() // Pair commits to get diff. | ||
| .takeWhile { (new, _) -> // Hash until last requested commit. | ||
| new.rehash != lastKnownCommit?.rehash } | ||
| .filter { (new, _) -> knownCommits.isEmpty() // Don't hash known. |
There was a problem hiding this comment.
Pet peeve: can you move || to the prev line? This helps the flow a little.
There was a problem hiding this comment.
Convention of wrapping lines before non-assignment operators are used. Moving || will break consistency.
src/main/kotlin/app/RepoHasher.kt
Outdated
| .filter { (new, _) -> knownCommits.isEmpty() // Don't hash known. | ||
| || !knownCommits.contains(new) } | ||
| .filter { (new, _) -> emailFilter(new) } // Email filtering. | ||
| .map { (new, old) -> // Mapping and stats extracting. |
src/main/kotlin/app/RepoHasher.kt
Outdated
| val diffContents = getDiffContents(new, old) | ||
| Logger.debug("Commit: ${new.raw?.name ?: ""}: " | ||
| + new.raw?.shortMessage) | ||
| Logger.debug("Diff: " + diffContents.joinToString("\n")) |
There was a problem hiding this comment.
any chance this will affect performance? even if log level is above debug, it will do the string contact operation for all diffs.
There was a problem hiding this comment.
Probably yes. I'll leave printing of only first entry.
| class JavaExtractor : ExtractorInterface { | ||
| val NAME = "Java" | ||
|
|
||
| val KEYWORDS = listOf("abstract", "continue", "for", "new", "switch", |
There was a problem hiding this comment.
Ummm... why are you doing this? We did not make a product decision to parse out keywords. We discussed it as one of several ideas, and while it'a neat idea, we need to have Ryan's buy-in for this.
There was a problem hiding this comment.
It's more for testing purposes. It isn't accurate and it was easiest feature to implement for more complex stats than just language stats.
| * Per file diff from commit. | ||
| */ | ||
| data class DiffContent( | ||
| var path: Path = Paths.get(""), |
There was a problem hiding this comment.
I think it's fine for now, but in future, we will need to track more info so that extractors could make better decisions. For instance, antlr will need an entire file to parse out, so the extractor will need line numbers that we were added or deleted, not the lines themselves.
| object FileHelper { | ||
| fun getFileExtension(path: Path): String { | ||
| val fileName = path.fileName.toString() | ||
| return fileName.substringAfterLast( |
There was a problem hiding this comment.
Hard to believe there isn't a standard java library that does that.
There was a problem hiding this comment.
For me too. I could add apache commons io for this simple function, but it looks like overkill.
| package app.utils | ||
|
|
||
| object UiHelper { | ||
| fun confirm(message: String): Boolean { |
There was a problem hiding this comment.
It's usually a nice idea to require precisely 'y' or 'n', and if the input is something else, it makes sense to repeat the question. An alternative is to have a default (configurable through the call to UIHelper.confirm) that will capitalize the default choice e.g. "y/N"
…g logging, fix stylistics
| fun confirm(message: String): Boolean { | ||
| println("$message [y/n]") | ||
| return (readLine() ?: "").toLowerCase() == "y" | ||
| fun confirm(message: String, default: Boolean): Boolean { |
There was a problem hiding this comment.
make it explicit: defaultIsYes
| println("$message [y/n]") | ||
| return (readLine() ?: "").toLowerCase() == "y" | ||
| fun confirm(message: String, default: Boolean): Boolean { | ||
| val yes = "y" |
There was a problem hiding this comment.
This could be simplified to:
val yes = "Y" if defaultIsYes else "y";
val no = "N" if !defaultIsYes else "n";
println("$message [$yes/$no]);
…tors hashing filter (APP-5, APP-6)