From 4b8c6e52deed74edc0e24c1755532726b02e522a Mon Sep 17 00:00:00 2001
From: Auric Vente <mprops@protonmail.com>
Date: Sat, 20 Jul 2024 03:12:20 -0600
Subject: [PATCH] Mods

---
 cromulant/filter.py | 71 +++++++++++++++++++++++++++++++++++++++++++++
 cromulant/game.py   | 64 +++++-----------------------------------
 cromulant/window.py |  3 +-
 3 files changed, 80 insertions(+), 58 deletions(-)
 create mode 100644 cromulant/filter.py

diff --git a/cromulant/filter.py b/cromulant/filter.py
new file mode 100644
index 0000000..23ccf35
--- /dev/null
+++ b/cromulant/filter.py
@@ -0,0 +1,71 @@
+from __future__ import annotations
+
+from PySide6.QtWidgets import QWidget
+from PySide6.QtGui import QKeyEvent  # type: ignore
+
+from .window import Window
+
+class Filter:
+    @staticmethod
+    def get_value() -> str:
+        return Window.filter.text().lower().strip()
+
+    @staticmethod
+    def filter(event: QKeyEvent | None = None) -> None:
+        value = Filter.get_value()
+
+        for i in range(Window.view.count()):
+            item = Window.view.itemAt(i)
+            text = Filter.get_filter_text(item)
+            hide = True
+
+            for txt in text:
+                if value in txt:
+                    hide = False
+                    break
+
+            if hide:
+                item.widget().hide()
+            else:
+                item.widget().show()
+
+    @staticmethod
+    def get_filter_text(item: QWidget) -> list[str]:
+        text = []
+        layout = item.widget().layout()
+
+        for i in range(layout.count()):
+            widget = layout.itemAt(i).widget()
+
+            if not widget:
+                continue
+
+            name = widget.objectName()
+
+            if name != "view_right":
+                continue
+
+            layout2 = widget.layout()
+
+            for j in range(layout2.count()):
+                wid = layout2.itemAt(j).widget()
+
+                if not wid:
+                    continue
+
+                name = wid.objectName()
+
+                if not name:
+                    continue
+
+                if (name == "view_title") or (name == "view_message"):
+                    text.append(wid.text().lower())
+
+        return text
+
+    @staticmethod
+    def check() -> None:
+        value = Filter.get_value()
+
+        if value:
+            Filter.filter()
\ No newline at end of file
diff --git a/cromulant/game.py b/cromulant/game.py
index 502865e..adacd16 100644
--- a/cromulant/game.py
+++ b/cromulant/game.py
@@ -8,7 +8,6 @@ from PySide6.QtWidgets import QHBoxLayout  # type: ignore
 from PySide6.QtWidgets import QVBoxLayout
 from PySide6.QtWidgets import QLabel
 from PySide6.QtWidgets import QWidget
-from PySide6.QtGui import QKeyEvent  # type: ignore
 from PySide6.QtGui import QPixmap
 from PySide6.QtCore import QTimer
 
@@ -57,7 +56,7 @@ class Game:
         container.addWidget(image_label)
         container.addSpacing(Config.space_1)
         container.addWidget(right_container)
-        Game.add_view_container(container)
+        Game.add_container(container)
 
     @staticmethod
     def add_message(
@@ -73,10 +72,12 @@ class Game:
         container.addWidget(image_label)
         container.addSpacing(Config.space_1)
         container.addWidget(right_container)
-        Game.add_view_container(container)
+        Game.add_container(container)
 
     @staticmethod
-    def add_view_container(container: QHBoxLayout) -> None:
+    def add_container(container: QHBoxLayout) -> None:
+        from .filter import Filter
+
         root = QWidget()
         root.setContentsMargins(0, 0, 0, 0)
         container.setContentsMargins(0, 0, 0, 0)
@@ -91,6 +92,8 @@ class Game:
             elif item.layout():
                 Window.delete_layout(item.layout())
 
+        Filter.check()
+
     @staticmethod
     def make_right_container(title: str, message: str) -> QWidget:
         root = QWidget()
@@ -249,56 +252,3 @@ class Game:
             Window.play_audio(path)
 
         Game.playing_song = not Game.playing_song
-
-    @staticmethod
-    def filter(event: QKeyEvent) -> None:
-        value = Window.filter.text().lower().strip().lower()
-
-        for i in range(Window.view.count()):
-            item = Window.view.itemAt(i)
-            text = Game.get_filter_text(item)
-            hide = True
-
-            for txt in text:
-                if value in txt:
-                    hide = False
-                    break
-
-            if hide:
-                item.widget().hide()
-            else:
-                item.widget().show()
-
-    @staticmethod
-    def get_filter_text(item: QWidget) -> list[str]:
-        text = []
-        layout = item.widget().layout()
-
-        for i in range(layout.count()):
-            widget = layout.itemAt(i).widget()
-
-            if not widget:
-                continue
-
-            name = widget.objectName()
-
-            if name != "view_right":
-                continue
-
-            layout2 = widget.layout()
-
-            for j in range(layout2.count()):
-                wid = layout2.itemAt(j).widget()
-
-                if not wid:
-                    continue
-
-                name = wid.objectName()
-
-                if not name:
-                    continue
-
-                if (name == "view_title") or (name == "view_message"):
-                    text.append(wid.text().lower())
-
-        return text
diff --git a/cromulant/window.py b/cromulant/window.py
index 7b9f847..037e8e2 100644
--- a/cromulant/window.py
+++ b/cromulant/window.py
@@ -188,6 +188,7 @@ class Window:
     def add_buttons() -> None:
         from .ants import Ants
         from .game import Game
+        from .filter import Filter
 
         root = QWidget()
         container = QHBoxLayout()
@@ -220,7 +221,7 @@ class Window:
         Window.filter.setFixedWidth(120)
         Window.filter.setPlaceholderText("Filter")
         Window.filter.mousePressEvent = lambda e: Window.to_top()
-        Window.filter.keyReleaseEvent = lambda e: Game.filter(e)
+        Window.filter.keyReleaseEvent = lambda e: Filter.filter(e)
 
         container.addWidget(btn_hatch)
         container.addWidget(btn_terminate)