GameSentenceMiner 2.13.1__tar.gz → 2.13.2.post1__tar.gz

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/GameSentenceMiner/obs.py

@@ -468,6 +468,10 @@ if __name__ == '__main__':
     logging.basicConfig(level=logging.INFO)
     # main()
     connect_to_obs_sync()
+    
+    while True:
+        print(get_active_source())
+        time.sleep(3)
     # i = 100
     # for i in range(1, 100):
     #     print(f"Getting screenshot {i}")

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/GameSentenceMiner/ocr/owocr_area_selector.py

@@ -55,15 +55,13 @@ class ScreenSelector:
 
         if self.use_obs_screenshot:
             print("Using OBS screenshot as target.")
-            screenshot_base64 = obs.get_screenshot_base64(compression=75)
+            self.screenshot_img = obs.get_screenshot_PIL(compression=75)
             # print(screenshot_base64)
-            if not screenshot_base64:
+            if not self.screenshot_img:
                 raise RuntimeError("Failed to get OBS screenshot.")
             try:
-                img_data = base64.b64decode(screenshot_base64)
-                self.screenshot_img = Image.open(io.BytesIO(img_data))
                 # Scale image to 1280x720
-                self.screenshot_img = self.screenshot_img.resize((1280, 720), Image.LANCZOS)
+                self.screenshot_img = self.screenshot_img.resize(self.scale_down_width_height(self.screenshot_img.width, self.screenshot_img.height), Image.LANCZOS)
             except Exception as e:
                 raise RuntimeError(f"Failed to decode or open OBS screenshot: {e}")
 
@@ -104,6 +102,35 @@ class ScreenSelector:
         self.instructions_window_id = None
 
         self.load_existing_rectangles()
+        
+    def scale_down_width_height(self, width, height):
+        if width == 0 or height == 0:
+            return self.width, self.height
+        aspect_ratio = width / height
+        if aspect_ratio > 2.66:
+            # Ultra-wide (32:9) - use 1920x540
+            return 1920, 540
+        elif aspect_ratio > 2.33:
+            # 21:9 - use 1920x800
+            return 1920, 800
+        elif aspect_ratio > 1.77:
+            # 16:9 - use 1280x720
+            return 1280, 720
+        elif aspect_ratio > 1.6:
+            # 16:10 - use 1280x800
+            return 1280, 800
+        elif aspect_ratio > 1.33:
+            # 4:3 - use 960x720
+            return 960, 720
+        elif aspect_ratio > 1.25:
+            # 5:4 - use 900x720
+            return 900, 720
+        elif aspect_ratio > 1.5:
+            # 3:2 - use 1080x720
+            return 1080, 720
+        else:
+            # Default/fallback - use 1280x720
+            return 1280, 720
 
     def _find_target_window(self):
         try:

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/GameSentenceMiner/owocr/owocr/ocr.py

@@ -344,7 +344,6 @@ class GoogleLens:
         text = response_dict['objects_response']['text']
         skipped = []
         previous_line = None
-        lines = []
         if 'text_layout' in text:
             for paragraph in text['text_layout']['paragraphs']:
                 if previous_line:
@@ -360,38 +359,21 @@ class GoogleLens:
                     if vertical_space > avg_height * 2:
                         res += 'BLANK_LINE'
                 for line in paragraph['lines']:
-                    # Build a list of word boxes for this line
-                    words_info = []
-                    for word in line['words']:
-                        word_info = {
-                            "word": word['plain_text'],
-                            "x1": int(word['geometry']['bounding_box']['center_x'] * img.width - (word['geometry']['bounding_box']['width'] * img.width) / 2),
-                            "y1": int(word['geometry']['bounding_box']['center_y'] * img.height - (word['geometry']['bounding_box']['height'] * img.height) / 2),
-                            "x2": int(word['geometry']['bounding_box']['center_x'] * img.width + (word['geometry']['bounding_box']['width'] * img.width) / 2),
-                            "y2": int(word['geometry']['bounding_box']['center_y'] * img.height + (word['geometry']['bounding_box']['height'] * img.height) / 2)
-                        }
-                        words_info.append(word_info)
-
-                    line_text = ''.join([w['word'] for w in words_info])
-                    line_box = {
-                        "sentence": line_text,
-                        "words": words_info
-                    }
-
-                    # Optionally apply furigana filter
                     if furigana_filter_sensitivity:
-                        line_width = line['geometry']['bounding_box']['width'] * img.width
-                        line_height = line['geometry']['bounding_box']['height'] * img.height
-                        if furigana_filter_sensitivity < line_width and furigana_filter_sensitivity < line_height and self.regex.search(line_text):
-                            for w in words_info:
-                                res += w['word']
-                        else:
-                            skipped.extend([w['word'] for w in words_info])
-                            continue
+                        for word in line['words']:
+                            if 'geometry' not in word:
+                                res += word['plain_text']
+                                continue
+                            word_width = word['geometry']['bounding_box']['width'] * img.width
+                            word_height = word['geometry']['bounding_box']['height'] * img.height
+                            if word_width > furigana_filter_sensitivity and word_height > furigana_filter_sensitivity:
+                                res += word['plain_text']
+                            else:
+                                skipped.extend([word['plain_text'] for word in line['words']])
+                                continue
                     else:
