morelists 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

morelists/__init__.py

@@ -1,9 +1,10 @@
 import time
 
 class GameList():
-    def __init__(self):
-        self.list = {}
-        self.flippedList = {}
+    def __init__(self, list = {}, expirationList = {}, flippedList = {}, freeze = False, deltaTime = 0):
+        self.list = list
+        self.expirationList = expirationList
+        self.flippedList = flippedList
 
         self.addValue = 0
         self.subtractValue = 0
@@ -11,11 +12,23 @@ class GameList():
         self.divideValue = 1
         self.sum = 0
 
+        self.freeze = freeze
+
+        self.history = [(0, {}, {}, {}, 0.0)]
+
+        self.deltaTime = deltaTime
+
+
     def add(self, item, expires = -1):
-        expires += time.time()
+        perf_counter = time.time()
+        if expires != -1:
+            expires += perf_counter
         self.list[expires] = {"name":item.get("name", ""), "type":item.get("type", "add"), "value":item.get("value", 0)}
         if self.list[expires]["type"] not in ["add", "subtract", "multiply", "divide"]:
             self.list[expires]["type"] = "add"
+
+        if expires != -1:
+            self.expirationList[expires] = self.list[expires]
         self.flippedList[str(self.list[expires])] = expires
 
         if item["type"]   == "add":
@@ -25,12 +38,18 @@ class GameList():
         elif item["type"] == "multiply":
             self.multiplyValue += (item["value"] - 1)
         elif item["type"] == "divide":
-            self.divideValue += (item["value"] - 1)
+            self.divideValue += (item["value"] - 1) 
+
+        object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue))
 
     def unsafeAdd(self, item, expires = -1):
-        expiration = expires + time.time()
-        self.list[expiration] = item
-        self.flippedList[str(item)] = expiration
+        perf_counter = time.time()
+        if expires != -1:
+            expires += perf_counter
+        self.list[expires] = item
+        if expires != -1:
+            self.expirationList[expires] = self.list[expires]
+        self.flippedList[str(item)] = expires
     
         if item["type"]   == "add":
             self.addValue += item["value"]
@@ -41,10 +60,30 @@ class GameList():
         elif item["type"] == "divide":
             self.divideValue += (item["value"] - 1)
 
+        object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue))
+            
+
+    def calculateSum(self):
+        self.addValue = 0
+        self.subtractValue = 0
+        self.multiplyValue = 1
+        self.divideValue = 1
+        for item in self.list.values():
+            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)
+            elif item["type"] == "divide":
+                self.divideValue += (item["value"] - 1)
+        return (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue
+
+
 
     def update(self):
         try:
-            expiration = min(self.list.keys())
+            expiration = min(self.expirationList.keys())
             while expiration < time.time():
                 if self.list[expiration]["type"] == "add":
                     self.addValue -= self.list[expiration]["value"]
@@ -54,35 +93,75 @@ class GameList():
                     self.multiplyValue -= (self.list[expiration]["value"] - 1)
                 else:
                     self.divideValue -= (self.list[expiration]["value"] - 1)
+
+                del self.flippedList[str(self.list[expiration])]
                 del self.list[expiration]
 
-                expiration = min(self.list.keys())
+                object.__getattribute__(self, "history").append((expiration, self.list, self.expirationList, self.flippedList, (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue))
+                expiration = min(self.expirationList.keys())
         except ValueError:
             pass
 
+    def pause(self):
+        self.freeze = True
+
+    def resume(self):
+        self.freeze = False
+
+    def updateToPresent(self):
+        pass
+
+    def restoreState(self, t) -> "GameList":
+        self.update()
+        lastItem = None
+        for item in self.history:
+            if item[0] < t:
+                lastItem = item
+
+        if lastItem == None:
+            return GameList()
+        else:
+            return GameList(lastItem[1], lastItem[2], False, time.time() - lastItem[0])
+
+        
+
     def pop(self, name):
+        perf_counter = time.time()
         pops = [value for value in self.list.values() if value["name"] == name]
         pops.sort(key=lambda a: a["expires"])
         if pops:
             del self.list[self.flippedList[str(pops[0])]]
+            if self.flippedList[str(pops[0])] in self.expirationList: del self.expirationList[self.flippedList[str(pops[0])]]
             del self.flippedList[str(pops[0])]
+            self.calculateSum()
+            object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue))
 
     def popAny(self, name):
+        perf_counter = time.time()
         pops = [value for value in self.list.values() if value["name"] == name]
         if pops:
             del self.list[self.flippedList[str(pops[0])]]
