Project signer updates

jesperancinha · Aug 29, 2024 · 2d95653 · 2d95653
1 parent baeaa65
commit 2d95653
Show file tree

Hide file tree

Showing 24 changed files with 1,695 additions and 1,579 deletions.
diff --git a/project-signer-quality/Articles.md b/project-signer-quality/Articles.md
diff --git a/project-signer-quality/Build.md b/project-signer-quality/Build.md
diff --git a/project-signer-quality/Content.md b/project-signer-quality/Content.md
diff --git a/project-signer-quality/Coverage.md b/project-signer-quality/Coverage.md
diff --git a/project-signer-quality/Databases.md b/project-signer-quality/Databases.md
diff --git a/project-signer-quality/Deployment.md b/project-signer-quality/Deployment.md
diff --git a/project-signer-quality/E2E.md b/project-signer-quality/E2E.md
diff --git a/project-signer-quality/Enterprise.md b/project-signer-quality/Enterprise.md
diff --git a/project-signer-quality/Frameworks.md b/project-signer-quality/Frameworks.md
diff --git a/project-signer-quality/Info.md b/project-signer-quality/Info.md
diff --git a/project-signer-quality/Performance.md b/project-signer-quality/Performance.md
diff --git a/project-signer-quality/PkgManager.md b/project-signer-quality/PkgManager.md
diff --git a/project-signer-quality/Quality.md b/project-signer-quality/Quality.md
diff --git a/project-signer-quality/Releases.md b/project-signer-quality/Releases.md
diff --git a/project-signer-quality/Servers.md b/project-signer-quality/Servers.md
diff --git a/project-signer-quality/Streaming.md b/project-signer-quality/Streaming.md
diff --git a/project-signer-quality/Tech.md b/project-signer-quality/Tech.md
diff --git a/project-signer-quality/TechJVM.md b/project-signer-quality/TechJVM.md
diff --git a/project-signer-quality/Testing.md b/project-signer-quality/Testing.md
diff --git a/...gner-runnable/src/main/kotlin/org/jesperancinha/parser/projectsigner/model/ProjectData.kt b/...gner-runnable/src/main/kotlin/org/jesperancinha/parser/projectsigner/model/ProjectData.kt
@@ -5,5 +5,8 @@ import org.jesperancinha.parser.markdowner.badges.model.BadgeType
 
 data class ProjectData(
     val title: String,
+    val directory: String?,
     val badgeGroupMap: Map<BadgeType, BadgeGroup>
-)
+) {
+    fun getNormalizedTitle() = if(title.startsWith("[![")) title else (directory ?: title)
+}
diff --git a/...parser/projectsigner/model/SIgnerMatch.kt → ...parser/projectsigner/model/SignerMatch.kt b/...parser/projectsigner/model/SIgnerMatch.kt → ...parser/projectsigner/model/SignerMatch.kt
@@ -2,7 +2,7 @@ package org.jesperancinha.parser.projectsigner.model
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
-data class SIgnerMatch(
+data class SignerMatch(
     @JsonProperty("find")
     val find: String,
     @JsonProperty("replace")

diff --git a/...nable/src/main/kotlin/org/jesperancinha/parser/projectsigner/service/FileWriterService.kt b/...nable/src/main/kotlin/org/jesperancinha/parser/projectsigner/service/FileWriterService.kt
@@ -69,7 +69,7 @@ open class FileWriterService {
                                 return@sortedWith message1.compareTo(message2)
                             }
                         }
-                        return@sortedWith o1.title.compareTo(o2.title)
+                        return@sortedWith o1.getNormalizedTitle().compareTo(o2.getNormalizedTitle())
                     }
                     nBadges2 - nBadges1
                 }
