From ace5cafa6d2a3b4d152347488abac35aed835c86 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 30 Oct 2021 20:23:51 +0100 Subject: [PATCH 1/2] Leading zeroes --- daemon.py | 3 ++- fitnessFunctions.py | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/daemon.py b/daemon.py index 211f801fb..347e895b8 100644 --- a/daemon.py +++ b/daemon.py @@ -11973,7 +11973,8 @@ class PubServer(BaseHTTPRequestHandler): recentCrawlers = 60 * 60 * 24 * 30 for uaStr, item in knownCrawlers.items(): if item['lastseen'] - currTime < recentCrawlers: - crawlersList.append(str(item['hits']) + ' ' + uaStr) + hitsStr = str(item['hits']).zfill(8) + crawlersList.append(hitsStr + ' ' + uaStr) crawlersList.sort(reverse=True) msg = '' for lineStr in crawlersList: diff --git a/fitnessFunctions.py b/fitnessFunctions.py index f3531e7aa..05ea0bf18 100644 --- a/fitnessFunctions.py +++ b/fitnessFunctions.py @@ -58,12 +58,7 @@ def sortedWatchPoints(fitness: {}, fitnessId: str) -> []: if not item.get('total'): continue averageTime = item['total'] * 1000 / item['ctr'] - averageTimeStr = str(averageTime) - threshold = 10 - while threshold < 100000: - if averageTime < threshold: - averageTimeStr = '0' + averageTimeStr - threshold *= 10 + averageTimeStr = str(averageTime).zfill(8) result.append(averageTimeStr + ' ' + watchPoint) result.sort(reverse=True) return result From 2fd250ceec3f1d91ad9b68a78c4d42eb042e8e35 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 30 Oct 2021 20:26:52 +0100 Subject: [PATCH 2/2] Check for type --- utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/utils.py b/utils.py index 72856f336..5ec417ef2 100644 --- a/utils.py +++ b/utils.py @@ -1615,6 +1615,8 @@ def _deleteHashtagsOnPost(baseDir: str, postJsonObject: {}) -> None: # get the id of the post postId = removeIdEnding(postJsonObject['object']['id']) for tag in postJsonObject['object']['tag']: + if not tag.get('type'): + continue if tag['type'] != 'Hashtag': continue if not tag.get('name'):