Skip to content

Commit 3fa95be

Browse files
committed
feat: support thousands separator
1 parent 709bb2d commit 3fa95be

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

cogs/regex.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ def decode_exclusions(text: str) -> str:
4040

4141

4242
regex_pattern = re.compile(
43-
r"^#\d+ - | [=\-·\|💞🚫] .*|[\u200b❌⭐🔐✅]| \d+ ka|\(Soulkeys: \d+\)| \(#[\da-f]{6}\)|Top 1\d value: \d+|"
44-
r"AVG: \d+|<?:kakera:(\d+)?>?|Total value: \d+|\d+ \$wa, \d+ \$ha, \d+ \$wg, \d+ \$hg|^.+ - \d+\/\d+",
43+
r"^#\d{1,3}([., ]?\d{3})* - | [=\-·\|💞🚫] .*|[\u200b❌⭐🔐✅]| \d{1,3}([., ]?\d{3})* ka"
44+
r"|\(Soulkeys: \d{1,3}([., ]?\d{3})*\)| \(#[\da-f]{6}\)|Top 1\d value: \d{1,3}([., ]?\d{3})*|AVG: \d{1,3}([., ]?\d{3})*"
45+
r"|<?:kakera:(\d+)?>?|Total value: \d{1,3}([., ]?\d{3})*|\d+ \$wa, \d+ \$ha, \d+ \$wg, \d+ \$hg|^.+ - \d+\/\d+",
4546
flags=re.M,
4647
)
4748

@@ -75,9 +76,9 @@ def dl_regex(content: str) -> list[str]:
7576

7677

7778
clean_notes_pattern = re.compile(
78-
r"^#\d+ - | ? 💞 => .+?(?= \|)| 🚫 \$.*| \· \(\$.*|[\u200b]| \d+ ka|\(Soulkeys: \d+\)| \(#[\da-f]{6}\)|Top 15"
79-
r" value: \d+|"
80-
r"AVG: \d+||Total value: \d+|\d+ \$wa, \d+ \$ha, \d+ \$wg, \d+ \$hg|^.+ - \d+\/\d+",
79+
r"^#\d{1,3}([., ]?\d{3})* - | ? 💞 => .+?(?= \|)| 🚫 \$.*| \· \(\$.*|[\u200b]| \d{1,3}([., ]?\d{3})* ka"
80+
r"|\(Soulkeys: \d{1,3}([., ]?\d{3})*\)| \(#[\da-f]{6}\)|Top 15 value: \d{1,3}([., ]?\d{3})*|AVG: \d{1,3}([., ]?\d{3})*"
81+
r"|Total value: \d{1,3}([., ]?\d{3})*|\d+ \$wa, \d+ \$ha, \d+ \$wg, \d+ \$hg|^.+ - \d+\/\d+",
8182
flags=re.M,
8283
)
8384

@@ -109,8 +110,9 @@ def image_regex(content: str) -> list[str]:
109110

110111

111112
clean_ec_pattern = re.compile(
112-
r"^#\d+ - |\s+?[=\-·\|💞🚫].+?(?= \(#)|[\u200b❌⭐🔐✅]| \d+ ka|\(Soulkeys: \d+\)|Top 15 value: \d+|"
113-
r"AVG: \d+|<?:kakera:(\d+)?>?|Total value: \d+|\d+ \$wa, \d+ \$ha, \d+ \$wg, \d+ \$hg|^.+ - \d+\/\d+",
113+
r"^#\d{1,3}([., ]?\d{3})* - |\s+?[=\-·\|💞🚫].+?(?= \(#)|[\u200b❌⭐🔐✅]| \d{1,3}([., ]?\d{3})* ka"
114+
r"|\(Soulkeys: \d{1,3}([., ]?\d{3})*\)|Top 15 value: \d{1,3}([., ]?\d{3})*|AVG: \d{1,3}([., ]?\d{3})*|<?:kakera:(\d+)?>?"
115+
r"|Total value: \d{1,3}([., ]?\d{3})*|\d+ \$wa, \d+ \$ha, \d+ \$wg, \d+ \$hg|^.+ - \d+\/\d+",
114116
flags=re.M,
115117
)
116118

0 commit comments

Comments
 (0)