Add Black formatting check workflow and format codebase

.editorconfig

@@ -13,7 +13,7 @@ trim_trailing_whitespace = true
 [*.py]
 indent_size = 4
 tab_width = 4
-max_line_length = 80
+max_line_length = 88
 
 [*.go]
 indent_style = tab
@@ -29,4 +29,3 @@ max_line_length = off
 [*.md]
 indent_size = 2
 tab_width = 2
-

.github/workflows/black.yml

@@ -0,0 +1,24 @@
+name: black-format-check
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  black:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install Black
+        run: pip install black
+
+      - name: Run Black check
+        run: black --check .

mods/__init__.py

@@ -4,16 +4,18 @@
 import importlib
 from pokete.classes.mods import ModError
 
+mod_names = [
+    i.strip(".py")
+    for i in os.listdir(__file__.strip("__init__.py"))
+    if i[0] != "_" and i != "README.md"
+]
 
-mod_names = [i.strip(".py") for i in os.listdir(__file__.strip("__init__.py"))
-             if i[0] != "_" and i != "README.md"]
-
-mod_obs = [importlib.import_module("mods."+i) for i in mod_names]
+mod_obs = [importlib.import_module("mods." + i) for i in mod_names]
 
 for name, mod in zip(mod_names, mod_obs):
     try:
-       [mod.version, mod.name, mod.mod_p_data]
+        [mod.version, mod.name, mod.mod_p_data]
     except AttributeError as err:
         raise ModError(name, err)
 
-mod_info = {i.name : i.version for i in mod_obs}
+mod_info = {i.name: i.version for i in mod_obs}

pyproject.toml

@@ -28,3 +28,6 @@ pokete-util = "pokete.util.__main__:main"
 Homepage = "https://github.com/lxgr-linux/pokete"
 Issues = "https://github.com/lxgr-linux/pokete/issue"
 Repository = "https://github.com/lxgr-linux/pokete.git"
+[tool.black]
+line-length = 88
+target-version = ["py312"]

src/pokete/__main__.py

@@ -144,9 +144,7 @@ def set_args(self, _si):
         self.last_center_map = obmp.ob_maps.get(
             _si.get("last_center_map", "playmap_1"), PlayMap()
         )
-        self.oldmap = obmp.ob_maps.get(
-            _si.get("oldmap", "playmap_1"), PlayMap()
-        )
+        self.oldmap = obmp.ob_maps.get(_si.get("oldmap", "playmap_1"), PlayMap())
         mvp.movemap.name_label.rechar(self.name, esccode=Color.thicc)
         mvp.movemap.code_label.rechar(self.map.pretty_name)
         self.balls_label_rechar()
@@ -173,9 +171,7 @@ def add_poke(self, poke: Poke, idx=None, caught_with=None):
             idx: Index of the Poke
             caught_with: Name of ball which was used"""
         poke.set_player(True)
-        poke.set_poke_stats(
-            Stats(poke.name, datetime.now(), caught_with=caught_with)
-        )
+        poke.set_poke_stats(Stats(poke.name, datetime.now(), caught_with=caught_with))
         self.caught_pokes.append(poke.identifier)
         if idx is None:
             id_list = [i.identifier for i in self.pokes]
@@ -348,9 +344,7 @@ def _game(_map: PlayMap, figure: Figure):
         ]
         + _map.extra_actions()
     )
-    ctx = change_ctx(
-        Context(pevm, mvp.movemap, mvp.movemap, figure), mvp.movemap
-    )
+    ctx = change_ctx(Context(pevm, mvp.movemap, mvp.movemap, figure), mvp.movemap)
     MapInteract.set_ctx(ctx)  # Npcs need this global context
     inp_dict: list[tuple[list[Action], tuple]] = [
         ([Action.DECK], (deck.deck, (ctx, 6, "Your deck"))),
@@ -496,9 +490,7 @@ def main():
             identifier,
             achievement_args,
         ) in asset_service.get_base_assets().achievements.items():
-            achievements.add(
-                identifier, achievement_args.title, achievement_args.desc
-            )
+            achievements.add(identifier, achievement_args.title, achievement_args.desc)
 
         notifier.set_vars(mvp.movemap)
 
@@ -509,11 +501,7 @@ def main():
         figure.set_args(session_info)
         game_map = figure.map
         if figure.name == "DEFAULT":
-            intro(
-                Context(
-                    PeriodicEventManager([]), mvp.movemap, mvp.movemap, figure
-                )
-            )
+            intro(Context(PeriodicEventManager([]), mvp.movemap, mvp.movemap, figure))
             game_map = obmp.ob_maps["intromap"]
         while True:
             try:

src/pokete/base/game_map.py

@@ -1,4 +1,5 @@
 """Map wrapper for compatibility purposes"""
+
 from abc import ABC
 
 import scrap_engine as se

src/pokete/base/input/hotkeys.py

@@ -181,9 +181,7 @@ def get_mapping(action: Action, keys: dict[str, ActionList]) -> str:
 
 def hotkeys_save():
     """Returns a save dict"""
-    return {
-        key: [i.name for i in value] for key, value in hotkey_mappings.items()
-    }
+    return {key: [i.name for i in value] for key, value in hotkey_mappings.items()}
 
 
 def hotkeys_from_save(ctx, save, version_change):
@@ -198,16 +196,12 @@ def hotkeys_from_save(ctx, save, version_change):
     new_hotkey_mappings = defaultdict(
         ActionList,
         {
-            key: ActionList(
-                [Action[i] for i in value if i in Action.__members__]
-            )
+            key: ActionList([Action[i] for i in value if i in Action.__members__])
             for key, value in save.items()
         },
     )
     unset = [
-        action
-        for action in Action
-        if get_mapping(action, new_hotkey_mappings) is None
+        action for action in Action if get_mapping(action, new_hotkey_mappings) is None
     ]
     if unset:
         if version_change or ask_bool(

src/pokete/base/input_loops/ask/__init__.py

@@ -19,9 +19,7 @@ def wait_event(ctx: Context, text: str, event: Event):
         loops.event_wait(ctx, event)
 
 
-def ask_text(
-    ctx: Context, infotext, introtext, text, name, max_len
-) -> Optional[str]:
+def ask_text(ctx: Context, infotext, introtext, text, name, max_len) -> Optional[str]:
     """Asks the player to input a text
     ARGS:
         ctx: Context

