hotfix: 0.2.1

Author: makrusak

README.md

@@ -1,9 +1,9 @@
 
 <h1 style="font-weight:normal">
   <a href="https://sourcerer.io"><img src=https://user-images.githubusercontent.com/20287615/34189346-d426d4c2-e4ef-11e7-9da4-cc76a1ed111d.png alt="Sourcerer Logo", width=50></a>
-    sourcerer.io
+  &nbsp; sourcerer.io
 </h1>
-  An intelligent profile for software engineers
+  An intelligent profile for software engineers. Start with your public GitHub at <a href="https://sourcerer.io/start">https://sourcerer.io/start</a>.
 <br>
 
 What is it?
@@ -22,8 +22,11 @@ news that is relevant to your code, engineers to follow and learn from,
 technology and libraries you should know about, projects
 that could use your help.
 
-Both open source and closed source repos are fine. Sourcerer app does not upload
-source code anywhere, and it never will. The app looks at repos locally on your
+Both open source and closed source repos are fine. The easiest way to get started with open source repos is to go to
+<https://sourcerer.io/start>, and select GitHub. For closed source repos, you can
+ use this Sourcerer app. You will still need an account, which you can get at <https://sourcerer.io/>
+
+Sourcerer app does not upload source code anywhere, and it never will. The app looks at repos locally on your
 machine, and then sends stats to sourcerer.io. The best way to verify is to
 look at the code. [src/main/proto/sourcerer.proto](https://github.com/sourcerer-io/sourcerer-app/blob/develop/src/main/proto/sourcerer.proto)
 is a good start as it describes the client-server protocol.

src/main/kotlin/app/extractors/Extractor.kt

@@ -14,6 +14,7 @@ class Extractor : ExtractorInterface {
         val TYPE_KEYWORD = 3
         val TYPE_SYNTAX = 4
         val SEPARATOR = ">"
+        val RESTRICTED_EXTS = listOf(".min.js")
     }
 
     fun create(extension: String): ExtractorInterface {
@@ -36,6 +37,7 @@ class Extractor : ExtractorInterface {
 
     override fun extract(files: List<DiffFile>): List<CommitStats> {
         return files.groupBy { file -> file.extension }
+            .filter { (extension, _) -> !RESTRICTED_EXTS.contains(extension) }
             .map { (extension, files) -> create(extension).extract(files) }
             .fold(mutableListOf()) { accStats, stats ->
                 accStats.addAll(stats)

src/main/kotlin/app/extractors/JavascriptExtractor.kt

@@ -23,22 +23,19 @@ class JavascriptExtractor : ExtractorInterface {
     }
 
     override fun extractImports(fileContent: List<String>): List<String> {
-        val imports = mutableSetOf<String>()
-
         val splitRegex =
             Regex("""\s+|,|;|:|\*|\n|\(|\)|\\[|]|\{|}|\+|=|\.|>|<|#|@|\$""")
-        val twoOrMoreWordsRegex = Regex("""(".+?\s.+?[^"]*"|'.+?\s.+?[^']*')""")
-        val fileTokens = twoOrMoreWordsRegex.replace(fileContent.joinToString(separator = " ").toLowerCase(), "")
-            .split(splitRegex)
+        val twoOrMoreWordsRegex = Regex("""(".+?\s.+?"|'.+?\s.+?')""")
 
-        imports.addAll(fileTokens.filter { token -> token in LIBRARIES })
+        val line = fileContent.joinToString(separator = " ").toLowerCase()
+        val fileTokens = twoOrMoreWordsRegex.replace(line, "").split(splitRegex)
 
-        return imports.toList()
+        return fileTokens.filter { token -> token in LIBRARIES }.distinct()
     }
 
     override fun getLineLibraries(line: String,
                                   fileLibraries: List<String>): List<String> {
-
-        return super.getLineLibraries(line, fileLibraries, evaluator, LANGUAGE_NAME)
+        return super.getLineLibraries(line, fileLibraries, evaluator,
+            LANGUAGE_NAME)
     }
 }

src/main/kotlin/app/utils/FileHelper.kt

@@ -17,6 +17,8 @@ object FileHelper {
     private val jarPath = getJarPath()
     private val settingsPath = jarPath.resolve(dirName)
 
+    private val specificExts = listOf(".min.js")
+
     fun getPath(name: String, vararg parts: String): Path {
         val path = settingsPath.resolve(Paths.get("", *parts))
         if (Files.notExists(path)) {
@@ -34,7 +36,12 @@ object FileHelper {
     }
 
     fun getFileExtension(path: String): String {
-        val fileName = Paths.get(path).fileName.toString()
+        val fileName = Paths.get(path).fileName.toString().toLowerCase()
+        for (ext in specificExts) {
+            if (fileName.endsWith(ext)) {
+                return ext
+            }
+        }
         return fileName.substringAfterLast(delimiter = '.',
                                            missingDelimiterValue = "")
     }