morelists 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

morelists/__init__.py

@@ -62,7 +62,8 @@ class GameList():
         immortal = True if expires == -1 else False
         perf_counter = time.time()
         expires += perf_counter
-        self.list[expires] = {"name":item.get("name", ""), "type":item.get("type", "add"), "value":item.get("value", 0)}
+        nameExtension = "_" + str(perf_counter)
+        self.list[expires] = {"name":item.get("name", "") + nameExtension, "type":item.get("type", "add"), "value":item.get("value", 0), "nameExtension": nameExtension}
 
 
         if self.list[expires]["type"] not in ["add", "subtract", "multiply", "divide"]:
@@ -74,12 +75,9 @@ class GameList():
             self.list[expires]["value"] = defaultValue
             print(f"[WARNING]: GameList uses the key 'value' to store the value of each item. You seem to have not given it a value. Defaulted to {defaultValue}.") 
 
-        if self.list[expires]["name"] == "":
-            print(f'[WARNING]: GameList uses the key \'name\' to track items. You seem to have not given it a value. This will make it hard to track and pop at a later time (before its expiration date). Defaulted to "".') 
-
         if not immortal:
             self.expirationList[expires] = self.list[expires]
-        self.flippedList[json.dumps(self.list[expires])] = expires
+        self.flippedList[str(self.list[expires])] = expires
 
         if item["type"]   == "add":
             self.addValue += item["value"]
@@ -105,10 +103,13 @@ class GameList():
         immortal = True if expires == -1 else False
         perf_counter = time.time()
         expires += perf_counter
+        nameExtension = "_" + str(perf_counter)
         self.list[expires] = item
+        self.list[expires]["name"] += nameExtension
+        self.list[expires]["nameExtension"] = nameExtension
         if not immortal:
             self.expirationList[expires] = self.list[expires]
-        self.flippedList[json.dumps(item)] = expires
+        self.flippedList[str(item)] = expires
     
         if item["type"]   == "add":
             self.addValue += item["value"]
@@ -169,11 +170,14 @@ class GameList():
                 else:
                     self.divideValue -= (self.list[expiration]["value"] - 1)
 
-                del self.flippedList[json.dumps(self.list[expiration])]
+                del self.flippedList[str(self.list[expiration])]
                 del self.list[expiration]
                 del self.expirationList[expiration]
 
                 object.__getattribute__(self, "history").append((expiration, self.list, self.expirationList, self.flippedList, self.safeSum()))
+
+                if len(self.expirationList.keys()) == 0:
+                    return
                 expiration = min(self.expirationList.keys())
         except ValueError as e:
             print(f"[WARNING]: While updating the list, a new error appeared: {e}")
@@ -252,10 +256,10 @@ class GameList():
         name -- the name you gave the item in the list
         """
         perf_counter = time.time()
-        pops = [(key, value) for key, value in self.list.items() if value["name"] == name]
+        pops = [(key, value) for key, value in self.list.items() if value["name"] == name + value["nameExtension"]]
         pops.sort(key=lambda a: a[0])
         if pops:
-            stringedList = json.dumps(pops[0][1])
+            stringedList = str(pops[0][1])
 
             item = self.list[self.flippedList[stringedList]]
             del self.list[self.flippedList[stringedList]]
@@ -281,9 +285,9 @@ class GameList():
         name -- the name you gave the item in the list
         """
         perf_counter = time.time()
-        pops = [value for value in self.list.values() if value["name"] == name]
+        pops = [value for value in self.list.values() if value["name"] == name + value["nameExtension"]]
         if pops:
-            stringedList = json.dumps(pops[0])
+            stringedList = str(pops[0])
 
             item = self.list[self.flippedList[stringedList]]
             del self.list[self.flippedList[stringedList]]
@@ -309,10 +313,10 @@ class GameList():
         name -- the name you gave the item(s) in the list
         """
         perf_counter = time.time()
-        pops = [value for value in self.list.values() if value["name"] == name]
+        pops = [value for value in self.list.values() if value["name"] == name + value["nameExtension"]]
         if pops:
             for x in range(len(pops)):
-                stringedList = json.dumps(pops[x])
+                stringedList = str(pops[x])
 
 
                 item = self.list[self.flippedList[stringedList]]
@@ -331,57 +335,34 @@ class GameList():
 
             object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, self.safeSum()))
 
-    def remove(self, item):
-        """
-        Removes a specific item from the list (if it exists)
-
-        Keyword arguments:
-        name -- the name you gave the item(s) in the list
-        """
-        perf_counter = time.time()
-        stringedList = json.dumps(item)
-        if self.flippedList.get(stringedList, None):
-            del self.list[self.flippedList[stringedList]]
-            if self.flippedList[stringedList] in self.expirationList: del self.expirationList[self.flippedList[stringedList]]
-            del self.flippedList[stringedList]
-
-            if item["type"] == "add":
-                self.addValue -= item["value"]
-            elif item["type"] == "subtract":
-                self.subtractValue -= item["value"]
-            elif item["type"] == "multiply":
-                self.multiplyValue -= (item["value"] - 1)
-            else:
-                self.divideValue -= (item["value"] - 1)
-
-            object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, self.safeSum()))
-
-    def unsafeRemove(self, item):
+    def remove(self, item: dict):
         """
         Removes a specific item from the list (if it exists)
 