@@ -138,7 +138,7 @@ open class FileWriterService {
                         try {
                             fileWriter.write("|")
                             if (projectData != null) {
-                                fileWriter.write(projectData.title)
+                                fileWriter.write(projectData.getNormalizedTitle())
                             }
                         } catch (e: IOException) {
                             logger.error("Error!", e)

diff --git a/...-runnable/src/main/kotlin/org/jesperancinha/parser/projectsigner/service/ReadmeService.kt b/...-runnable/src/main/kotlin/org/jesperancinha/parser/projectsigner/service/ReadmeService.kt
@@ -5,7 +5,7 @@ import org.apache.commons.io.IOUtils
 import org.jesperancinha.parser.markdowner.badges.parser.BadgeParser
 import org.jesperancinha.parser.markdowner.helper.ReadmeParserHelper
 import org.jesperancinha.parser.markdowner.model.Paragraphs
-import org.jesperancinha.parser.projectsigner.model.SIgnerMatch
+import org.jesperancinha.parser.projectsigner.model.SignerMatch
 import org.jesperancinha.parser.projectsigner.model.SignerPattern
 import org.jesperancinha.parser.projectsigner.model.ProjectData
 import org.slf4j.Logger
@@ -19,6 +19,7 @@ import java.util.*
 import java.util.function.Consumer
 import java.util.regex.Pattern
 import java.util.stream.Collectors
+import kotlin.io.path.name
 import kotlin.system.exitProcess
 
 /**
@@ -59,19 +60,36 @@ open class ReadmeService(
         val lintedText = createLintedText(newText)
         val nonRefText = removeNonRefs(lintedText)
         if (!optionsService.projectSignerOptions?.rootDirectory?.relativize(readmePath).toString().contains("/")) {
-            readme.split("\n".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()[0].replace(
-                "#",
-                ""
-            ).trim().let {
-                ProjectData(
-                    title = it,
-                    badgeGroupMap = BadgeParser.parse(readme)
+            readme.split("\n".toRegex()).dropLastWhile { it.isEmpty() }
+                .toTypedArray()
+                .firstOrNull()
+                ?.replace(
+                    "#",
+                    ""
                 )
-            }.let {
-                allProjectData.add(
-                    it
-                )
-            }
+                ?.trim()?.let {
+                    ProjectData(
+                        title = it,
+                        directory = runCatching {
+                            val toPath =
+                                readmePath.toFile().absoluteFile.relativeTo(File(".").absoluteFile.parentFile.parentFile)
+                                    .toPath()
+                            if (toPath.name == "")
+                                readmePath.subpath(2, 3).name
+                            else
+                                toPath.subpath(1, 2).name
+                        }.getOrElse {
+                            logger.error("ERROR getting title!", it)
+                            null
+                        },
+                        badgeGroupMap = BadgeParser.parse(readme)
+                    )
+                }
+                ?.let {
+                    allProjectData.add(
+                        it
+                    )
+                }
         }
         val techStackTextFiltered =
             techStackService.mutateTechnologiesUsedParagraph(nonRefText.split("\n")[0], readmePath, nonRefText)
@@ -128,8 +146,8 @@ open class ReadmeService(
                     ReadmeService::class.java.getResourceAsStream("/jeorg-lint.json"),
                     StandardCharsets.UTF_8.name()
                 )
-                lintMatches = objectMapper.readValue(jsonLint, Array<SIgnerMatch>::class.java)
-                    .map { lintMatch: SIgnerMatch ->
+                lintMatches = objectMapper.readValue(jsonLint, Array<SignerMatch>::class.java)
+                    .map { lintMatch: SignerMatch ->
                         SignerPattern(
                             find = Pattern.compile(lintMatch.find),
                             replace = lintMatch.replace

diff --git a/...-runnable/src/test/kotlin/org/jesperancinha/parser/projectsigner/model/SignerMatchTest.kt b/...-runnable/src/test/kotlin/org/jesperancinha/parser/projectsigner/model/SignerMatchTest.kt
@@ -39,8 +39,8 @@ internal class SignerMatchTest {
             StandardCharsets.UTF_8
         )
         val lintMatches: List<SignerPattern> =
-            objectMapper.readValue(jsonLint, Array<SIgnerMatch>::class.java)
-                .map { (find, replace): SIgnerMatch ->
+            objectMapper.readValue(jsonLint, Array<SignerMatch>::class.java)
+                .map { (find, replace): SignerMatch ->
                     SignerPattern(
                         find = Pattern.compile(find),
                         replace = replace