flake8 style

main
Bob Mottram 2020-04-02 09:02:33 +00:00
parent fa7c457150
commit 161cef7fff
1 changed files with 40 additions and 35 deletions

View File

@ -7,12 +7,12 @@ __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, \
def storePersonInCache(baseDir: str, personUrl: str,
personJson: {}, personCache: {}) -> None:
"""Store an actor in the cache
"""
@ -26,18 +26,20 @@ 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)
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
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)
if personJson:
@ -48,18 +50,19 @@ def getPersonFromCache(baseDir: str,personUrl: str,personCache: {}) -> {}:
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")
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'], \
cacheTime = datetime.datetime.strptime(cacheJson['timestamp'],
"%Y-%m-%dT%H:%M:%SZ")
daysSinceCached = (currTime - cacheTime).days
if daysSinceCached > 2:
@ -69,11 +72,13 @@ def expirePersonCache(personCache: {}):
del personCache[personUrl]
print(str(len(removals)) + ' actors were expired from the cache')
def storeWebfingerInCache(handle: str, wf, cachedWebfingers: {}) -> None:
"""Store a webfinger endpoint in the cache
"""
cachedWebfingers[handle] = wf
def getWebfingerFromCache(handle: str, cachedWebfingers: {}) -> {}:
"""Get webfinger endpoint from the cache
"""