tworu/dzgui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2026-08-25 17:32:36 +02:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

change: import regex directly from proxy model

Browse Source
This commit is contained in:
aclist 2026-08-20 13:46:06 +09:00 committed by GitHub
parent e2a6fa0c7e
commit 493818b770
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dzgui/model/proxy_model.py
View File

@ -12,6 +12,9 @@ if TYPE_CHECKING:
from dzgui.api.servers import Record from dzgui.api.servers import Record
from dzgui.model.servers import NewPlayerCount from dzgui.model.servers import NewPlayerCount
DAY_REG = r"([0][7-9]|[1][0-6])"
NIGHT_REG = r"([0][0-6]|[1][7-9]|[2][0-3])"
class ProxyModelManager: class ProxyModelManager:
""" """
@ -231,11 +234,9 @@ class ProxyModelManager:
final.append(row) final.append(row)
rows = final rows = final
case strings.filter_day: case strings.filter_day:
reg = r"([0][7-9]|[1][0-6])" rows = [row for row in rows if not re.match(DAY_REG, row[3])]
rows = [row for row in rows if not re.match(reg, row[3])]
case strings.filter_night: case strings.filter_night:
reg = r"([0][0-6]|[1][7-9]|[2][0-3])" rows = [row for row in rows if not re.match(NIGHT_REG, row[3])]
rows = [row for row in rows if not re.match(reg, row[3])]
case strings.filter_nonascii: case strings.filter_nonascii:
rows = [row for row in rows if row[0].isascii()] rows = [row for row in rows if row[0].isascii()]
case strings.filter_lowpop: case strings.filter_lowpop:

8
tests/test_time.py
View File

@ -1,7 +1,7 @@
import re import re
day = r"([0][7-9]|[1][0-6])" from dzgui.model.proxy_model import DAY_REG, NIGHT_REG
night = r"([0][0-6]|[1][7-9]|[2][0-3])"
def iterate(h: str, r: str) -> None: def iterate(h: str, r: str) -> None:
for m in range(60): for m in range(60):
@ -13,11 +13,11 @@ def test_day() -> None:
for h in range(17): for h in range(17):
if h < 7: if h < 7:
continue continue
iterate(h, day) iterate(h, DAY_REG)
def test_night() -> None: def test_night() -> None:
for h in range(24): for h in range(24):
if 6 < h < 17: if 6 < h < 17:
continue continue
iterate(h, night) iterate(h, NIGHT_REG)