all

cache.py

@@ -9,19 +9,20 @@ from utils.helperutils import log
 
 cache = {}
 
+
 class Cache():
-    def get(key, notOlderThanHours = 24):
-       #print('get key ' + key)
-       if key in cache:
-           cacheobj = cache[key] 
-           if(not cache):
-               return None
-           if(cacheobj.isOlderThanHours(notOlderThanHours)):
-               log('removing cacheobject ' + key)
-               del cache[key]
-               return None
-           # log( 'returning cacheobject ' + key)
-           return cacheobj.obj
+    def get(key, notOlderThanHours=24):
+        # print('get key ' + key)
+        if key in cache:
+            cacheobj = cache[key]
+            if (not cache):
+                return None
+            if (cacheobj.isOlderThanHours(notOlderThanHours)):
+                log('removing cacheobject ' + key)
+                del cache[key]
+                return None
+            # log( 'returning cacheobject ' + key)
+            return cacheobj.obj
 
     def add(key, obj):
         log('adding cacheobject ' + key)
@@ -33,40 +34,40 @@ class CacheObj:
     def __init__(self, key, obj):
         self.key = key
         self.obj = obj
-        self.time=datetime.now()
-    
+        self.time = datetime.now()
+
     def isOlderThanHours(self, hours):
         # log('checking time cacheobject ' + self.key + ': ' + str(self.time) + " < " + str(datetime.now() - timedelta(hours=hours)))
         return self.time < datetime.now() - timedelta(hours=hours)
-  
-      
+
+
 class FileCache():
-  def get(key, notOlderThanHours = None):
-      
-      filepath = "./filecache/" + key + ".json"
-      cachefile = Path(filepath)
-      if cachefile.is_file():
-        ti_m = os.path.getmtime(filepath)
+    def get(key, notOlderThanHours=None):
 
-        if(notOlderThanHours is not None):
-            #checks last modified age of file, and removes it if it is too old
-            log('checking time cachefile ' + filepath + ': ' + str(ti_m) + " < " + str(time.time() - (3600 * notOlderThanHours)))
+        filepath = "./filecache/" + key + ".json"
+        cachefile = Path(filepath)
+        if cachefile.is_file():
+            ti_m = os.path.getmtime(filepath)
 
-            if( ti_m < time.time() - (3600 * notOlderThanHours)):
-                log('removing old filecache')
-                os.remove(filepath)
-                return None
-        
-        with open(filepath) as json_file:
-          json_data = json.load(json_file)
-          log('returning json data from cachefile: ' + key)
-          return json_data
-        
-      return None
+            if (notOlderThanHours is not None):
+                # checks last modified age of file, and removes it if it is too old
+                log('checking time cachefile ' + filepath + ': ' + str(ti_m) + " < " + str(time.time() - (3600 * notOlderThanHours)))
 
-  def add(key, obj):
+                if (ti_m < time.time() - (3600 * notOlderThanHours)):
+                    log('removing old filecache')
+                    os.remove(filepath)
+                    return None
+
+            with open(filepath) as json_file:
+                json_data = json.load(json_file)
+                log('returning json data from cachefile: ' + key)
+                return json_data
+
+        return None
+
+    def add(key, obj):
         log('adding filecacheobject ' + key)
         json_data = JsonEncoder().encode(obj)
         # json_data = json.dumps(obj, cls=JsonEncoder, indent=2)
         with open("./filecache/" + key + ".json", 'w+') as f:
-          f.write(json_data)
+            f.write(json_data)