From 3d420e1b546c5636e38653cb21d5dc0f4306a30a Mon Sep 17 00:00:00 2001
From: kitsunyan
Date: Sat, 2 Jun 2018 10:08:15 +0300
Subject: Allow to query virtual packages using "-Qdttt"

---
 src/common.nim | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'src/common.nim')

diff --git a/src/common.nim b/src/common.nim
index 8518ded..1749ed7 100644
--- a/src/common.nim
+++ b/src/common.nim
@@ -187,8 +187,10 @@ proc mapAurTargets*[T: RpcPackageInfo](targets: seq[SyncPackageTarget],
         destination: target.destination, foundInfos: target.foundInfos, pkgInfo: none(T)))
 
 proc queryUnrequired*(handle: ptr AlpmHandle, withOptional: bool, withoutOptional: bool,
-  assumeExplicit: HashSet[string]): (HashSet[string], HashSet[string], HashSet[string]) =
-  let (explicit, dependsTable, alternatives) = block:
+  assumeExplicit: HashSet[string]): (seq[PackageReference], HashSet[string], HashSet[string],
+  Table[string, HashSet[PackageReference]]) =
+  let (installed, explicit, dependsTable, alternatives) = block:
+    var installed = newSeq[PackageReference]()
     var explicit = newSeq[string]()
     var dependsTable = initTable[string,
       HashSet[tuple[reference: PackageReference, optional: bool]]]()
@@ -198,7 +200,7 @@ proc queryUnrequired*(handle: ptr AlpmHandle, withOptional: bool, withoutOptiona
       proc fixProvides(reference: PackageReference): PackageReference =
         if reference.constraint.isNone:
           (reference.name, reference.description,
-            some((ConstraintOperation.eq, $pkg.version)))
+            some((ConstraintOperation.eq, $pkg.version, true)))
         else:
           reference
 
@@ -209,6 +211,7 @@ proc queryUnrequired*(handle: ptr AlpmHandle, withOptional: bool, withoutOptiona
       let provides = toSeq(pkg.provides.items)
         .map(d => d.toPackageReference).map(fixProvides).toSet
 
+      installed.add(pkg.toPackageReference)
       if pkg.reason == AlpmReason.explicit:
         explicit &= $pkg.name
       dependsTable.add($pkg.name,
@@ -216,7 +219,7 @@ proc queryUnrequired*(handle: ptr AlpmHandle, withOptional: bool, withoutOptiona
       if provides.len > 0:
         alternatives.add($pkg.name, provides)
 
-    (explicit.toSet + assumeExplicit, dependsTable, alternatives)
+    (installed, explicit.toSet + assumeExplicit, dependsTable, alternatives)
 
   let providedBy = lc[(y, x.key) | (x <- alternatives.namedPairs, y <- x.value),
     tuple[reference: PackageReference, name: string]]
@@ -234,16 +237,16 @@ proc queryUnrequired*(handle: ptr AlpmHandle, withOptional: bool, withoutOptiona
     let checkNext = (direct.map(p => p.name).toSet + indirect) - full
     if checkNext.len > 0: findRequired(withOptional, full, checkNext) else: full
 
-  let installed = toSeq(dependsTable.keys).toSet
+  let installedNames = installed.map(i => i.name).toSet
 
   proc findOrphans(withOptional: bool): HashSet[string] =
     let required = findRequired(withOptional, initSet[string](), explicit)
-    installed - required
+    installedNames - required
 
   let withOptionalSet = if withOptional: findOrphans(true) else: initSet[string]()
   let withoutOptionalSet = if withoutOptional: findOrphans(false) else: initSet[string]()
 
-  (installed, withOptionalSet, withoutOptionalSet)
+  (installed, withOptionalSet, withoutOptionalSet, alternatives)
 
 proc `$`*[T: PackageTarget](target: T): string =
   target.repo.map(proc (r: string): string = r & "/" & $target.reference).get($target.reference)
-- 
cgit v1.2.3-70-g09d2