GameSentenceMiner 2.19.16__py3-none-any.whl → 2.20.0__py3-none-any.whl

GameSentenceMiner/__init__.py

@@ -0,0 +1,39 @@
+import os
+
+# Remove environment variables that could interfere with managed Python instance
+# This prevents conflicts with user's system Python installations and configurations
+
+# Tk/Tcl libraries
+os.environ.pop('TCL_LIBRARY', None)
+os.environ.pop('TK_LIBRARY', None)
+
+# Python-specific paths that could cause module conflicts
+os.environ.pop('PYTHONPATH', None)
+os.environ.pop('PYTHONHOME', None)
+os.environ.pop('PYTHONSTARTUP', None)
+os.environ.pop('PYTHONUSERBASE', None)
+
+# Virtual environment variables
+os.environ.pop('VIRTUAL_ENV', None)
+os.environ.pop('CONDA_PREFIX', None)
+os.environ.pop('CONDA_DEFAULT_ENV', None)
+os.environ.pop('CONDA_PYTHON_EXE', None)
+
+# Python version managers
+os.environ.pop('PYENV_ROOT', None)
+os.environ.pop('PYENV_VERSION', None)
+os.environ.pop('PYENV_SHELL', None)
+
+# Poetry package manager
+os.environ.pop('POETRY_ACTIVE', None)
+os.environ.pop('POETRY_HOME', None)
+
+# Pip configuration that could override behavior
+os.environ.pop('PIP_CONFIG_FILE', None)
+os.environ.pop('PIP_REQUIRE_VIRTUALENV', None)
+
+# Prevent user site-packages from being loaded
+# os.environ['PYTHONNOUSERSITE'] = '1'
+
+# Isolate from system installations
+os.environ['PYTHONIOENCODING'] = 'utf-8'

GameSentenceMiner/anki.py

