diff --git a/utils.py b/utils.py index 4a7b16e7c..a4b07ea7f 100644 --- a/utils.py +++ b/utils.py @@ -38,11 +38,16 @@ def getHashtagCategory(baseDir: str, hashtag: str) -> str: return '' -def getHashtagCategories(baseDir: str, category=None) -> None: +def getHashtagCategories(baseDir: str, recent=False, category=None) -> None: """Returns a dictionary containing hashtag categories """ hashtagCategories = {} + if recent: + currTime = datetime.datetime.utcnow() + daysSinceEpoch = (currTime - datetime.datetime(1970, 1, 1)).days + recently = daysSinceEpoch - 1 + for subdir, dirs, files in os.walk(baseDir + '/tags'): for f in files: if not f.endswith('.category'): @@ -62,6 +67,19 @@ def getHashtagCategories(baseDir: str, category=None) -> None: if categoryStr != category: continue + if recent: + tagsFilename = baseDir + '/tags/' + hashtag + '.txt' + if os.path.isfile(tagsFilename): + modTimesinceEpoc = \ + os.path.getmtime(tagsFilename) + lastModifiedDate = \ + datetime.datetime.fromtimestamp(modTimesinceEpoc) + fileDaysSinceEpoch = \ + (lastModifiedDate - + datetime.datetime(1970, 1, 1)).days + if fileDaysSinceEpoch < recently: + continue + if not hashtagCategories.get(categoryStr): hashtagCategories[categoryStr] = [hashtag] else: diff --git a/webapp_hashtagswarm.py b/webapp_hashtagswarm.py index 8fa03b5cb..37e51060a 100644 --- a/webapp_hashtagswarm.py +++ b/webapp_hashtagswarm.py @@ -279,7 +279,7 @@ def htmlSearchHashtagCategory(cssCache: {}, translate: {}, htmlStr += '