+            if self.flippedList[str(pops[0])] in self.expirationList: del self.expirationList[self.flippedList[str(pops[0])]]
             del self.flippedList[str(pops[0])]
+            self.calculateSum()
+            object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue))
 
     def popAll(self, name):
+        perf_counter = time.time()
         pops = [value for value in self.list.values() if value["name"] == name]
         if pops:
             for x in range(len(pops)):
                 del self.list[self.flippedList[str(pops[x])]]
+                if self.flippedList[str(pops[x])] in self.expirationList: del self.expirationList[self.flippedList[str(pops[x])]]
                 del self.flippedList[str(pops[x])]
+                self.calculateSum()
+                object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue))
 
     def remove(self, item):
+        perf_counter = time.time()
         if self.flippedList.get(str(item), None):
             del self.list[self.flippedList[str(item)]]
+            if self.flippedList[str(item)] in self.expirationList: del self.expirationList[self.flippedList[str(item)]]
             del self.flippedList[str(item)]
 
             if item["type"] == "add":
@@ -94,9 +173,13 @@ class GameList():
             else:
                 self.divideValue -= (item["value"] - 1)
 
+            object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue))
+
     def unsafeRemove(self, item):
+        perf_counter = time.time()
         if item in self.list.values():
             del self.list[dict(self.flippedList[str(item)])]
+            if dict(self.flippedList[str(item)]) in self.expirationList: del self.expirationList[dict(self.flippedList[str(item)])]
             del self.flippedList[str(item)]
 
             if item["type"] == "add":
@@ -108,18 +191,23 @@ class GameList():
             else:
                 self.divideValue -= (item["value"] - 1)
 
+            object.__getattribute__(self, "history").append((perf_counter, self.list, self.expirationList, self.flippedList, (self.addValue - self.subtractValue) * self.multiplyValue / self.divideValue))
+
     def __getattribute__(self, name):
         if name == "sum":
-            self.update()
+            if not object.__getattribute__(self, "freeze"):
+                self.update()
             return (object.__getattribute__(self, "addValue") - 
                     object.__getattribute__(self, "subtractValue")) * \
                    object.__getattribute__(self, "multiplyValue") / \
                    object.__getattribute__(self, "divideValue")
-        return object.__getattribute__(self, name)
-        
-
+        elif name == "history":
+            if not object.__getattribute__(self, "freeze"):
+                self.update()
 
 
+        return object.__getattribute__(self, name)
+        
 
 
 

{morelists-0.1.0.dist-info → morelists-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: morelists
-Version: 0.1.0
+Version: 0.1.1
 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
@@ -13,3 +13,4 @@ Requires-Python: >=3.6
 License-File: LICENSE
 Dynamic: author
 Dynamic: home-page
+Dynamic: license-file

morelists-0.1.1.dist-info/RECORD

@@ -0,0 +1,6 @@
+morelists/__init__.py,sha256=2ADwt9v-X0M-agPoRLKfELfbIAzxxcjtSvyL_ltJIeo,9344
+morelists-0.1.1.dist-info/licenses/LICENSE,sha256=-ASFHlrne1rk8zV57Qj01X2JB-D67ZHPMv1PtQhrbN8,32
+morelists-0.1.1.dist-info/METADATA,sha256=2AmxOSbe5kT0sziBKdoebqVI9DCtjqAx4i6A2gSGt8Q,681
+morelists-0.1.1.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+morelists-0.1.1.dist-info/top_level.txt,sha256=Zd7NosYzor-RcH_aD86FXJa3fQzWunYA4_FQS3Yodqo,10
+morelists-0.1.1.dist-info/RECORD,,

{morelists-0.1.0.dist-info → morelists-0.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

morelists-0.1.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-morelists/__init__.py,sha256=MCofk70SKqV9lkk01iBpyYAIFl29vB09RXX4WnOM0UA,4718
-morelists-0.1.0.dist-info/LICENSE,sha256=-ASFHlrne1rk8zV57Qj01X2JB-D67ZHPMv1PtQhrbN8,32
-morelists-0.1.0.dist-info/METADATA,sha256=jq8smAfeCnSeI0uDBOOBJt-44Xa4oI-AY2GWO-H517Q,658
-morelists-0.1.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-morelists-0.1.0.dist-info/top_level.txt,sha256=Zd7NosYzor-RcH_aD86FXJa3fQzWunYA4_FQS3Yodqo,10
-morelists-0.1.0.dist-info/RECORD,,