src/pokete/base/input_loops/new_text_input.py

@@ -69,8 +69,7 @@ def __call__(self, ctx: Context) -> Optional[str]:
                 elif input_key == key.BACKSPACE:
                     self.__change_idx(-1)
                     self.__text = (
-                        self.__text[: self.__idx]
-                        + self.__text[self.__idx + 1 :]
+                        self.__text[: self.__idx] + self.__text[self.__idx + 1 :]
                     )
                 elif input_key.has_char():
                     if self.max_len < 0 or len(self.__text) < self.max_len:

src/pokete/base/mouse/interactor.py

@@ -11,9 +11,7 @@ def get_all_interaction_areas(
         self,
     ) -> list[se.Area]:
         return [
-            j
-            for i in self.get_all_interactors()
-            for j in i.get_interaction_areas()
+            j for i in self.get_all_interactors() for j in i.get_interaction_areas()
         ]
 
     @abstractmethod

src/pokete/base/mouse/mouse.py

@@ -17,9 +17,7 @@
 class MouseInteractionManager:
     def __init__(self) -> None:
         self.__interactors: list[MouseInteractor] = []
-        self.__last: Optional[
-            tuple[MouseInteractor, int, MouseEventType, bool]
-        ] = None
+        self.__last: Optional[tuple[MouseInteractor, int, MouseEventType, bool]] = None
         queue_monitor.attach(MouseOptimizingQueueMonitoringHandler())
         PropagatingThread(target=self.run, daemon=True).start()
 
@@ -29,9 +27,7 @@ def attach(self, interactors: list[MouseInteractor]):
     def run(self):
         for event in bs_rpc.ChannelGenerator(mouse_manager.events)():
             for interactor in self.__interactors:
