From a1be48eeacb55438d8b2437701dd17c4ff7cd303 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Tue, 7 Jul 2015 12:29:25 +0200
Subject: [PATCH] Fix

---
 cli/src/main/scala/coursier/cli/Coursier.scala | 16 ++++++----------
 files/src/main/scala/coursier/Cache.scala      |  8 ++------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/cli/src/main/scala/coursier/cli/Coursier.scala b/cli/src/main/scala/coursier/cli/Coursier.scala
index e6db55133..1c6057c17 100644
--- a/cli/src/main/scala/coursier/cli/Coursier.scala
+++ b/cli/src/main/scala/coursier/cli/Coursier.scala
@@ -121,13 +121,11 @@ case class Coursier(
       repository0
   }
 
-  val existingRepo = cache
-    .list()
-    .map(_._1)
-    .toSet
-  if (repositoryIds.exists(!existingRepo(_))) {
+  val repoMap = cache.map()
+
+  if (repositoryIds.exists(!repoMap.contains(_))) {
     val notFound = repositoryIds
-      .filter(!existingRepo(_))
+      .filter(!repoMap.contains(_))
 
     Console.err.println(
       (if (notFound.lengthCompare(1) == 1) "Repository" else "Repositories") +
@@ -138,10 +136,8 @@ case class Coursier(
     sys.exit(1)
   }
 
-
-  val (repositories0, fileCaches) = cache
-    .list()
-    .map{case (_, repo, cacheEntry) => (repo, cacheEntry)}
+  val (repositories0, fileCaches) = repositoryIds
+    .map(repoMap)
     .unzip
 
   val repositories = repositories0
diff --git a/files/src/main/scala/coursier/Cache.scala b/files/src/main/scala/coursier/Cache.scala
index 8de434f51..df127b3dc 100644
--- a/files/src/main/scala/coursier/Cache.scala
+++ b/files/src/main/scala/coursier/Cache.scala
@@ -129,11 +129,7 @@ case class Cache(cache: File) {
     } else
       Nil
 
-  def files(): Files = {
-    val map0 = map()
-    val default0 = default()
-
-    new Files(default0.map(map0(_)._2), () => ???)
-  }
+  def files(): Files =
+    new Files(list().map{case (_, _, matching) => matching }, () => ???)
 
 }