From 161cef7fffccebf7ae9c9dad9bd95c77de90d32b Mon Sep 17 00:00:00 2001 From: Bob Mottram <bob@freedombone.net> Date: Thu, 2 Apr 2020 09:02:33 +0000 Subject: [PATCH] flake8 style --- cache.py | 75 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/cache.py b/cache.py index 770e1614..c071b524 100644 --- a/cache.py +++ b/cache.py @@ -1,23 +1,23 @@ -__filename__="cache.py" -__author__="Bob Mottram" -__license__="AGPL3+" -__version__="1.1.0" -__maintainer__="Bob Mottram" -__email__="bob@freedombone.net" -__status__="Production" +__filename__ = "cache.py" +__author__ = "Bob Mottram" +__license__ = "AGPL3+" +__version__ = "1.1.0" +__maintainer__ = "Bob Mottram" +__email__ = "bob@freedombone.net" +__status__ = "Production" import os -import time import datetime from utils import loadJson from utils import saveJson -def storePersonInCache(baseDir: str,personUrl: str, \ - personJson: {},personCache: {}) -> None: + +def storePersonInCache(baseDir: str, personUrl: str, + personJson: {}, personCache: {}) -> None: """Store an actor in the cache """ - currTime=datetime.datetime.utcnow() - personCache[personUrl]={ + currTime = datetime.datetime.utcnow() + personCache[personUrl] = { "actor": personJson, "timestamp": currTime.strftime("%Y-%m-%dT%H:%M:%SZ") } @@ -26,55 +26,60 @@ def storePersonInCache(baseDir: str,personUrl: str, \ # store to file if os.path.isdir(baseDir+'/cache/actors'): - cacheFilename= \ - baseDir+'/cache/actors/'+personUrl.replace('/','#')+'.json' + cacheFilename = baseDir + '/cache/actors/' + \ + personUrl.replace('/', '#')+'.json' if not os.path.isfile(cacheFilename): - saveJson(personJson,cacheFilename) + saveJson(personJson, cacheFilename) -def getPersonFromCache(baseDir: str,personUrl: str,personCache: {}) -> {}: + +def getPersonFromCache(baseDir: str, personUrl: str, personCache: {}) -> {}: """Get an actor from the cache """ # if the actor is not in memory then try to load it from file - loadedFromFile=False + loadedFromFile = False if not personCache.get(personUrl): - cacheFilename=baseDir+'/cache/actors/'+personUrl.replace('/','#')+'.json' + cacheFilename = baseDir + '/cache/actors/' + \ + personUrl.replace('/', '#')+'.json' if os.path.isfile(cacheFilename): - personJson=loadJson(cacheFilename) + personJson = loadJson(cacheFilename) if personJson: - storePersonInCache(baseDir,personUrl,personJson,personCache) - loadedFromFile=True + storePersonInCache(baseDir, personUrl, personJson, personCache) + loadedFromFile = True if personCache.get(personUrl): if not loadedFromFile: # update the timestamp for the last time the actor was retrieved - currTime=datetime.datetime.utcnow() - personCache[personUrl]['timestamp']=currTime.strftime("%Y-%m-%dT%H:%M:%SZ") + currTime = datetime.datetime.utcnow() + currTimeStr = currTime.strftime("%Y-%m-%dT%H:%M:%SZ") + personCache[personUrl]['timestamp'] = currTimeStr return personCache[personUrl]['actor'] return None + def expirePersonCache(personCache: {}): """Expires old entries from the cache in memory """ - currTime=datetime.datetime.utcnow() - removals=[] - for personUrl,cacheJson in personCache.items(): - cacheTime= \ - datetime.datetime.strptime(cacheJson['timestamp'], \ - "%Y-%m-%dT%H:%M:%SZ") - daysSinceCached=(currTime - cacheTime).days + currTime = datetime.datetime.utcnow() + removals = [] + for personUrl, cacheJson in personCache.items(): + cacheTime = datetime.datetime.strptime(cacheJson['timestamp'], + "%Y-%m-%dT%H:%M:%SZ") + daysSinceCached = (currTime - cacheTime).days if daysSinceCached > 2: removals.append(personUrl) - if len(removals)>0: + if len(removals) > 0: for personUrl in removals: del personCache[personUrl] - print(str(len(removals))+' actors were expired from the cache') + print(str(len(removals)) + ' actors were expired from the cache') -def storeWebfingerInCache(handle: str,wf,cachedWebfingers: {}) -> None: + +def storeWebfingerInCache(handle: str, wf, cachedWebfingers: {}) -> None: """Store a webfinger endpoint in the cache """ - cachedWebfingers[handle]=wf + cachedWebfingers[handle] = wf -def getWebfingerFromCache(handle: str,cachedWebfingers: {}) -> {}: + +def getWebfingerFromCache(handle: str, cachedWebfingers: {}) -> {}: """Get webfinger endpoint from the cache """ if cachedWebfingers.get(handle):