-        More unsafe compared to remove(item), so use only if you know what you are doing!
-
         Keyword arguments:
         name -- the name you gave the item(s) in the list
         """
         perf_counter = time.time()
-        if item in self.list.values():
-            stringedList = json.dumps(item)
-            del self.list[dict(self.flippedList[stringedList])]
-            if dict(self.flippedList[stringedList]) in self.expirationList: del self.expirationList[dict(self.flippedList[stringedList])]
-            del self.flippedList[stringedList]
-
-            if item["type"] == "add":
-                self.addValue -= item["value"]
-            elif item["type"] == "subtract":
-                self.subtractValue -= item["value"]
-            elif item["type"] == "multiply":
-                self.multiplyValue -= (item["value"] - 1)
-            else:
-                self.divideValue -= (item["value"] - 1)
+        if not item.get("name", ""):
+            print("[WARNING]: Removing an item without a name might delete the wrong item! Make sure to give your items a name to remove the risk.")
+
+        for list_key, list_item in self.list.items():
+            if item + list_item["nameExtension"] == list_item["name"]:
+                del self.flippedList[str(list_item)]
+                if self.expirationList.get(list_key, None) == list_item: del self.expirationList[list_key]
+                del self.list[list_key]
+
+                if list_item["type"] == "add":
+                    self.addValue -= list_item["value"]
+                elif list_item["type"] == "subtract":
+                    self.subtractValue -= list_item["value"]
+                elif list_item["type"] == "multiply":
+                    self.multiplyValue -= (list_item["value"] - 1)
+                else:
+                    self.divideValue -= (list_item["value"] - 1)
 
-            object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, self.safeSum()))
+                object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, self.safeSum()))
+                break
 
     def __getattribute__(self, name):
         """

{morelists-0.1.6.dist-info → morelists-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: morelists
-Version: 0.1.6
+Version: 0.1.8
 Summary: A small and easy list you can add together like a math equation and has a expiration date for items. Mostly useful for games with stats from multiple sources. More lists will come soon.
 Home-page: https://github.com/EmanuelNorsk/enlist
 Author: Emanuel Odén Hesselroth

morelists-0.1.8.dist-info/RECORD

@@ -0,0 +1,6 @@
+morelists/__init__.py,sha256=3QOKdfZbYWhQ2PwH0qNh36gf-mQFUw_SdkXWS4uKglw,16272
+morelists-0.1.8.dist-info/licenses/LICENSE,sha256=-ASFHlrne1rk8zV57Qj01X2JB-D67ZHPMv1PtQhrbN8,32
+morelists-0.1.8.dist-info/METADATA,sha256=ULdDN_JhZh3EkFubFVdgqx-l_TOCenoQfH78_5kJF-E,681
+morelists-0.1.8.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+morelists-0.1.8.dist-info/top_level.txt,sha256=Zd7NosYzor-RcH_aD86FXJa3fQzWunYA4_FQS3Yodqo,10
+morelists-0.1.8.dist-info/RECORD,,

morelists-0.1.6.dist-info/RECORD

@@ -1,6 +0,0 @@
-morelists/__init__.py,sha256=Huivier40-MDWRl6Z5KUW4wpitVbEnRQxP1eU6XyKXI,17066
-morelists-0.1.6.dist-info/licenses/LICENSE,sha256=-ASFHlrne1rk8zV57Qj01X2JB-D67ZHPMv1PtQhrbN8,32
-morelists-0.1.6.dist-info/METADATA,sha256=EENJoIr31AYnyAUDbglTcVyUFOBnxScNSoWjJql5LDc,681
-morelists-0.1.6.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-morelists-0.1.6.dist-info/top_level.txt,sha256=Zd7NosYzor-RcH_aD86FXJa3fQzWunYA4_FQS3Yodqo,10
-morelists-0.1.6.dist-info/RECORD,,