@@ -238,12 +238,15 @@ def update_anki_card(last_note: 'AnkiCard', note=None, audio_path='', video_path
         config_app: 'ConfigApp' = gsm_state.config_app
         sentence = note['fields'].get(config.anki.sentence_field, last_note.get_field(config.anki.sentence_field))
         
-        use_voice, sentence, translation, new_ss_path, add_nsfw_tag = config_app.show_anki_confirmation_dialog(
+        use_voice, sentence, translation, new_ss_path, add_nsfw_tag, new_audio_path = config_app.show_anki_confirmation_dialog(
             tango, sentence, assets.screenshot_path, assets.audio_path if update_audio_flag else None, translation, ss_time
         )
         note['fields'][config.anki.sentence_field] = sentence
         note['fields'][config.ai.anki_field] = translation
         assets.screenshot_path = new_ss_path or assets.screenshot_path
+        # Update audio path if TTS was generated in the dialog
+        if new_audio_path:
+            assets.audio_path = new_audio_path
         
         # Add NSFW tag if checkbox was selected
         if add_nsfw_tag:
@@ -588,13 +591,13 @@ def update_card_from_same_sentence(last_card, lines, game_line):
         time_elapsed += 0.5
         if time_elapsed > 15:
             logger.info(f"Timed out waiting for Anki update for card {last_card.noteId}, retrieving new audio")
-            queue_card_for_processing(last_card, lines)
+            queue_card_for_processing(last_card, lines, game_line)
             return
     anki_result = anki_results[game_line.id]
     
     if anki_result.word == last_card.get_field(get_config().anki.word_field):
         logger.info(f"Same word detected, attempting to get new audio for card {last_card.noteId}")
-        queue_card_for_processing(last_card, lines)
+        queue_card_for_processing(last_card, lines, game_line)
         return
     
     if anki_result.success:

GameSentenceMiner/gametext.py

@@ -12,6 +12,7 @@ from rapidfuzz import fuzz
 
 from GameSentenceMiner.util.configuration import get_config, gsm_status, logger, gsm_state, is_dev
 from GameSentenceMiner.util.db import GameLinesTable
+from GameSentenceMiner.util.games_table import GamesTable
 from GameSentenceMiner.util.gsm_utils import do_text_replacements, TEXT_REPLACEMENTS_FILE, run_new_thread
 from GameSentenceMiner import obs
 from GameSentenceMiner.util.gsm_utils import add_srt_line
@@ -262,8 +263,18 @@ async def add_line_to_text_log(line, line_time=None):
         if get_overlay_processor().ready:
             asyncio.create_task(get_overlay_processor().find_box_and_send_to_overlay(current_line_after_regex))
     add_srt_line(line_time, new_line)
-    if 'nostatspls' not in new_line.scene.lower():
-        GameLinesTable.add_line(new_line)
+    
+    # Link the game_line to the games table, but skip if 'nostatspls' in scene
+    game_line = get_text_log()[-1]
+    if 'nostatspls' not in game_line.scene.lower():
+        if game_line.scene:
+            # Get or create the game record
+            game = GamesTable.get_or_create_by_name(game_line.scene)
+            # Add the line with the game_id
+            GameLinesTable.add_line(game_line, game_id=game.id)
+        else:
+            # Fallback if no scene is set
+            GameLinesTable.add_line(game_line)
 
 def reset_line_hotkey_pressed():
     global current_line_time

GameSentenceMiner/gsm.py

@@ -13,6 +13,8 @@ def handle_error_in_initialization(e):
         sys.exit(1)
 
 Icon = None
+Menu = None
+MenuItem = None
 
 try:
     import GameSentenceMiner.util.configuration
@@ -34,14 +36,12 @@ try:
     import signal
     import datetime
     from subprocess import Popen
-    os.environ.pop('TCL_LIBRARY', None)
 
     import keyboard
     import ttkbootstrap as ttk
     from PIL import Image
     try:
-        pass
-        # from pystray import Icon, Menu, MenuItem
+        from pystray import Icon, Menu, MenuItem
     except Exception:
         logger.warning("pystray not installed correctly, tray icon will not work.")
     from watchdog.events import FileSystemEventHandler
@@ -562,6 +562,15 @@ gsm_tray = GSMTray()
 def close_obs():
     obs.disconnect_from_obs()
     if obs.obs_process_pid:
+        if is_linux() or is_mac():
+            try:
+                os.kill(obs.obs_process_pid, signal.SIGTERM)
+                print(f"OBS (PID {obs.obs_process_pid}) has been terminated.")
+                if os.path.exists(obs.OBS_PID_FILE):
+                    os.remove(obs.OBS_PID_FILE)
+            except Exception as e:
+                print(f"Error terminating OBS: {e}")
+            return
         try:
             subprocess.run(["taskkill", "/PID", str(obs.obs_process_pid),
                            "/F"], check=True, capture_output=True, text=True)
@@ -704,6 +713,34 @@ def initialize(reloading=False):
         if is_mac():
             if shutil.which("ffmpeg") is None:
                 os.environ["PATH"] += os.pathsep + "/opt/homebrew/bin"
+                
+        # Check for due cron jobs on startup
+        try:
+            from GameSentenceMiner.util.cron.run_crons import run_due_crons
+            logger.info("Checking for due cron jobs...")
+            run_due_crons()
+        except Exception as e:
+            logger.warning(f"Failed to check cron jobs on startup: {e}")
+        
+        # Check if rollup table needs initial population (version upgrade migration)
+        try:
+            from GameSentenceMiner.util.stats_rollup_table import StatsRollupTable
+            from GameSentenceMiner.util.db import GameLinesTable
+            from GameSentenceMiner.util.cron.daily_rollup import run_daily_rollup
+            
+            # Check if we have game lines but no rollup data
+            first_rollup = StatsRollupTable.get_first_date()
+            has_game_lines = GameLinesTable._db.fetchone(
+                f"SELECT COUNT(*) FROM {GameLinesTable._table}"
+            )[0] > 0
+            
+            if has_game_lines and not first_rollup:
+                logger.info("Detected existing data without rollup table - running initial rollup generation...")
+                logger.info("This is a one-time migration for version upgrades. Please wait...")
+                rollup_result = run_daily_rollup()
+                logger.info(f"Initial rollup complete: processed {rollup_result.get('processed', 0)} dates")
+        except Exception as e:
+            logger.warning(f"Failed to check/populate rollup table on startup: {e}")
         if get_config().obs.open_obs:
             obs_process = obs.start_obs()
             # obs.connect_to_obs(start_replay=True)

GameSentenceMiner/locales/en_us.json

@@ -428,6 +428,10 @@
             "label": "Close OBS:",
             "tooltip": "Close OBS when the GSM closes."
           },
+          "obs_path": {
+            "label": "OBS Path:",
+            "tooltip": "Path to the OBS executable. Leave blank to use the default path."
+          },
           "host": {
             "label": "Host:",
             "tooltip": "Host address for the OBS WebSocket server."

GameSentenceMiner/locales/ja_jp.json

@@ -427,6 +427,10 @@
             "label": "OBSを閉じる:",
             "tooltip": "GSM終了時にOBSを閉じます。"
           },
+          "obs_path": {
+            "label": "OBSパス:",
+            "tooltip": "OBS実行ファイルのパス。空欄の場合はデフォルトパスを使用します。"
+          },
           "host": {
             "label": "ホスト:",
             "tooltip": "OBS WebSocketサーバーのホストアドレス。"

GameSentenceMiner/locales/zh_cn.json

@@ -428,6 +428,10 @@
             "label": "关闭 OBS:",
             "tooltip": "GSM 关闭时关闭 OBS。"
           },
+          "obs_path": {
+            "label": "OBS 路径:",
+            "tooltip": "OBS 可执行文件的路径。留空使用默认路径。"
+          },
           "host": {
             "label": "主机:",
             "tooltip": "OBS WebSocket 服务器的主机地址。"

GameSentenceMiner/obs.py

@@ -37,7 +37,7 @@ def get_queued_gui_errors():
 connection_pool: 'OBSConnectionPool' = None
 event_client: obs.EventClient = None
 obs_process_pid = None
-OBS_PID_FILE = os.path.join(configuration.get_app_directory(), 'obs-studio', 'obs_pid.txt')
+OBS_PID_FILE = os.path.join(configuration.get_app_directory(), 'obs_pid.txt')
 obs_connection_manager = None
 logging.getLogger("obsws_python").setLevel(logging.CRITICAL)
 connecting = False
@@ -257,6 +257,9 @@ def get_base_obs_dir():
     return os.path.join(configuration.get_app_directory(), 'obs-studio')
     
 def get_obs_path():
+    config = get_config()
+    if config.obs.obs_path:
+        return config.obs.obs_path
     return os.path.join(configuration.get_app_directory(), 'obs-studio/bin/64bit/obs64.exe')
 
 def is_process_running(pid):