Merge pull request #10507 from pikinier20/blog-links

Scala3doc: Adjust generated links for blogs to avoid 404 errors

Author: romanowski

scala3doc/src/dotty/dokka/site/StaticSiteLocationProvider.scala

@@ -10,6 +10,8 @@ import org.jetbrains.dokka.pages.RootPageNode
 import org.jetbrains.dokka.plugability.DokkaContext
 
 import scala.collection.JavaConverters._
+import java.nio.file.Paths
+import java.nio.file.Path
 
 class StaticSiteLocationProviderFactory(private val ctx: DokkaContext) extends LocationProviderFactory:
   override def getLocationProvider(pageNode: RootPageNode): LocationProvider =
@@ -24,11 +26,23 @@ class StaticSiteLocationProvider(ctx: DokkaContext, pageNode: RootPageNode)
             val rawFilePath = context.root.toPath.relativize(page.template.file.toPath)
             val pageName = page.template.file.getName
             val dotIndex = pageName.lastIndexOf('.')
-            val newPath =
-              if (dotIndex < 0) rawFilePath.resolve("index")
-              else rawFilePath.resolveSibling(pageName.substring(0, dotIndex))
 
-            newPath.iterator.asScala.map(_.toString).toList.asJava
+            if (isBlogPostPath(rawFilePath)) {
+              val regex = raw"(\d*)-(\d*)-(\d*)-(.*)\..*".r
+              val blogPostPath = pageName.toString match {
+                case regex(year, month, day, name) =>
+                  rawFilePath.getParent.resolveSibling(Paths.get(year, month, day, name))
+                case _ =>
+                  println(s"Blog file at path: $rawFilePath doesn't match desired format.")
+                  rawFilePath.resolveSibling(pageName.substring(0, dotIndex))
+              }
+              blogPostPath.iterator.asScala.map(_.toString).toList.asJava
+            } else {
+              val newPath =
+                if (dotIndex < 0) rawFilePath.resolve("index")
+                else rawFilePath.resolveSibling(pageName.substring(0, dotIndex))
+              newPath.iterator.asScala.map(_.toString).toList.asJava
+            }
           }
 
         case page: ContentPage if page.getDri.contains(docsDRI) =>
@@ -43,6 +57,8 @@ class StaticSiteLocationProvider(ctx: DokkaContext, pageNode: RootPageNode)
         case _ =>
           jpath
 
+    private def isBlogPostPath(path: Path): Boolean = path.startsWith(Paths.get("blog","_posts"))
+
     override val getPathsIndex: JMap[PageNode, JList[String]] =
       super.getPathsIndex.asScala.mapValuesInPlace(updatePageEntry).asJava