From 0a29bd5655fd5de0cf2dea0b3aff69d22faf6152 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Thu, 30 Sep 2021 15:03:30 -0600
Subject: [PATCH] Remove archive argument from readComponent

---
 src/nat/Lib.kiss                          | 11 +++++------
 src/nat/systems/NameSystem.kiss           |  2 +-
 src/nat/systems/WikipediaImageSystem.kiss |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/nat/Lib.kiss b/src/nat/Lib.kiss
index 2c3ddf1..bd784f3 100644
--- a/src/nat/Lib.kiss
+++ b/src/nat/Lib.kiss
@@ -7,7 +7,7 @@
     `(.exists .components ,e ,(symbolName componentType)))
 
 // Changes to the object returned by (readComponent) will not be saved! Use (withWritableComponents) for making changes
-(defMacro readComponent [archive e componentType]
+(defMacro readComponent [e componentType]
     `(let [componentData (dictGet (the Map<String,String> .components ,e) ,(symbolName componentType))]
         (print (+ "reading " componentData " as " ,(symbolName componentType) " for " .id ,e))
         (the nat.components ,componentType 
@@ -33,7 +33,7 @@
                 (symbol)]
         (doFor [name type] bindingPairs
             (bindingList.push `&mut ,name)
-            (bindingList.push `(readComponent ,archive ,e ,type))
+            (bindingList.push `(readComponent ,e ,type))
             (saveList.push `(dictSet .components ,e ,(symbolName type) (tink.Json.stringify (the nat.components ,type ,name)))))
         `(let [,@bindingList
                 ,retValSymbol {,@body}]
@@ -49,16 +49,15 @@
             ,retValSymbol)))
 
 // Create a system that selects Entries according to a single string component (i.e. Name or Author) matching the given value
-(defMacro stringComponentSystem [archive componentType value process]
+(defMacro stringComponentSystem [componentType value process]
     `(new System
         (lambda [archive :nat.Entry e]
             ?(and (hasComponent e ,componentType)
-                (= ,value (readComponent ,archive e ,componentType))))
+                (= ,value (readComponent e ,componentType))))
         ,process))
 
 (function tagList [archive e]
-    (let [t
-                (readComponent archive e Tags)]
+    (let [t (readComponent e Tags)]
         (collect (t.keys))))
 
 (function tagsMatch [archive e tagsBoolExp]
diff --git a/src/nat/systems/NameSystem.kiss b/src/nat/systems/NameSystem.kiss
index 9e69847..e4d81b4 100644
--- a/src/nat/systems/NameSystem.kiss
+++ b/src/nat/systems/NameSystem.kiss
@@ -6,7 +6,7 @@
 (defNew []
     (super
         ->[archive e] (hasComponent e Name)
-        ->[archive e] (let [name (readComponent archive e Name)]
+        ->[archive e] (let [name (readComponent e Name)]
                              (if (entriesByName.exists (name.toLowerCase))
                                     (.push (dictGet entriesByName (name.toLowerCase)) e)
                                 (dictSet entriesByName (name.toLowerCase) [e]))
diff --git a/src/nat/systems/WikipediaImageSystem.kiss b/src/nat/systems/WikipediaImageSystem.kiss
index ff079b8..e4f3708 100644
--- a/src/nat/systems/WikipediaImageSystem.kiss
+++ b/src/nat/systems/WikipediaImageSystem.kiss
@@ -10,7 +10,7 @@
 // named method in case a user will want to run it on selectedEntries instead of on media entries
 (method scrapeForImages [archive e]
     (let [:String title
-                (readComponent archive e Name)
+                (readComponent e Name)
             :Array<String> wikipediaImageUrls
                 (queryImageUrls (queryImageTitles [title]))]
         (addFiles archive e