Some progress with moving over to sql keyval

titanembeds/database/__init__.py

@@ -1,10 +1,9 @@
 from flask_sqlalchemy import SQLAlchemy
+
 db = SQLAlchemy()
 
 from guilds import Guilds
 from unauthenticated_users import UnauthenticatedUsers
 from unauthenticated_bans import UnauthenticatedBans
 from authenticated_users import AuthenticatedUsers
-from custom_redislite import LimitsRedisLite
-
-from keyvalue_properties import set_keyvalproperty, get_keyvalproperty, getexpir_keyvalproperty, setexpir_keyvalproperty
+from keyvalue_properties import KeyValueProperties, set_keyvalproperty, get_keyvalproperty, getexpir_keyvalproperty, setexpir_keyvalproperty, ifexists_keyvalproperty, delete_keyvalproperty

titanembeds/database/keyvalue_properties.py

@@ -1,5 +1,7 @@
 from titanembeds.database import db
-from datetime import datetime
+from datetime import datetime, timedelta
+from limits.storage import Storage
+import time
 
 def set_keyvalproperty(key, value, expiration=None):
     q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key)
@@ -22,8 +24,10 @@ def getexpir_keyvalproperty(key):
     q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key)
     now = datetime.now()
     if q.count() > 0 and (q.first().expiration is not None and q.first().expiration > now):
-        return q.first().expiration
-    return None
+        print q.first().expiration
+        print datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        return int(q.first().expiration.strftime('%s'))
+    return 0
 
 def setexpir_keyvalproperty(key, expiration=None):
     q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key)
@@ -34,10 +38,20 @@ def setexpir_keyvalproperty(key, expiration=None):
             q.first().expiration = None
         db.session.commit()
 
+def ifexists_keyvalproperty(key):
+    q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key)
+    return q.count() > 0
+
+def delete_keyvalproperty(key):
+    q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key).first()
+    if q:
+        db.session.delete(q)
+        db.session.commit()
+
 class KeyValueProperties(db.Model):
     __tablename__ = "keyvalue_properties"
     id = db.Column(db.Integer, primary_key=True)    # Auto incremented id
-    key = db.Column(db.String(32))                  # Property Key
+    key = db.Column(db.String(255))                 # Property Key
     value = db.Column(db.Text())                    # Property value
     expiration = db.Column(db.TIMESTAMP)            # Suggested Expiration for value (None = no expire) in secs
 
@@ -45,6 +59,38 @@ class KeyValueProperties(db.Model):
         self.key = key
         self.value = value
         if expiration:
-            self.expiration = datetime.datetime.now() + datetime.timedelta(seconds = expiration)
+            self.expiration = datetime.now() + timedelta(seconds = expiration)
         else:
             self.expiration = None
+
+
+class LimitsKeyValueProperties(Storage): # For Python Limits
+    STORAGE_SCHEME = "keyvalprops"
+    def __init__(self, uri, **options):
+        pass
+
+    def check(self):
+        return True
+
+    def get_expiry(self, key):
+        return getexpir_keyvalproperty(key) + time.time()
+
+    def incr(self, key, expiry, elastic_expiry=False):
+        if not ifexists_keyvalproperty(key):
+            set_keyvalproperty(key, 1, expiration=expiry)
+        else:
+            oldexp = getexpir_keyvalproperty(key) - time.time()
+            if oldexp <= 0:
+                delete_keyvalproperty(key)
+                return self.incr(key, expiry, elastic_expiry)
+            set_keyvalproperty(key, int(get_keyvalproperty(key))+1, expiration=int(round(oldexp)))
+        return int(self.get(key))
+
+    def get(self, key):
+        value = get_keyvalproperty(key)
+        if value:
+            return int(value)
+        return 0
+
+    def reset(self):
+        return False