Skip to content

Commit 85be7cd

Browse files
fix(likes): prune spent records from flags.json
Closes #44
1 parent 4616146 commit 85be7cd

2 files changed

Lines changed: 41 additions & 3 deletions

File tree

‎scripts/sync_likes.py‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,17 @@ def _report(gh, todo: list[tuple[str, str, str, str]], flags: dict, now: datetim
202202
flags[key][kind] = _record(kind, agg, now, aggregate=True)
203203

204204

205-
def _merge_flags(flags: dict, before: dict):
206-
"""A mutate for update_json: lay this run's new and changed records over the stored copy.
205+
def _spent(key: str, kind: str, rec: dict, listed: set[str], now: datetime) -> bool:
206+
"""A record nothing reads again: its entry left the list, or it was reviewed and its cooldown has
207+
run out, which _due already treats the same as no record."""
208+
if key not in listed:
209+
return True
210+
reviewed = rec.get("reviewed_at")
211+
return reviewed is not None and now - _parse(reviewed) >= COOLDOWN.get(kind, WEEK)
212+
213+
214+
def _merge_flags(flags: dict, before: dict, listed: set[str], now: datetime):
215+
"""A mutate for update_json: lay this run's new and changed records over the stored copy, then drop spent ones.
207216
208217
Re-read on a 409, so records another writer stored survive, and so do the issue numbers
209218
this run opened: losing one would open the same issue again next hour.
@@ -213,6 +222,13 @@ def mutate(cur):
213222
for kind, r in recs.items():
214223
if before.get(k, {}).get(kind) != r:
215224
cur.setdefault(k, {})[kind] = r
225+
# Only records this run has seen: one another writer added since (rot moving a renamed
226+
# entry's key, say) may belong to a name this run's list doesn't know yet.
227+
for k in list(cur):
228+
cur[k] = {kind: r for kind, r in cur[k].items()
229+
if not (flags.get(k, {}).get(kind) == r and _spent(k, kind, r, listed, now))}
230+
if not cur[k]:
231+
del cur[k]
216232
return cur
217233
return mutate
218234

@@ -330,7 +346,9 @@ def trusted(login):
330346
}
331347

332348
snap_path = f"snapshots/{now:%Y-%m-%d}.json"
333-
flags_write = ("flags.json", _merge_flags(flags, prev_flags or {}), "chore(stats): record Like reviews")
349+
# Every entry, hidden ones included: only a removed entry's records go.
350+
on_list = {normalize_repo(e["repo"]) for e in entries}
351+
flags_write = ("flags.json", _merge_flags(flags, prev_flags or {}, on_list, now), "chore(stats): record Like reviews")
334352

335353
if candidates:
336354
try:

‎scripts/tests/test_likes.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,26 @@ def flags(self, issue=7, reviewed=None, kind="burst"):
394394
rec = {"kind": kind, "issue": issue, "opened_at": iso(NOW - timedelta(days=2)), "reviewed_at": reviewed}
395395
return {"flags.json": {"o/a": {kind: rec}}}
396396

397+
def test_spent_flags_are_pruned(self):
398+
def rec(kind, reviewed):
399+
return {"kind": kind, "issue": 7, "opened_at": iso(NOW - timedelta(days=30)),
400+
"reviewed_at": None if reviewed is None else iso(NOW - reviewed)}
401+
stats = {"flags.json": {
402+
"o/a": {"burst": rec("burst", timedelta(days=2)), "drip": rec("drip", timedelta(days=3))},
403+
"o/b": {"burst": rec("burst", timedelta(hours=2)), "drip": rec("drip", timedelta(days=8))},
404+
"o/gone": {"burst": rec("burst", None)},
405+
}}
406+
w = World([entry("o/a"), entry("o/b", status="hidden")], {"o/a": [node("x")], "o/b": []},
407+
stats=stats, issues=[{"number": 7}])
408+
w.run()
409+
# Past its cooldown, off the list, or both kinds gone: dropped. Inside its cooldown: kept.
410+
self.assertEqual(w.written("flags.json"), {"o/a": {"drip": rec("drip", timedelta(days=3))},
411+
"o/b": {"burst": rec("burst", timedelta(hours=2))}})
412+
# Nothing else is spent, so the next run writes nothing.
413+
w.persist()
414+
w.run()
415+
self.assertIsNone(w.written("flags.json"))
416+
397417
def test_flag_persists_while_issue_open(self):
398418
w = World([entry("o/a")], {"o/a": [node("x")]}, stats=self.flags(), issues=[{"number": 7}])
399419
w.run()

0 commit comments

Comments
 (0)