feat: add pure filename support

archguard · Mar 24, 2022 · 75d9f7f · 75d9f7f
1 parent c1325aa
commit 75d9f7f
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/scan_git/src/main/kotlin/com/thoughtworks/archguard/git/scanner/ScannerService.kt b/scan_git/src/main/kotlin/com/thoughtworks/archguard/git/scanner/ScannerService.kt
@@ -8,10 +8,13 @@ import kotlinx.serialization.json.Json
 import java.io.File
 import java.util.*
 
-class ScannerService(private val gitAdapter: JGitAdapter,
-                     private val bean2Sql: Bean2Sql) {
+class ScannerService(
+    private val gitAdapter: JGitAdapter,
+    private val bean2Sql: Bean2Sql
+) {
 
     var extToLanguage: MutableMap<String, String> = mutableMapOf()
+    var filenameToLanguage: MutableMap<String, String> = mutableMapOf()
 
     fun git2SqlFile(gitPath: String, branch: String, after: String, repoId: String, systemId: Long) {
         setupLanguagesMap()
@@ -44,10 +47,9 @@ class ScannerService(private val gitAdapter: JGitAdapter,
 
             val countFile = File(filepath)
             if (countFile.isFile) {
-                val optLang = extToLanguage[countFile.extension]
-                if (optLang != null) {
+                lang = languageByFile(countFile, lang)
+                if (lang.isNotEmpty()) {
                     lineCounts = LineCounter.byPath(filepath)
-                    lang = optLang.toString()
                 }
             }
 
@@ -63,13 +65,28 @@ class ScannerService(private val gitAdapter: JGitAdapter,
         return pathChanges
     }
 
+    private fun languageByFile(countFile: File, lang: String): String {
+        var lang1 = lang
+        val optLang = extToLanguage[countFile.extension]
+        val optFilenameLang = filenameToLanguage[countFile.name.lowercase()]
+        if (optFilenameLang != null) {
+            lang1 = optFilenameLang.toString()
+        } else if (optLang != null) {
+            lang1 = optLang.toString()
+        }
+        return lang1
+    }
+
     private fun setupLanguagesMap() {
         val fileContent = this.javaClass.classLoader.getResource("languages.json").readText()
         val languages = Json.decodeFromString<Array<Language>>(fileContent)
         languages.forEach { entry ->
             entry.extensions.forEach {
                 extToLanguage[it] = entry.name
             }
+            entry.fileNames?.forEach {
+                filenameToLanguage[it] = entry.name
+            }
         }
     }
 }