GameSentenceMiner 2.8.54__py3-none-any.whl → 2.9.1__py3-none-any.whl

GameSentenceMiner/web/templates/utility.html

@@ -301,10 +301,10 @@
     async function toggleCheckbox(id, checked) {
         try {
             checkboxes_being_updated.add(id);
-            const res = await fetch('/update', {
+            const res = await fetch('/update_checkbox', {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({ id, checked })
+                body: JSON.stringify({ id })
             });
             checkboxes_being_updated.delete(id);
             if (!res.ok) {

GameSentenceMiner/web/texthooking_page.py

@@ -10,11 +10,11 @@ from dataclasses import dataclass
 import flask
 import websockets
 
-from GameSentenceMiner.text_log import GameLine, get_line_by_id, initial_time
+from GameSentenceMiner.text_log import GameLine, get_line_by_id, initial_time, get_all_lines
 from flask import request, jsonify, send_from_directory
 import webbrowser
 from GameSentenceMiner import obs
-from GameSentenceMiner.configuration import logger, get_config, DB_PATH
+from GameSentenceMiner.configuration import logger, get_config, DB_PATH, gsm_state
 from GameSentenceMiner.util import TEXT_REPLACEMENTS_FILE
 
 port = get_config().general.texthooker_port
@@ -52,8 +52,6 @@ class EventItem:
 class EventManager:
     events: list[EventItem]
     events_dict: dict[str, EventItem] = {}
-    line_for_audio: GameLine = None
-    line_for_screenshot: GameLine = None
 
     def __init__(self):
         self.events = []
@@ -100,7 +98,7 @@ class EventManager:
         self.events_dict[line.id] = new_event
         self.events.append(new_event)
         # self.store_to_db(new_event)
-        event_queue.put(new_event)
+        # event_queue.put(new_event)
         return new_event
 
     def reset_checked_lines(self):
@@ -225,11 +223,11 @@ def serve_static(filename):
 
 @app.route('/')
 def index():
-    return flask.render_template('utility.html', websocket_port=websocket_port)
+    return flask.render_template('utility.html' if get_config().general.use_old_texthooker else 'index.html', websocket_port=websocket_port)
 
 @app.route('/texthooker')
 def texthooker():
-    return flask.render_template('utility.html', websocket_port=websocket_port)
+    return flask.render_template('utility.html' if get_config().general.use_old_texthooker else 'index.html', websocket_port=websocket_port)
 
 @app.route('/textreplacements')
 def textreplacements():
@@ -256,16 +254,15 @@ async def add_event_to_texthooker(line: GameLine):
     })
 
 
-@app.route('/update', methods=['POST'])
+@app.route('/update_checkbox', methods=['POST'])
 def update_event():
     data = request.get_json()
     event_id = data.get('id')
-    checked = data.get('checked')
 
-    if event_id is None or checked is None:
-        return jsonify({'error': 'Missing id or checked status'}), 400
-
-    event_manager.get(event_id).checked = checked
+    if event_id is None:
+        return jsonify({'error': 'Missing id'}), 400
+    event = event_manager.get(event_id)
+    event_manager.get(event_id).checked = not event.checked
     return jsonify({'message': 'Event updated successfully'}), 200
 
 @app.route('/get-screenshot', methods=['Post'])
@@ -275,8 +272,11 @@ def get_screenshot():
     event_id = data.get('id')
     if event_id is None:
         return jsonify({'error': 'Missing id'}), 400
-    event_manager.line_for_screenshot = get_line_by_id(event_id)
-    obs.save_replay_buffer()
+    gsm_state.line_for_screenshot = get_line_by_id(event_id)
+    if gsm_state.previous_line_for_screenshot and gsm_state.line_for_screenshot.id == gsm_state.previous_line_for_screenshot.id:
+        open(os.path.join(get_config().paths.folder_to_watch, "previous.mkv"), 'a').close()
+    else:
+        obs.save_replay_buffer()
     return jsonify({}), 200
 
 @app.route('/play-audio', methods=['POST'])
@@ -286,8 +286,11 @@ def play_audio():
     event_id = data.get('id')
     if event_id is None:
         return jsonify({'error': 'Missing id'}), 400
-    event_manager.line_for_audio = get_line_by_id(event_id)
-    obs.save_replay_buffer()
+    gsm_state.line_for_audio = get_line_by_id(event_id)
+    if gsm_state.previous_line_for_audio and gsm_state.line_for_audio == gsm_state.previous_line_for_audio:
+        open(os.path.join(get_config().paths.folder_to_watch, "previous.mkv"), 'a').close()
+    else:
+        obs.save_replay_buffer()
     return jsonify({}), 200
 
 
@@ -319,8 +322,8 @@ async def websocket_handler(websocket):
 
 async def broadcast_message(message):
     if connected_clients:
-        tasks = [client.send(json.dumps(message)) for client in connected_clients]
-        await asyncio.gather(*tasks)
+        for client in connected_clients:
+            await client.send(json.dumps(message))
 
 # async def main():
 #     async with websockets.serve(websocket_handler, "localhost", 8765): # Choose a port for WebSocket
@@ -356,7 +359,12 @@ def are_lines_selected():
     return any(item.checked for item in event_manager)
 
 def reset_checked_lines():
+    async def send_reset_message():
+        await broadcast_message({
+            'event': 'reset_checkboxes',
+        })
     event_manager.reset_checked_lines()
+    asyncio.run(send_reset_message())
 
 def open_texthooker():
     webbrowser.open(url + '/texthooker')
@@ -373,19 +381,30 @@ def start_web_server():
 
     app.run(port=port, debug=False) # debug=True provides helpful error messages during development
 
-async def run_websocket_server(host="0.0.0.0", port=55001):
-    global websocket_port
-    while True:
-        websocket_port = port
-        try:
-            async with websockets.serve(websocket_handler, host, port):
-                logger.debug(f"WebSocket server started at ws://{host}:{port}/")
-                await asyncio.Future()  # Keep the WebSocket server running
-        except OSError as e:
-            logger.debug(f"Port {port} is in use. Trying the next port...")
-            port += 1
+import signal
 
+async def run_websocket_server(host="0.0.0.0"):
+    global websocket_port
+    websocket = None
+    try:
+        websocket_port = get_config().advanced.texthooker_communication_websocket_port
+        websocket = await websockets.serve(websocket_handler, host, websocket_port)
+        logger.debug(f"WebSocket server started at ws://{host}:{websocket_port}/")
+        await asyncio.Future()  # Keep the server running
+    except asyncio.CancelledError:
+        logger.info("WebSocket server shutting down...")
+    except OSError as e:
+        logger.error(f"TextHooker WebSocket server failed to start on port {websocket_port}: {e}")
+        logger.info("You may need to try a different port in GSM's advanced config, and then update that in the Texthooker's settings.")
+    finally:
+        if websocket:
+            websocket.close()
+        await asyncio.sleep(1)  # Wait before retrying
 
+def handle_exit_signal(loop):
+    logger.info("Received exit signal. Shutting down...")
+    for task in asyncio.all_tasks(loop):
+        task.cancel()
 
 async def texthooker_page_coro():
     # Run the WebSocket server in the asyncio event loop
@@ -397,7 +416,10 @@ async def texthooker_page_coro():
     await run_websocket_server()
 
 def run_text_hooker_page():
-    asyncio.run(texthooker_page_coro())
+    try:
+        asyncio.run(texthooker_page_coro())
+    except KeyboardInterrupt:
+        logger.info("Shutting down due to KeyboardInterrupt.")
 
 if __name__ == '__main__':
-    asyncio.run(run_text_hooker_page())
+    asyncio.run(texthooker_page_coro())

{gamesentenceminer-2.8.54.dist-info → gamesentenceminer-2.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.8.54
+Version: 2.9.1
 Summary: A tool for mining sentences from games. Update: Multi-Line Mining! Fixed!
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License
@@ -38,6 +38,7 @@ Requires-Dist: pygetwindow; sys_platform == "win32"
 Requires-Dist: flask
 Requires-Dist: groq
 Requires-Dist: obsws-python
+Requires-Dist: Flask-SocketIO
 Dynamic: license-file
 
 # GameSentenceMiner (GSM)
@@ -152,6 +153,8 @@ If you encounter issues, please ask for help in my [Discord](https://discord.gg/
 
 * [OBS](https://obsproject.com/) and [FFMPEG](https://ffmpeg.org/), without which GSM would not be possible.
 
+* [Renji's Texthooker](https://github.com/Renji-XD/texthooker-ui)
+
 ## Donations
 
 If you've found this or any of my other projects helpful, please consider supporting my work through [GitHub Sponsors](https://github.com/sponsors/bpwhelan) or [Ko-fi](https://ko-fi.com/beangate).

{gamesentenceminer-2.8.54.dist-info → gamesentenceminer-2.9.1.dist-info}/RECORD

@@ -1,24 +1,24 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/anki.py,sha256=bChJ1YU80muhvR8fjY9KAJEs0M0bpe-X_uMhjJBUC4k,14530
-GameSentenceMiner/config_gui.py,sha256=vwW569M-ZQPZEkprluDuKlPRoYTm2UMs2nPMDZtlorE,77472
-GameSentenceMiner/configuration.py,sha256=EMqtnK9jHFmCht2vi3dsDRekidr3pIfdyZ-ycmH6aOg,22539
+GameSentenceMiner/anki.py,sha256=JnVfFkLpEfWaPfOLngU0PSQq4vrgWuhd_VLYZEBqNTY,14608
+GameSentenceMiner/config_gui.py,sha256=h4zz85gfhxSphaJ-IZSu9D4jR70mDlKecZ9JRCO5Noc,80927
+GameSentenceMiner/configuration.py,sha256=8CfdTJ0ROJrxyzNg3NaElAVS1bwchg1ih6XfhfDZy1g,25492
 GameSentenceMiner/electron_config.py,sha256=dGcPYCISPehXubYSzsDuI2Gl092MYK0u3bTnkL9Jh1Y,9787
-GameSentenceMiner/ffmpeg.py,sha256=DX-2J1KZBKOPC8syR73YhDHwKIR4oNPrGuPl4l8is-4,18255
-GameSentenceMiner/gametext.py,sha256=hcyZQ69B7xB5ZG85wLzM5au7ZPKxmeUXsmUD26oyk_0,5660
-GameSentenceMiner/gsm.py,sha256=-76Gyrk2m9Hqobt6YByvV_sw1BI9xH_B9l0-aFAxBvc,27629
+GameSentenceMiner/ffmpeg.py,sha256=zVmLJOsXpy71zKb0cLBPrXJ6YpjPVRJmH0uRfd5O30k,18299
+GameSentenceMiner/gametext.py,sha256=32e7w0qGXYNRRNpLzj9XIwtuto-E6ogEcyl6DC_MPbw,6200
+GameSentenceMiner/gsm.py,sha256=_Mp_gZFomeFz9FTZqYEXIgqxbICYcAB06KUlFkClX5Q,29831
 GameSentenceMiner/model.py,sha256=1lRyJFf_LND_4O16h8CWVqDfosLgr0ZS6ufBZ3qJHpY,5699
 GameSentenceMiner/notification.py,sha256=pXKoLfmRQLH55IQ5G6uxdMuczqX7D6l3ubVEY1e6hXg,2859
-GameSentenceMiner/obs.py,sha256=JwcVPnjO-Lm0H5007o3rF-gMf4ypgIm5m8ntthfbTk8,14789
+GameSentenceMiner/obs.py,sha256=DoUJk00Gk0Idley7CEldfIobqJ9na2UBlCv7nclZO4s,14793
 GameSentenceMiner/obs_back.py,sha256=_N_UV7Nh5cyy3mnH5lOUOzhgZwHMACeFEuBo1Z-bNzg,10894
 GameSentenceMiner/package.py,sha256=YlS6QRMuVlm6mdXx0rlXv9_3erTGS21jaP3PNNWfAH0,1250
 GameSentenceMiner/ss_selector.py,sha256=csey9H3561-guRJcT6gQN6hXxvylP0CBI0dp2-kwo2Q,4446
-GameSentenceMiner/text_log.py,sha256=MD7LB5D-v4G0Bnm3uGvZQ0aV38Fcj4E0vgq7mmyQ7_4,5157
+GameSentenceMiner/text_log.py,sha256=U2_g8THAYeexRiE2bLk_bCt_2ShiA8SQ9VdJsi4riHs,5181
 GameSentenceMiner/util.py,sha256=PrDNnxWiJZh1lGuwnp3DjWIlwbkVxweRTYWLtQk94Ao,9122
 GameSentenceMiner/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/ai/ai_prompting.py,sha256=xw8et6XNwQiDXOXZnw8iIntVSg8lni4YYZbgWsK7qDE,10013
 GameSentenceMiner/communication/__init__.py,sha256=_jGn9PJxtOAOPtJ2rI-Qu9hEHVZVpIvWlxKvqk91_zI,638
 GameSentenceMiner/communication/send.py,sha256=X0MytGv5hY-uUvkfvdCqQA_ljZFmV6UkJ6in1TA1bUE,217
-GameSentenceMiner/communication/websocket.py,sha256=pTcUe_ZZRp9REdSU4qalhPmbT_1DKa7w18j6RfFLELA,3074
+GameSentenceMiner/communication/websocket.py,sha256=8eFZaTtoFggEPdqw2Jl4zqHC2I7J3-Gk27CxVX7SyBo,3277
 GameSentenceMiner/downloader/Untitled_json.py,sha256=RUUl2bbbCpUDUUS0fP0tdvf5FngZ7ILdA_J5TFYAXUQ,15272
 GameSentenceMiner/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/downloader/download_tools.py,sha256=aRfpCqEmKUFRVsGipwY-7PhY6AeWiFJanW4ZCB9e2iE,8124
@@ -27,21 +27,23 @@ GameSentenceMiner/ocr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 GameSentenceMiner/ocr/gsm_ocr_config.py,sha256=fEQ2o2NXksGRHpueO8c4TfAp75GEdAtAr1ngTFOsdpg,2257
 GameSentenceMiner/ocr/ocrconfig.py,sha256=_tY8mjnzHMJrLS8E5pHqYXZjMuLoGKYgJwdhYgN-ny4,6466
 GameSentenceMiner/ocr/owocr_area_selector.py,sha256=Q8ETMHL7BKMA1mbtjrntDLyqCQB0lZ5T4RCZsodjH7Y,47186
-GameSentenceMiner/ocr/owocr_helper.py,sha256=EMdq8jga3kKx8u19LSgqwnZIhR8_YDMqydACVzojUDo,17726
+GameSentenceMiner/ocr/owocr_helper.py,sha256=M4Is-Ki5O3r4ixYhILibfjrVGD6xDlOcR3YvVGmETQ4,17363
 GameSentenceMiner/owocr/owocr/__init__.py,sha256=opjBOyGGyEqZCE6YdZPnyt7nVfiwyELHsXA0jAsjm14,25
 GameSentenceMiner/owocr/owocr/__main__.py,sha256=XQaqZY99EKoCpU-gWQjNbTs7Kg17HvBVE7JY8LqIE0o,157
 GameSentenceMiner/owocr/owocr/config.py,sha256=qM7kISHdUhuygGXOxmgU6Ef2nwBShrZtdqu4InDCViE,8103
 GameSentenceMiner/owocr/owocr/lens_betterproto.py,sha256=oNoISsPilVVRBBPVDtb4-roJtAhp8ZAuFTci3TGXtMc,39141
-GameSentenceMiner/owocr/owocr/ocr.py,sha256=rtKoIonyzqAMRPK92GvfYgGsU5M2yIWcWz9MQngNstc,41602
+GameSentenceMiner/owocr/owocr/ocr.py,sha256=V0HqVRQlaE1-12IH480IupfSv1BlDdEcwNPejhQZfS0,42292
 GameSentenceMiner/owocr/owocr/run.py,sha256=0UyjOKEP0MqSdCaagCUMGdqO-BMexPxCl7ZabGlic4E,54749
 GameSentenceMiner/owocr/owocr/screen_coordinate_picker.py,sha256=Na6XStbQBtpQUSdbN3QhEswtKuU1JjReFk_K8t5ezQE,3395
 GameSentenceMiner/vad/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/vad/result.py,sha256=C08HsYH4qVjTRh_dvrWrskmXHJ950w0GWxPjGx_BfGY,275
-GameSentenceMiner/vad/silero_trim.py,sha256=InYsCy29WjK5EIB4e-KYb91rdHLCc5ZGbKtn9W5WmZI,2021
-GameSentenceMiner/vad/vosk_helper.py,sha256=3ea8P6SoXG2wOkqesFWPOsHfJNmyYTaQWsr_QLU-jZo,6467
-GameSentenceMiner/vad/whisper_helper.py,sha256=H4bmEMgUXYl_CxpYUcDa2hWGUy4vOVXZBoWhh5fwvaY,4015
+GameSentenceMiner/vad/groq_trim.py,sha256=MDYiApduwF7oDx3r0TXL3xQrTkbUC1RinMwNKSbF5gw,3764
+GameSentenceMiner/vad/result.py,sha256=aFlr2px90fn3qXj49dwF9BDXA5m4yXD_HYH01CVvP1U,799
+GameSentenceMiner/vad/silero_trim.py,sha256=ACvIdfjeCku6XWeUdi1zThBDvynJ01gjMFpSPWQALjg,2240
+GameSentenceMiner/vad/vad_utils.py,sha256=_YC6rW2eXSBeLnYbVl_F3na1KCRL90VrnOzKYJ9RhUE,391
+GameSentenceMiner/vad/vosk_helper.py,sha256=h7yNHrzrzT-J74UniA0T2ZX8cHqhflCzwyDjoIdKLO4,6479
+GameSentenceMiner/vad/whisper_helper.py,sha256=B64-Eq_ZMCIyQX_A8uvYz-c48hSXJAyz6tSXNRaLjtA,4020
 GameSentenceMiner/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/web/texthooking_page.py,sha256=t58PCfqwnJ197CtIUbGbE_cOyNkR81e4oi84VayTj5g,13497
+GameSentenceMiner/web/texthooking_page.py,sha256=alXNkpm2Kl-ewYIm_aw24_8RdcYedLB59y6YTkp_mrE,14789
 GameSentenceMiner/web/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/web/static/apple-touch-icon.png,sha256=OcMI8af_68DA_tweOsQ5LytTyMwm7-hPW07IfrOVgEs,46132
 GameSentenceMiner/web/static/favicon-96x96.png,sha256=lOePzjiKl1JY2J1kT_PMdyEnrlJmi5GWbmXJunM12B4,16502
@@ -52,11 +54,12 @@ GameSentenceMiner/web/static/style.css,sha256=bPZK0NVMuyRl5NNDuT7ZTzVLKlvSsdmeVH
 GameSentenceMiner/web/static/web-app-manifest-192x192.png,sha256=EfSNnBmsSaLfESbkGfYwbKzcjKOdzuWo18ABADfN974,51117
 GameSentenceMiner/web/static/web-app-manifest-512x512.png,sha256=wyqgCWCrLEUxSRXmaA3iJEESd-vM-ZmlTtZFBY4V8Pk,230819
 GameSentenceMiner/web/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+GameSentenceMiner/web/templates/index.html,sha256=HZKiIjiGJV8PGQ9T2aLDUNSfJn71qOwbYCjbRuSIjpY,213583
 GameSentenceMiner/web/templates/text_replacements.html,sha256=tV5c8mCaWSt_vKuUpbdbLAzXZ3ATZeDvQ9PnnAfqY0M,8598
-GameSentenceMiner/web/templates/utility.html,sha256=1vN3nK3IT-iNhMEj-k6JRz9uc6D87UUL9k7Bp2Espiw,16946
-gamesentenceminer-2.8.54.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.8.54.dist-info/METADATA,sha256=X0Z7tHSkYajYiuz7HggBwRxQz93YJAiLFVjlHl_bhsQ,7218
-gamesentenceminer-2.8.54.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-gamesentenceminer-2.8.54.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.8.54.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.8.54.dist-info/RECORD,,
+GameSentenceMiner/web/templates/utility.html,sha256=3flZinKNqUJ7pvrZk6xu__v67z44rXnaK7UTZ303R-8,16946
+gamesentenceminer-2.9.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.9.1.dist-info/METADATA,sha256=3SHKdq8q35tQXbi0x_4zQAekXgVPf-le5kKpSmdfSHY,7314
+gamesentenceminer-2.9.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+gamesentenceminer-2.9.1.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.9.1.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.9.1.dist-info/RECORD,,

{gamesentenceminer-2.8.54.dist-info → gamesentenceminer-2.9.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any