GameSentenceMiner 2.7.11__py3-none-any.whl → 2.7.13__py3-none-any.whl

GameSentenceMiner/anki.py

@@ -264,7 +264,7 @@ def check_for_new_cards():
         except Exception as e:
             logger.error("Error updating new card, Reason:", e)
     first_run = False
-    previous_note_ids = current_note_ids  # Update the list of known notes
+    previous_note_ids.update(new_card_ids)  # Update the list of known notes
 
 
 def update_new_card():
@@ -284,7 +284,11 @@ def update_new_card():
     else:
         logger.info("New card(s) detected! Added to Processing Queue!")
         card_queue.append(last_card)
-        obs.save_replay_buffer()
+        try:
+            obs.save_replay_buffer()
+        except Exception as e:
+            logger.error(f"Error saving replay buffer: {e}")
+            return
 
 
 def sentence_is_same_as_previous(last_card):

GameSentenceMiner/obs.py

@@ -178,15 +178,12 @@ def stop_replay_buffer():
 
 # Save the current replay buffer
 def save_replay_buffer():
-    try:
-        replay_buffer_started = do_obs_call(requests.GetReplayBufferStatus())['outputActive']
-        if replay_buffer_started:
-            client.call(requests.SaveReplayBuffer())
-            logger.info("Replay buffer saved. If your log stops bere, make sure your obs output path matches \"Path To Watch\" in GSM settings.")
-        else:
-            logger.error("Replay Buffer is not active, could not save Replay Buffer!")
-    except Exception as e:
-        logger.error(f"Error saving replay buffer: {e}")
+    replay_buffer_started = do_obs_call(requests.GetReplayBufferStatus())['outputActive']
+    if replay_buffer_started:
+        client.call(requests.SaveReplayBuffer())
+        logger.info("Replay buffer saved. If your log stops bere, make sure your obs output path matches \"Path To Watch\" in GSM settings.")
+    else:
+        logger.error("Replay Buffer is not active, could not save Replay Buffer!")
 
 
 def get_current_scene():

GameSentenceMiner/ocr/gsm_ocr_config.py

@@ -1,26 +1,67 @@
 from dataclasses import dataclass
+from math import floor, ceil
+
 from dataclasses_json import dataclass_json
-from typing import List, Optional
+from typing import List, Optional, Union
+
 
 @dataclass_json
 @dataclass
 class Monitor:
-    left: int
-    top: int
-    width: int
-    height: int
     index: int
+    left: Optional[int] = None
+    top: Optional[int] = None
+    width: Optional[int] = None
+    height: Optional[int] = None
+
+# @dataclass_json
+# @dataclass
+# class Coordinates:
+#     coordinates: List[Union[float, int]]
+#     coordinate_system: str = None
 
 @dataclass_json
 @dataclass
 class Rectangle:
     monitor: Monitor
-    coordinates: List[int]
+    coordinates: List[Union[float, int]]
     is_excluded: bool
 
+@dataclass_json
+@dataclass
+class WindowGeometry:
+    left: int
+    top: int
+    width: int
+    height: int
+
 @dataclass_json
 @dataclass
 class OCRConfig:
     scene: str
     rectangles: List[Rectangle]
-    window: Optional[str] = None
+    coordinate_system: str = None
+    window_geometry: Optional[WindowGeometry] = None
+    window: Optional[str] = None
+
+    def __post_init__(self):
+        if self.coordinate_system and self.coordinate_system == "percentage" and self.window:
+            import pygetwindow as gw
+            try:
+                window = gw.getWindowsWithTitle(self.window)[0]
+                self.window_geometry = WindowGeometry(
+                    left=window.left,
+                    top=window.top,
+                    width=window.width,
+                    height=window.height,
+                )
+            except IndexError:
+                raise ValueError(f"Window with title '{self.window}' not found.")
+            for rectangle in self.rectangles:
+                rectangle.coordinates = [
+                    ceil(rectangle.coordinates[0] * self.window_geometry.width),
+                    ceil(rectangle.coordinates[1] * self.window_geometry.height),
+                    ceil(rectangle.coordinates[2] * self.window_geometry.width),
+                    ceil(rectangle.coordinates[3] * self.window_geometry.height),
+                ]
+