mirror of https://github.com/sbt/sbt.git
Cache scaladex lookups
This commit is contained in:
Alexandre Archambault
parent
1380d7a741
commit
f29e74126d
|
|
@ -166,47 +166,69 @@ class Helper(
|
|||
val (scaladexRawDependencies, otherRawDependencies) =
|
||||
rawDependencies.partition(s => s.contains("/") || !s.contains(":"))
|
||||
|
||||
val scaladexModuleVersionConfigs = {
|
||||
val res = scaladexRawDependencies.map { s =>
|
||||
val deps = Scaladex.dependencies(
|
||||
s,
|
||||
"2.11",
|
||||
if (verbosityLevel >= 0) Console.err.println(_) else _ => ()
|
||||
val scaladexModuleVersionConfigs =
|
||||
if (scaladexRawDependencies.isEmpty)
|
||||
Nil
|
||||
else {
|
||||
val logger =
|
||||
if (verbosityLevel >= 0)
|
||||
Some(new TermDisplay(
|
||||
new OutputStreamWriter(System.err),
|
||||
fallbackMode = loggerFallbackMode
|
||||
))
|
||||
else
|
||||
None
|
||||
|
||||
val fetchs = cachePolicies.map(p =>
|
||||
Cache.fetch(cache, p, checksums = Nil, logger = logger, pool = pool, ttl = ttl0)
|
||||
)
|
||||
|
||||
deps.map { modVers =>
|
||||
val m = modVers.groupBy(_._2)
|
||||
if (m.size > 1) {
|
||||
val (keptVer, modVers0) = m.map {
|
||||
case (v, l) =>
|
||||
val ver = coursier.core.Parse.version(v)
|
||||
.getOrElse(???) // FIXME
|
||||
logger.foreach(_.init())
|
||||
|
||||
ver -> l
|
||||
}
|
||||
.maxBy(_._1)
|
||||
val scaladex = Scaladex.cached(fetchs: _*)
|
||||
|
||||
if (verbosityLevel >= 0)
|
||||
Console.err.println(s"Keeping version ${keptVer.repr}")
|
||||
val res = scaladexRawDependencies.map { s =>
|
||||
val deps = scaladex.dependencies(
|
||||
s,
|
||||
"2.11",
|
||||
if (verbosityLevel >= 0) Console.err.println(_) else _ => ()
|
||||
)
|
||||
|
||||
modVers0
|
||||
} else
|
||||
modVers
|
||||
deps.map { modVers =>
|
||||
val m = modVers.groupBy(_._2)
|
||||
if (m.size > 1) {
|
||||
val (keptVer, modVers0) = m.map {
|
||||
case (v, l) =>
|
||||
val ver = coursier.core.Parse.version(v)
|
||||
.getOrElse(???) // FIXME
|
||||
|
||||
ver -> l
|
||||
}
|
||||
.maxBy(_._1)
|
||||
|
||||
if (verbosityLevel >= 0)
|
||||
Console.err.println(s"Keeping version ${keptVer.repr}")
|
||||
|
||||
modVers0
|
||||
} else
|
||||
modVers
|
||||
}
|
||||
}
|
||||
|
||||
logger.foreach(_.stop())
|
||||
|
||||
val errors = res.collect { case -\/(err) => err }
|
||||
|
||||
prematureExitIf(errors.nonEmpty) {
|
||||
s"Error getting scaladex infos:\n" + errors.map(" " + _).mkString("\n")
|
||||
}
|
||||
|
||||
res
|
||||
.collect { case \/-(l) => l }
|
||||
.flatten
|
||||
.map { case (mod, ver) => (mod, ver, None) }
|
||||
}
|
||||
|
||||
val errors = res.collect { case -\/(err) => err }
|
||||
|
||||
prematureExitIf(errors.nonEmpty) {
|
||||
s"Error getting scaladex infos:\n" + errors.map(" " + _).mkString("\n")
|
||||
}
|
||||
|
||||
res
|
||||
.collect { case \/-(l) => l }
|
||||
.flatten
|
||||
.map { case (mod, ver) => (mod, ver, None) }
|
||||
}
|
||||
|
||||
|
||||
val (modVerCfgErrors, moduleVersionConfigs) =
|
||||
Parse.moduleVersionConfigs(otherRawDependencies, scalaVersion)
|
||||
|
|
|
|||
|
|
@ -3,19 +3,17 @@ package coursier.cli.scaladex
|
|||
import java.net.HttpURLConnection
|
||||
import java.nio.charset.StandardCharsets
|
||||
|
||||
import argonaut._
|
||||
import Argonaut._
|
||||
import ArgonautShapeless._
|
||||
import coursier.Module
|
||||
import argonaut._, Argonaut._, ArgonautShapeless._
|
||||
import coursier.core.{ Artifact, Attributes }
|
||||
import coursier.{ Fetch, Module }
|
||||
|
||||
import scalaz.{-\/, \/, \/-}
|
||||
import scalaz.Scalaz.ToEitherOps
|
||||
import scalaz.Scalaz.ToEitherOpsFromEither
|
||||
import scalaz.concurrent.Task
|
||||
|
||||
object Scaladex {
|
||||
|
||||
// quick & dirty API for querying scaladex
|
||||
|
||||
case class SearchResult(
|
||||
/** GitHub organization */
|
||||
organization: String,
|
||||
|
|
@ -25,31 +23,6 @@ object Scaladex {
|
|||
artifacts: List[String] = Nil
|
||||
)
|
||||
|
||||
def search(name: String, target: String, scalaVersion: String): String \/ Seq[SearchResult] = {
|
||||
|
||||
val url = new java.net.URL(
|
||||
// FIXME Escaping
|
||||
s"https://index.scala-lang.org/api/scastie/search?q=$name&target=$target&scalaVersion=$scalaVersion"
|
||||
)
|
||||
|
||||
var conn: HttpURLConnection = null
|
||||
|
||||
val b = try {
|
||||
conn = url.openConnection().asInstanceOf[HttpURLConnection]
|
||||
// FIXME See below
|
||||
// conn.setRequestProperty("Accept", "application/json")
|
||||
|
||||
coursier.Platform.readFullySync(conn.getInputStream)
|
||||
} finally {
|
||||
if (conn != null)
|
||||
conn.disconnect()
|
||||
}
|
||||
|
||||
val s = new String(b, StandardCharsets.UTF_8)
|
||||
|
||||
s.decodeEither[List[SearchResult]].disjunction
|
||||
}
|
||||
|
||||
case class ArtifactInfos(
|
||||
/** Dependency group ID (aka organization) */
|
||||
groupId: String,
|
||||
|
|
@ -59,6 +32,52 @@ object Scaladex {
|
|||
version: String
|
||||
)
|
||||
|
||||
def apply(): Scaladex =
|
||||
Scaladex { url =>
|
||||
var conn: HttpURLConnection = null
|
||||
|
||||
val b = try {
|
||||
conn = new java.net.URL(url).openConnection().asInstanceOf[HttpURLConnection]
|
||||
coursier.Platform.readFullySync(conn.getInputStream)
|
||||
} finally {
|
||||
if (conn != null)
|
||||
conn.disconnect()
|
||||
}
|
||||
|
||||
new String(b, StandardCharsets.UTF_8)
|
||||
}
|
||||
|
||||
def cached(fetch: Fetch.Content[Task]*): Scaladex =
|
||||
Scaladex {
|
||||
url =>
|
||||
def get(fetch: Fetch.Content[Task]) =
|
||||
fetch(
|
||||
Artifact(url, Map(), Map(), Attributes("", ""), changing = true, None)
|
||||
)
|
||||
|
||||
(get(fetch.head) /: fetch.tail)(_ orElse get(_)).run.unsafePerformSync match {
|
||||
case -\/(err) =>
|
||||
throw new Exception(s"Fetching $url: $err")
|
||||
case \/-(s) => s
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO Add F[_] type param, change `fetch` type to `String => EitherT[F, String, String]`, adjust method signatures accordingly, ...
|
||||
case class Scaladex(fetch: String => String) {
|
||||
|
||||
// quick & dirty API for querying scaladex
|
||||
|
||||
def search(name: String, target: String, scalaVersion: String): String \/ Seq[Scaladex.SearchResult] = {
|
||||
|
||||
val s = fetch(
|
||||
// FIXME Escaping
|
||||
s"https://index.scala-lang.org/api/scastie/search?q=$name&target=$target&scalaVersion=$scalaVersion"
|
||||
)
|
||||
|
||||
s.decodeEither[List[Scaladex.SearchResult]].disjunction
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param organization: GitHub organization
|
||||
|
|
@ -66,29 +85,14 @@ object Scaladex {
|
|||
* @param artifactName: Scaladex artifact name
|
||||
* @return
|
||||
*/
|
||||
def artifactInfos(organization: String, repository: String, artifactName: String): String \/ ArtifactInfos = {
|
||||
def artifactInfos(organization: String, repository: String, artifactName: String): String \/ Scaladex.ArtifactInfos = {
|
||||
|
||||
val url = new java.net.URL(
|
||||
val s = fetch(
|
||||
// FIXME Escaping
|
||||
s"https://index.scala-lang.org/api/scastie/project?organization=$organization&repository=$repository&artifact=$artifactName"
|
||||
)
|
||||
|
||||
var conn: HttpURLConnection = null
|
||||
|
||||
val b = try {
|
||||
conn = url.openConnection().asInstanceOf[HttpURLConnection]
|
||||
// FIXME See below
|
||||
// conn.setRequestProperty("Accept", "application/json")
|
||||
|
||||
coursier.Platform.readFullySync(conn.getInputStream)
|
||||
} finally {
|
||||
if (conn != null)
|
||||
conn.disconnect()
|
||||
}
|
||||
|
||||
val s = new String(b, StandardCharsets.UTF_8)
|
||||
|
||||
s.decodeEither[ArtifactInfos].disjunction
|
||||
s.decodeEither[Scaladex.ArtifactInfos].disjunction
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -99,26 +103,11 @@ object Scaladex {
|
|||
*/
|
||||
def artifactNames(organization: String, repository: String): String \/ Seq[String] = {
|
||||
|
||||
val url = new java.net.URL(
|
||||
val s = fetch(
|
||||
// FIXME Escaping
|
||||
s"https://index.scala-lang.org/api/scastie/project?organization=$organization&repository=$repository"
|
||||
)
|
||||
|
||||
var conn: HttpURLConnection = null
|
||||
|
||||
val b = try {
|
||||
conn = url.openConnection().asInstanceOf[HttpURLConnection]
|
||||
// FIXME report to scaladex, it should accept that (it currently returns JSON as text/plain)
|
||||
// conn.setRequestProperty("Accept", "application/json")
|
||||
|
||||
coursier.Platform.readFullySync(conn.getInputStream)
|
||||
} finally {
|
||||
if (conn != null)
|
||||
conn.disconnect()
|
||||
}
|
||||
|
||||
val s = new String(b, StandardCharsets.UTF_8)
|
||||
|
||||
case class Result(artifacts: List[String])
|
||||
|
||||
s.decodeEither[Result].disjunction.map(_.artifacts)
|
||||
|
|
|
|||
Loading…
Reference in New Issue