GameSentenceMiner 2.18.1__py3-none-any.whl → 2.18.3__py3-none-any.whl

GameSentenceMiner/util/configuration.py

@@ -864,10 +864,11 @@ class Config:
         # Add a way to migrate certain things based on version if needed, also help with better defaults
         if self.version:
             if self.version != get_current_version():
+                from packaging import version
                 logger.info(f"Config version mismatch detected: {self.version} != {get_current_version()}")
                 # Handle version mismatch
                 changed = False
-                if self.version < "2.18.0":
+                if version.parse(self.version) < version.parse("2.18.0"):
                     changed = True
                     # Example, doesn't need to be done
                     for profile in self.configs.values():

GameSentenceMiner/util/get_overlay_coords.py

@@ -188,40 +188,41 @@ class OverlayProcessor:
         For primary monitor, excludes taskbar. For others, returns full monitor area.
         monitor_index: 0 = primary monitor, 1+ = others (as in mss.monitors).
         """
+        # set_dpi_awareness()
         with mss.mss() as sct:
             monitors = sct.monitors[1:]
-            return monitors[monitor_index] if 0 <= monitor_index < len(monitors) else monitors[0]
-            # if is_windows() and monitor_index == 0:
-            #     from ctypes import wintypes
-            #     import ctypes
-            #     # Get work area for primary monitor (ignores taskbar)
-            #     SPI_GETWORKAREA = 0x0030
-            #     rect = wintypes.RECT()
-            #     res = ctypes.windll.user32.SystemParametersInfoW(
-            #         SPI_GETWORKAREA, 0, ctypes.byref(rect), 0
-            #     )
-            #     if not res:
-            #         raise ctypes.WinError()
+            # return monitors[monitor_index] if 0 <= monitor_index < len(monitors) else monitors[0]
+            if is_windows() and monitor_index == 0:
+                from ctypes import wintypes
+                import ctypes
+                # Get work area for primary monitor (ignores taskbar)
+                SPI_GETWORKAREA = 0x0030
+                rect = wintypes.RECT()
+                res = ctypes.windll.user32.SystemParametersInfoW(
+                    SPI_GETWORKAREA, 0, ctypes.byref(rect), 0
+                )
+                if not res:
+                    raise ctypes.WinError()
                 
-            #     return {
-            #         "left": rect.left,
-            #         "top": rect.top,
-            #         "width": rect.right - rect.left,
-            #         "height": rect.bottom - rect.top,
-            #     }
-            # elif is_windows() and monitor_index > 0:
-            #     # Secondary monitors: just return with a guess of how tall the taskbar is
-            #     taskbar_height_guess = 48  # A common taskbar height, may vary
-            #     mon = monitors[monitor_index]
-            #     return {
-            #         "left": mon["left"],
-            #         "top": mon["top"],
-            #         "width": mon["width"],
-            #         "height": mon["height"] - taskbar_height_guess
-            #     }
-            # else:
-            #     # For non-Windows systems or unspecified monitors, return the monitor area as-is
-            #     return monitors[monitor_index] if 0 <= monitor_index < len(monitors) else monitors[0]
+                return {
+                    "left": rect.left,
+                    "top": rect.top,
+                    "width": rect.right - rect.left,
+                    "height": rect.bottom - rect.top,
+                }
+            elif is_windows() and monitor_index > 0:
+                # Secondary monitors: just return with a guess of how tall the taskbar is
+                taskbar_height_guess = 48  # A common taskbar height, may vary
+                mon = monitors[monitor_index]
+                return {
+                    "left": mon["left"],
+                    "top": mon["top"],
+                    "width": mon["width"],
+                    "height": mon["height"] - taskbar_height_guess
+                }
+            else:
+                # For non-Windows systems or unspecified monitors, return the monitor area as-is
+                return monitors[monitor_index] if 0 <= monitor_index < len(monitors) else monitors[0]
 
 
     def _get_full_screenshot(self) -> Tuple[Image.Image | None, int, int]:

{gamesentenceminer-2.18.1.dist-info → gamesentenceminer-2.18.3.dist-info}/METADATA

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

{gamesentenceminer-2.18.1.dist-info → gamesentenceminer-2.18.3.dist-info}/RECORD

@@ -40,11 +40,11 @@ GameSentenceMiner/ui/anki_confirmation.py,sha256=m27IcWbUwb6o6Klh3NwXBc2FtMX9Da3
 GameSentenceMiner/ui/config_gui.py,sha256=Nt6uuJrinOrSpDdrw92zdd1GvyQNjOoGvkZQdGWA9ds,151913
 GameSentenceMiner/ui/screenshot_selector.py,sha256=AKML87MpgYQeSuj1F10GngpNrn9qp06zLLzNRwrQWM8,8900
 GameSentenceMiner/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/util/configuration.py,sha256=K3NIcqwMtAgB_ZytucTgBgDqV1243yrWM5mp5qj2WlE,46577
+GameSentenceMiner/util/configuration.py,sha256=fYlU4Qrr6T-k_G2MY2rgoQ9EV_k7XBfbtsO8q7PKTsU,46653
 GameSentenceMiner/util/db.py,sha256=3Fs75pGJyf8-3y3k6Zfpgp8z9tYL9-ZvQUk_FgDc9Vw,28664
 GameSentenceMiner/util/electron_config.py,sha256=KfeJToeFFVw0IR5MKa-gBzpzaGrU-lyJbR9z-sDEHYU,8767
 GameSentenceMiner/util/ffmpeg.py,sha256=cAzztfY36Xf2WvsJDjavoiMOvA9ac2GVdCrSB4LzHk4,29007
-GameSentenceMiner/util/get_overlay_coords.py,sha256=aYmSxJzyCeIRLNEwL2V8GxMVIsj8qvUv4ysE4YxpWNM,22144
+GameSentenceMiner/util/get_overlay_coords.py,sha256=c37zVKPxFqwIi5XjZKjxRCW_Y8W4e1MX7vSLLwcOhs4,22116
 GameSentenceMiner/util/gsm_utils.py,sha256=mASECTmN10c2yPL4NEfLg0Y0YWwFso1i6r_hhJPR3MY,10974
 GameSentenceMiner/util/model.py,sha256=R-_RYTYLSDNgBoVTPuPBcIHeOznIqi_vBzQ7VQ20WYk,6727
 GameSentenceMiner/util/notification.py,sha256=YBhf_mSo_i3cjBz-pmeTPx3wchKiG9BK2VBdZSa2prQ,4597
@@ -124,9 +124,9 @@ GameSentenceMiner/web/templates/components/kanji_grid/thousand_character_classic
 GameSentenceMiner/web/templates/components/kanji_grid/wanikani_levels.json,sha256=8wjnnaYQqmho6t5tMxrIAc03512A2tYhQh5dfsQnfAM,11372
 GameSentenceMiner/web/templates/components/kanji_grid/words_hk_frequency_list.json,sha256=wRkqZNPzz6DT9OTPHpXwfqW96Qb96stCQNNgOL-ZdKk,17535
 GameSentenceMiner/wip/__init___.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gamesentenceminer-2.18.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.18.1.dist-info/METADATA,sha256=2z6qsUbbScQ_odYmkBVXbiihS4fcatapu249dtgK2Cs,7487
-gamesentenceminer-2.18.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.18.1.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.18.1.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.18.1.dist-info/RECORD,,
+gamesentenceminer-2.18.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.18.3.dist-info/METADATA,sha256=DGaCDSt8zzYwt0sak9LlqbqQ6uGlA8-vHGX6G1XCLTU,7487
+gamesentenceminer-2.18.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.18.3.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.18.3.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.18.3.dist-info/RECORD,,