Fix indexing sbt 2 plugin from ref

scalacenter · Jan 3, 2025 · 9ad37b5 · 9ad37b5
1 parent 4ab0e97
commit 9ad37b5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/modules/infra/src/main/scala/scaladex/infra/MavenCentralClientImpl.scala b/modules/infra/src/main/scala/scaladex/infra/MavenCentralClientImpl.scala
@@ -76,9 +76,10 @@ class MavenCentralClientImpl()(implicit val system: ActorSystem)
   }
 
   override def getPomFile(ref: Artifact.Reference): Future[Option[(String, Instant)]] = {
+    val pomUri = getPomUri(ref)
     val future = for {
-      response <- getHttpResponse(ref)
-      res <- getPomFileWithLastModifiedTime(response)
+      response <- queueRequest(HttpRequest(uri = pomUri))
+      res <- getPomFileWithLastModifiedTime(response, pomUri)
     } yield res
     future.recoverWith {
       case NonFatal(exception) =>
@@ -87,22 +88,22 @@ class MavenCentralClientImpl()(implicit val system: ActorSystem)
     }
   }
 
-  private def getPomFileWithLastModifiedTime(response: HttpResponse): Future[Option[(String, Instant)]] =
+  private def getPomFileWithLastModifiedTime(response: HttpResponse, uri: String): Future[Option[(String, Instant)]] =
     response match {
       case _ @HttpResponse(StatusCodes.OK, headers: Seq[model.HttpHeader], entity, _) =>
         val lastModified = headers.find(_.is("last-modified")).map(header => parseDate(header.value))
         Unmarshaller
           .stringUnmarshaller(entity)
           .map(page => lastModified.map(page -> _))
-      case _ => Future.successful(None)
+      case _ =>
+        logger.warn(s"Cannot get $uri: ${response.status}")
+        Future.successful(None)
     }
 
-  private def getHttpResponse(ref: Artifact.Reference): Future[HttpResponse] = {
+  private def getPomUri(ref: Artifact.Reference): String = {
     val groupIdUrl: String = ref.groupId.value.replace('.', '/')
-    val pomUrl = getPomFileName(ref.artifactId, ref.version)
-    val uri = s"$baseUri/${groupIdUrl}/${ref.artifactId.value}/${ref.version.value}/$pomUrl"
-    val request = HttpRequest(uri = uri)
-    queueRequest(request)
+    val pomFileName = getPomFileName(ref.artifactId, ref.version)
+    s"$baseUri/${groupIdUrl}/${ref.artifactId.value}/${ref.version.value}/$pomFileName"
   }
 
   // Wed, 04 Nov 2020 23:36:02 GMT
@@ -111,7 +112,7 @@ class MavenCentralClientImpl()(implicit val system: ActorSystem)
 
   private def getPomFileName(artifactId: Artifact.ArtifactId, version: Version): String =
     artifactId.binaryVersion.platform match {
-      case SbtPlugin(_) => s"${artifactId.name.value}-${version.value}.pom"
-      case _            => s"${artifactId.value}-${version.value}.pom"
+      case SbtPlugin(Version.Major(1) | Version.Minor(0, 13)) => s"${artifactId.name.value}-${version.value}.pom"
+      case _                                                  => s"${artifactId.value}-${version.value}.pom"
     }
 }
diff --git a/modules/server/src/main/scala/scaladex/server/service/MavenCentralService.scala b/modules/server/src/main/scala/scaladex/server/service/MavenCentralService.scala
@@ -44,7 +44,7 @@ class MavenCentralService(
       missingVersions = versions.map(Artifact.Reference(groupId, artifactId, _)).filterNot(knownRefs)
       _ = if (missingVersions.nonEmpty)
         logger.warn(s"${missingVersions.size} artifacts are missing for ${groupId.value}:${artifactId.value}")
-      missingPomFiles <- missingVersions.map(ref => mavenCentralClient.getPomFile(ref).map(_.map(ref -> _))).sequence
+      missingPomFiles <- missingVersions.mapSync(ref => mavenCentralClient.getPomFile(ref).map(_.map(ref -> _)))
       publishResult <- missingPomFiles.flatten.mapSync {
         case (mavenRef, (pomFile, creationDate)) =>
           publishProcess.publishPom(mavenRef.toString(), pomFile, creationDate, None)