From: Kyle Bowman <kyle+github@rocketbowman.com>
Date: Mon, 20 Jan 2025 21:50:08 +0000 (-0500)
Subject: change elist.update to merge
X-Git-Url: https://git.rocketbowman.com/?a=commitdiff_plain;h=fda69d16dec0ec652fb09148d17b02fb54d84fe8;p=nom.git

change elist.update to merge
---

diff --git a/src/nom/base.py b/src/nom/base.py
index c8b3c14..831a7bb 100644
--- a/src/nom/base.py
+++ b/src/nom/base.py
@@ -53,7 +53,7 @@ class NomList:
     def __len__(self):
         return len(self.items)
 
-    def update(self, other):
+    def merge(self, other):
         self.items.update(other.items)
     
     def to_stdout(self):
diff --git a/src/nom/main.py b/src/nom/main.py
index c697bb4..d69a441 100644
--- a/src/nom/main.py
+++ b/src/nom/main.py
@@ -19,7 +19,7 @@ def main():
     if args.command == "entry" and args.entry_command == "show":
         elist=EntryList()
         for flitem in feedlist:
-            elist.update(flitem.to_feed().to_entrylist())
+            elist.merge(flitem.to_feed().to_entrylist())
         elist.to_stdout()
     elif args.command == "feed" and args.feed_command == "update":
         feedlist.fetch_feeds(FEED_CACHE)
diff --git a/tests/test_entry.py b/tests/test_entry.py
index a769ead..0317c04 100644
--- a/tests/test_entry.py
+++ b/tests/test_entry.py
@@ -35,9 +35,9 @@ def test_eli_to_from_dict_idempotency(elist_item):
     remade = elist_item.from_dict(elist_item.to_dict()) 
     assert remade == elist_item
 
-def test_elist_update(elist_multi, elist_single):
+def test_elist_merge(elist_multi, elist_single):
     original_length = len(elist_multi)
-    elist_multi.update(elist_single)
+    elist_multi.merge(elist_single)
     assert len(elist_multi) == original_length + 1
 
 def test_elist_addition(elist_multi, elist_single):
diff --git a/tests/test_feed.py b/tests/test_feed.py
index 349276e..f53f01c 100644
--- a/tests/test_feed.py
+++ b/tests/test_feed.py
@@ -16,5 +16,5 @@ def test_flist_from_csv(feedlist):
 def test_to_entrylist(feedlist):
     elist = EntryList()
     for flitem in feedlist:
-        elist.update(flitem.to_feed().to_entrylist())
+        elist.merge(flitem.to_feed().to_entrylist())
     assert len(elist) == 5
\ No newline at end of file