-                for idx, area in enumerate(
-                    interactor.get_all_interaction_areas()
-                ):
+                for idx, area in enumerate(interactor.get_all_interaction_areas()):
                     if (
                         area[0][0] <= event.x <= area[1][0]
                         and area[0][1] <= event.y <= area[1][1]
@@ -41,9 +37,7 @@ def run(self):
                 else:
                     self.cast_event(interactor, -1, event)
 
-    def cast_event(
-        self, interactor: MouseInteractor, idx: int, event: MouseEvent
-    ):
+    def cast_event(self, interactor: MouseInteractor, idx: int, event: MouseEvent):
         curr = (interactor, idx, event.type, event.pressed)
 
         if curr != self.__last:

src/pokete/base/periodic_event_manager/periodic_event_manager.py

@@ -14,9 +14,7 @@ def __init__(self, events: list[PeriodicEvent[T]], tick=0):
         self.events: list[PeriodicEvent[T]] = events
         self.tick: int = tick
 
-    def with_events(
-        self, events: list[PeriodicEvent[T]]
-    ) -> "PeriodicEventManager":
+    def with_events(self, events: list[PeriodicEvent[T]]) -> "PeriodicEventManager":
         return PeriodicEventManager(self.events + events, self.tick)
 
     def event(self, ctx: T):

src/pokete/base/single_event/single_event_periodic_event.py

@@ -39,6 +39,4 @@ def tick(self, ctx: Context, tick: int):
                 break
 
 
-single_event_periodic_event: SingleEventPeriodicEvent = (
-    SingleEventPeriodicEvent()
-)
+single_event_periodic_event: SingleEventPeriodicEvent = SingleEventPeriodicEvent()

src/pokete/base/tss.py

@@ -18,8 +18,9 @@ def __init__(self):
         self.warning_label = se.Text("Minimum windowsize is 70x20")
         self.size_label = se.Text(f"{self.width}x{self.height}")
         self.frame = StdFrame(self.height - 1, self.width)
-        self.warning_label.add(self.map, int(self.width / 2) - 13,
-                               int(self.height / 2) - 1)
+        self.warning_label.add(
+            self.map, int(self.width / 2) - 13, int(self.height / 2) - 1
+        )
         self.size_label.add(self.map, 1, 0)
         self.frame.add(self.map, 0, 0)
 
@@ -41,8 +42,9 @@ def __call__(self):
             self.warning_label.set(1, 1)
             self.frame.remove()
             self.map.resize(self.height - 1, self.width, " ")
-            self.warning_label.set(int(self.width / 2) - 13,
-                                   int((self.height - 1) / 2) - 1)
+            self.warning_label.set(
+                int(self.width / 2) - 13, int((self.height - 1) / 2) - 1
+            )
             self.size_label.rechar(f"{self.width}x{self.height}")
             self.frame.resize(self.height - 1, self.width)
             self.frame.add(self.map, 0, 0)

src/pokete/base/ui/__init__.py

@@ -1,2 +1,3 @@
 from .overview import Overview
+
 # from .notify import notifier

src/pokete/base/ui/elements/labels.py

@@ -14,9 +14,9 @@
 class GenericActionLabel(HightlightableText, MouseInteractor):
     def __init__(self, action: Action, text: str):
         self.action = action
-        assert action.mapping is not None and len(action.mapping) == 1, (
-            "Trying to create Actionlabel with noch char mapping"
-        )
+        assert (
+            action.mapping is not None and len(action.mapping) == 1
+        ), "Trying to create Actionlabel with noch char mapping"
         self.key = Key(action.mapping)
         super().__init__(f"{action.mapping}:{text}")
 

src/pokete/base/ui/notify.py

@@ -19,9 +19,9 @@ class Notification(LabelBox):
     def __init__(self, title, name, desc):
         self.title = title
         self.desc = desc
-        label = se.Text(
-            title + "\n", esccode=Color.thicc, state="float"
-        ) + se.Text(liner(desc, 30), state="float")
+        label = se.Text(title + "\n", esccode=Color.thicc, state="float") + se.Text(
+            liner(desc, 30), state="float"
+        )
         super().__init__(label, name)
 
     def corner_add(self, _map):

src/pokete/base/ui/views/better_choose_box.py

@@ -46,9 +46,7 @@ def interact(self, ctx: Context, area_idx: int, event: MouseEvent):
     @override
     def get_partial_interactors(self) -> list[MouseInteractor]:
         return [
-            label
-            for label in self.info_labels
-            if isinstance(label, MouseInteractor)
+            label for label in self.info_labels if isinstance(label, MouseInteractor)
         ]
 
     def __call__(self, ctx: Context) -> Optional[T]:

src/pokete/base/ui/views/box.py

@@ -25,9 +25,7 @@ def __init__(
     @override
     def get_partial_interactors(self) -> list[MouseInteractor]:
         return [
-            label
-            for label in self.info_labels
-            if isinstance(label, MouseInteractor)
+            label for label in self.info_labels if isinstance(label, MouseInteractor)
         ]
 
     @override

src/pokete/base/ui/views/boxes.py

@@ -69,8 +69,7 @@ def __init__(self, infotext, introtext, text, max_len, name=""):
         height = len(infotext.split("\n")) + 3
         width = (
             sorted(
-                [len(i) for i in infotext.split("\n")]
-                + [len(introtext) + 1 + max_len]
+                [len(i) for i in infotext.split("\n")] + [len(introtext) + 1 + max_len]
             )[-1]
             + 4
         )