-                        for w in words_info:
-                            res += w['word']
-                    lines.append(line_box)
+                        for word in line['words']:
+                            res += word['plain_text']
                 previous_line = paragraph
                 res += '\n'
             # logger.info(
@@ -440,6 +422,9 @@ class GoogleLens:
         else:
             x = (True, res)
 
+        if skipped:
+            logger.info(f"Skipped {len(skipped)} chars due to furigana filter sensitivity: {furigana_filter_sensitivity}")
+
         # img.close()
         return x
 

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/GameSentenceMiner/owocr/owocr/run.py

@@ -831,7 +831,7 @@ class OBSScreenshotThread(threading.Thread):
         self.width = width
         self.height = height
         self.use_periodic_queue = not screen_capture_on_combo
-
+        
     def write_result(self, result):
         if self.use_periodic_queue:
             periodic_screenshot_queue.put(result)
@@ -841,18 +841,58 @@ class OBSScreenshotThread(threading.Thread):
     def connect_obs(self):
         import GameSentenceMiner.obs as obs
         obs.connect_to_obs_sync()
-
+        
+    def scale_down_width_height(self, width, height):
+        if width == 0 or height == 0:
+            return self.width, self.height
+        aspect_ratio = width / height
+        logger.info(f"Scaling down OBS source dimensions: {width}x{height} (Aspect Ratio: {aspect_ratio})")
+        if aspect_ratio > 2.66:
+            # Ultra-wide (32:9) - use 1920x540
+            logger.info("Using ultra-wide aspect ratio scaling (32:9).")
+            return 1920, 540
+        elif aspect_ratio > 2.33:
+            # 21:9 - use 1920x800
+            logger.info("Using ultra-wide aspect ratio scaling (21:9).")
+            return 1920, 800
+        elif aspect_ratio > 1.77:
+            # 16:9 - use 1280x720
+            logger.info("Using standard aspect ratio scaling (16:9).")
+            return 1280, 720
+        elif aspect_ratio > 1.6:
+            # 16:10 - use 1280x800
+            logger.info("Using standard aspect ratio scaling (16:10).")
+            return 1280, 800
+        elif aspect_ratio > 1.33:
+            # 4:3 - use 960x720
+            logger.info("Using standard aspect ratio scaling (4:3).")
+            return 960, 720
+        elif aspect_ratio > 1.25:
+            # 5:4 - use 900x720
+            logger.info("Using standard aspect ratio scaling (5:4).")
+            return 900, 720
+        elif aspect_ratio > 1.5:
+            # 3:2 - use 1080x720
+            logger.info("Using standard aspect ratio scaling (3:2).")
+            return 1080, 720
+        else:
+            # Default/fallback - use 1280x720
+            logger.info("Using default aspect ratio scaling (1280x720).")
+            return 1280, 720
 
     def run(self):
         global last_image
-        import base64
-        import io
         from PIL import Image
         import GameSentenceMiner.obs as obs
 
         def init_config(source=None, scene=None):
             obs.update_current_game()
             self.current_source = source if source else obs.get_active_source()
+            self.source_width = self.current_source.get("sceneItemTransform").get("sourceWidth") or self.width
+            self.source_height = self.current_source.get("sceneItemTransform").get("sourceHeight") or self.height
+            if self.source_width and self.source_height:
+                self.width, self.height = self.scale_down_width_height(self.source_width, self.source_height)
+                logger.info(f"Using OBS source dimensions: {self.width}x{self.height}")
             self.current_source_name = self.current_source.get("sourceName") or None
             self.current_scene = scene if scene else obs.get_current_game()
             self.ocr_config = get_scene_ocr_config()

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/GameSentenceMiner/util/configuration.py

@@ -689,7 +689,7 @@ class Config:
     configs: Dict[str, ProfileConfig] = field(default_factory=dict)
     current_profile: str = DEFAULT_CONFIG
     switch_to_default_if_not_found: bool = True
-    locale: Locale = Locale.English
+    locale: Locale = Locale.English.value
 
     @classmethod
     def new(cls):

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/GameSentenceMiner/util/notification.py

@@ -138,3 +138,10 @@ def send_error_no_anki_update():
         message=f"Anki Card not updated, Check Console for Reason!",
         timeout=5  # Notification disappears after 5 seconds
     )
+    
+def send_error_notification(message):
+    send_notification(
+        title="Error",
+        message=message,
+        timeout=5  # Notification disappears after 5 seconds
+    )

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/GameSentenceMiner/wip/get_overlay_coords.py

@@ -168,8 +168,8 @@ def extract_text_with_pixel_boxes(
             
 
             for word in line.get("words", []):
-                if not regex.search(word.get("plain_text", "")):
-                    continue
+                # if not regex.search(word.get("plain_text", "")):
+                    # continue
                 word_text = word.get("plain_text", "")
                 line_text_parts.append(word_text)
                 

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/GameSentenceMiner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.13.1
+Version: 2.13.2.post1
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.13.1
+Version: 2.13.2.post1
 Summary: A tool for mining sentences from games. Update: Overlay?
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.13.1 → gamesentenceminer-2.13.2.post1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GameSentenceMiner"
-version = "2.13.1"
+version = "2.13.2.post1"
 description = "A tool for mining sentences from games. Update: Overlay?"
 readme = "README.md"
 requires-python = ">=3.10"