Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions scripts/sync_likes.py
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,17 @@ def _report(gh, todo: list[tuple[str, str, str, str]], flags: dict, now: datetim
flags[key][kind] = _record(kind, agg, now, aggregate=True)


def _merge_flags(flags: dict, before: dict):
"""A mutate for update_json: lay this run's new and changed records over the stored copy.
def _spent(key: str, kind: str, rec: dict, listed: set[str], now: datetime) -> bool:
"""A record nothing reads again: its entry left the list, or it was reviewed and its cooldown has
run out, which _due already treats the same as no record."""
if key not in listed:
return True
reviewed = rec.get("reviewed_at")
return reviewed is not None and now - _parse(reviewed) >= COOLDOWN.get(kind, WEEK)


def _merge_flags(flags: dict, before: dict, listed: set[str], now: datetime):
"""A mutate for update_json: lay this run's new and changed records over the stored copy, then drop spent ones.

Re-read on a 409, so records another writer stored survive, and so do the issue numbers
this run opened: losing one would open the same issue again next hour.
Expand All @@ -213,6 +222,13 @@ def mutate(cur):
for kind, r in recs.items():
if before.get(k, {}).get(kind) != r:
cur.setdefault(k, {})[kind] = r
# Only records this run has seen: one another writer added since (rot moving a renamed
# entry's key, say) may belong to a name this run's list doesn't know yet.
for k in list(cur):
cur[k] = {kind: r for kind, r in cur[k].items()
if not (flags.get(k, {}).get(kind) == r and _spent(k, kind, r, listed, now))}
if not cur[k]:
del cur[k]
return cur
return mutate

Expand Down Expand Up @@ -330,7 +346,9 @@ def trusted(login):
}

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

if candidates:
try:
Expand Down
20 changes: 20 additions & 0 deletions scripts/tests/test_likes.py
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,26 @@ def flags(self, issue=7, reviewed=None, kind="burst"):
rec = {"kind": kind, "issue": issue, "opened_at": iso(NOW - timedelta(days=2)), "reviewed_at": reviewed}
return {"flags.json": {"o/a": {kind: rec}}}

def test_spent_flags_are_pruned(self):
def rec(kind, reviewed):
return {"kind": kind, "issue": 7, "opened_at": iso(NOW - timedelta(days=30)),
"reviewed_at": None if reviewed is None else iso(NOW - reviewed)}
stats = {"flags.json": {
"o/a": {"burst": rec("burst", timedelta(days=2)), "drip": rec("drip", timedelta(days=3))},
"o/b": {"burst": rec("burst", timedelta(hours=2)), "drip": rec("drip", timedelta(days=8))},
"o/gone": {"burst": rec("burst", None)},
}}
w = World([entry("o/a"), entry("o/b", status="hidden")], {"o/a": [node("x")], "o/b": []},
stats=stats, issues=[{"number": 7}])
w.run()
# Past its cooldown, off the list, or both kinds gone: dropped. Inside its cooldown: kept.
self.assertEqual(w.written("flags.json"), {"o/a": {"drip": rec("drip", timedelta(days=3))},
"o/b": {"burst": rec("burst", timedelta(hours=2))}})
# Nothing else is spent, so the next run writes nothing.
w.persist()
w.run()
self.assertIsNone(w.written("flags.json"))

def test_flag_persists_while_issue_open(self):
w = World([entry("o/a")], {"o/a": [node("x")]}, stats=self.flags(), issues=[{"number": 7}])
w.run()
Expand Down
Loading