GameSentenceMiner 2.13.10__tar.gz → 2.13.12__tar.gz

{gamesentenceminer-2.13.10 → gamesentenceminer-2.13.12}/GameSentenceMiner/gsm.py

@@ -53,7 +53,7 @@ try:
     from GameSentenceMiner.util.text_log import GameLine, get_text_event, get_mined_line, get_all_lines, game_log
     from GameSentenceMiner.util import *
     from GameSentenceMiner.web import texthooking_page
-    from GameSentenceMiner.web.service import handle_texthooker_button
+    from GameSentenceMiner.web.service import handle_texthooker_button, set_get_audio_from_video_callback
     from GameSentenceMiner.web.texthooking_page import run_text_hooker_page
 except Exception as e:
     from GameSentenceMiner.util.configuration import logger, is_linux, is_windows
@@ -91,10 +91,10 @@ class VideoToAudioHandler(FileSystemEventHandler):
         selected_lines = []
         anki_card_creation_time = None
         mined_line = None
-        gsm_state.previous_replay = video_path
+        start_time = 0
+        end_time = 0
         if gsm_state.line_for_audio or gsm_state.line_for_screenshot:
-            handle_texthooker_button(
-                video_path, get_audio_from_video=VideoToAudioHandler.get_audio)
+            handle_texthooker_button(video_path)
             return
         try:
             if anki.card_queue and len(anki.card_queue) > 0:
@@ -201,16 +201,14 @@ class VideoToAudioHandler(FileSystemEventHandler):
             logger.debug(
                 f"Some error was hit catching to allow further work to be done: {e}", exc_info=True)
             notification.send_error_no_anki_update()
-        finally:
-            if get_config().paths.remove_video and video_path and not skip_delete:
-                try:
-                    if os.path.exists(video_path):
-                        logger.debug(f"Removing video: {video_path}")
-                        os.remove(video_path)
-                except Exception as e:
-                    logger.error(
-                        f"Error removing video file {video_path}: {e}", exc_info=True)
-            pass
+        if get_config().paths.remove_video and video_path and not skip_delete:
+            try:
+                if os.path.exists(video_path):
+                    logger.debug(f"Removing video: {video_path}")
+                    os.remove(video_path)
+            except Exception as e:
+                logger.error(
+                    f"Error removing video file {video_path}: {e}", exc_info=True)
 
     @staticmethod
     def get_audio(game_line, next_line_time, video_path, anki_card_creation_time=None, temporary=False, timing_only=False, mined_line=None):
@@ -525,6 +523,7 @@ def handle_exit():
 def initialize(reloading=False):
     global obs_process
     if not reloading:
+        get_temporary_directory(delete=True)
         if is_windows():
             download_obs_if_needed()
             download_ffmpeg_if_needed()
@@ -538,6 +537,7 @@ def initialize(reloading=False):
         # gametext.start_text_monitor()
         os.makedirs(get_config().paths.folder_to_watch, exist_ok=True)
         os.makedirs(get_config().paths.output_folder, exist_ok=True)
+        set_get_audio_from_video_callback(VideoToAudioHandler.get_audio)
     initial_checks()
     register_websocket_message_handler(handle_websocket_message)
     # if get_config().vad.do_vad_postprocessing:

{gamesentenceminer-2.13.10 → gamesentenceminer-2.13.12}/GameSentenceMiner/util/configuration.py

@@ -843,7 +843,7 @@ def get_log_path():
 
 temp_directory = ''
 
-def get_temporary_directory(delete=True):
+def get_temporary_directory(delete=False):
     global temp_directory
     if not temp_directory:
         temp_directory = os.path.join(get_app_directory(), 'temp')

{gamesentenceminer-2.13.10 → gamesentenceminer-2.13.12}/GameSentenceMiner/util/ffmpeg.py

@@ -117,7 +117,7 @@ def get_screenshot(video_file, screenshot_timing, try_selector=False):
             get_temporary_directory(),
             f"{obs.get_current_game(sanitize=True)}.png"))
         ffmpeg_command = ffmpeg_base_command_list + [
-            "-ss", f"{screenshot_timing}",  # Default to 1 second
+            "-ss", f"{screenshot_timing}",
             "-i", video_file,
             "-vframes", "1",
             output_image
@@ -222,7 +222,7 @@ def process_image(image_file):
                 break
     except Exception as e:
         logger.error(f"Error re-encoding screenshot: {e}. Defaulting to standard PNG.")
-        output_image = make_unique_file_name(get_temporary_directory(), f"{obs.get_current_game(sanitize=True)}.png")
+        output_image = make_unique_file_name(os.path.join(get_temporary_directory(), f"{obs.get_current_game(sanitize=True)}.png"))
         shutil.move(image_file, output_image)
 
     logger.info(f"Processed image saved to: {output_image}")
@@ -303,21 +303,21 @@ def trim_audio_based_on_last_line(untrimmed_audio, video_path, game_line, next_l
                                                 suffix=f".{get_config().audio.extension}").name
     start_trim_time, total_seconds, total_seconds_after_offset, file_length = get_video_timings(video_path, game_line, anki_card_creation_time)
     end_trim_time = 0
+    end_trim_seconds = 0
 
     ffmpeg_command = ffmpeg_base_command_list + [
         "-i", untrimmed_audio,
         "-ss", str(start_trim_time)]
     if next_line and next_line > game_line.time:
-        end_total_seconds = total_seconds + (next_line - game_line.time).total_seconds() + get_config().audio.pre_vad_end_offset
-        end_trim_time = f"{end_total_seconds:.3f}"
+        end_trim_seconds = total_seconds + (next_line - game_line.time).total_seconds() + get_config().audio.pre_vad_end_offset
+        end_trim_time = f"{end_trim_seconds:.3f}"
         ffmpeg_command.extend(['-to', end_trim_time])
         logger.debug(
             f"Looks Like this is mining from History, or Multiple Lines were selected Trimming end of audio to {end_trim_time} seconds")
     elif get_config().audio.pre_vad_end_offset and get_config().audio.pre_vad_end_offset < 0:
-        end_total_seconds = file_length + get_config().audio.pre_vad_end_offset
-        end_trim_time = f"{end_total_seconds:.3f}"
-        ffmpeg_command.extend(['-to', end_trim_time])
-        logger.debug(f"Trimming end of audio to {end_trim_time} seconds due to pre-vad end offset")
+        end_trim_seconds = file_length + get_config().audio.pre_vad_end_offset
+        ffmpeg_command.extend(['-to', str(end_trim_seconds)])
+        logger.debug(f"Trimming end of audio to {end_trim_seconds} seconds due to pre-vad end offset")
 
     ffmpeg_command.extend([
         "-c", "copy",  # Using copy to avoid re-encoding, adjust if needed
@@ -326,18 +326,18 @@ def trim_audio_based_on_last_line(untrimmed_audio, video_path, game_line, next_l
 
     logger.debug(" ".join(ffmpeg_command))
     subprocess.run(ffmpeg_command)
-    gsm_state.previous_trim_args = (untrimmed_audio, start_trim_time, end_trim_time)
+    gsm_state.previous_trim_args = (untrimmed_audio, start_trim_time, end_trim_seconds)
 
     logger.debug(f"{total_seconds_after_offset} trimmed off of beginning")
 
-    if end_trim_time:
-        logger.info(f"Audio Extracted and trimmed to {start_trim_time} seconds with end time {end_trim_time}")
+    if end_trim_seconds:
+        logger.info(f"Audio Extracted and trimmed to {start_trim_time} seconds with end time {end_trim_seconds} seconds")
     else:
         logger.info(f"Audio Extracted and trimmed to {start_trim_time} seconds")
         
     
     logger.debug(f"Audio trimmed and saved to {trimmed_audio}")
-    return trimmed_audio, start_trim_time, end_trim_time
+    return trimmed_audio, start_trim_time, end_trim_seconds
 
 def get_video_timings(video_path, game_line, anki_card_creation_time=None):
     if anki_card_creation_time:

{gamesentenceminer-2.13.10 → gamesentenceminer-2.13.12}/GameSentenceMiner/web/service.py

@@ -11,7 +11,12 @@ from GameSentenceMiner.util.ffmpeg import get_video_timings
 from GameSentenceMiner.util.text_log import GameLine
 
 
-def handle_texthooker_button(video_path='', get_audio_from_video=None):
+def set_get_audio_from_video_callback(func):
+    global get_audio_from_video
+    get_audio_from_video = func
+
+
+def handle_texthooker_button(video_path=''):
     try:
         if gsm_state.line_for_audio:
             line: GameLine = gsm_state.line_for_audio

{gamesentenceminer-2.13.10 → gamesentenceminer-2.13.12}/GameSentenceMiner/web/texthooking_page.py

@@ -52,6 +52,7 @@ class EventItem:
             'history': self.history,
         }
 
+
 class EventManager:
     events: list[EventItem]
     events_dict: dict[str, EventItem] = {}
@@ -87,7 +88,8 @@ class EventManager:
             event_id, line_id, text, timestamp = row
             timestamp = datetime.datetime.fromisoformat(timestamp)
             line = GameLine(line_id, text, timestamp, None, None, 0)
-            event = EventItem(line, event_id, text, timestamp, False, timestamp < initial_time)
+            event = EventItem(line, event_id, text, timestamp,
+                              False, timestamp < initial_time)
             self.events.append(event)
             self.ids.append(event_id)
             self.events_dict[event_id] = event
@@ -99,7 +101,8 @@ class EventManager:
         self.events = new_events
 
     def add_gameline(self, line: GameLine):
-        new_event = EventItem(line, line.id, line.text, line.time, False, False)
+        new_event = EventItem(line, line.id, line.text,
+                              line.time, False, False)
         self.events_dict[line.id] = new_event
         self.ids.append(line.id)
         self.events.append(new_event)
@@ -130,12 +133,16 @@ class EventManager:
             self.conn.close()
 
     def clear_history(self):
-        self.cursor.execute("DELETE FROM events WHERE time < ?", (initial_time.isoformat(),))
+        self.cursor.execute("DELETE FROM events WHERE time < ?",
+                            (initial_time.isoformat(),))
         logger.info(f"Cleared history before {initial_time.isoformat()}")
         self.conn.commit()
         # Clear the in-memory events as well
-        event_manager.events = [event for event in event_manager if not event.history]
-        event_manager.events_dict = {event.id: event for event in event_manager.events}
+        event_manager.events = [
+            event for event in event_manager if not event.history]
+        event_manager.events_dict = {
+            event.id: event for event in event_manager.events}
+
 
 class EventProcessor(threading.Thread):
     def __init__(self, event_queue, db_path):
@@ -173,6 +180,7 @@ class EventProcessor(threading.Thread):
         if self.conn:
             self.conn.close()
 
+
 event_manager = EventManager()
 event_queue = queue.Queue()
 
@@ -185,6 +193,8 @@ server_start_time = datetime.datetime.now().timestamp()
 app = flask.Flask(__name__)
 
 # Load data from the JSON file
+
+
 def load_data_from_file():
     if os.path.exists(TEXT_REPLACEMENTS_FILE):
         with open(TEXT_REPLACEMENTS_FILE, 'r', encoding='utf-8') as file:
@@ -192,10 +202,13 @@ def load_data_from_file():
     return {"enabled": True, "args": {"replacements": {}}}
 
 # Save data to the JSON file
+
+
 def save_data_to_file(data):
     with open(TEXT_REPLACEMENTS_FILE, 'w', encoding='utf-8') as file:
         json.dump(data, file, indent=4, ensure_ascii=False)
 
+
 @app.route('/load-data', methods=['GET'])
 def load_data():
     try:
@@ -204,6 +217,7 @@ def load_data():
     except Exception as e:
         return jsonify({"error": f"Failed to load data: {str(e)}"}), 500
 
+
 @app.route('/save-data', methods=['POST'])
 def save_data():
     try:
@@ -217,40 +231,49 @@ def save_data():
     except Exception as e:
         return jsonify({"error": f"Failed to save data: {str(e)}"}), 500
 
+
 def inject_server_start_time(html_content, timestamp):
     placeholder = '<script>'
     replacement = f'<script>const serverStartTime = {timestamp};'
     return html_content.replace(placeholder, replacement)
 
+
 @app.route('/favicon.ico')
 def favicon():
     return send_from_directory(os.path.join(app.root_path, 'static'),
                                'favicon.ico', mimetype='image/vnd.microsoft.icon')
 
+
 @app.route('/<path:filename>')
 def serve_static(filename):
     return send_from_directory('pages', filename)
 
+
 @app.route('/')
 def index():
     return send_from_directory('templates', 'index.html')
 
+
 @app.route('/texthooker')
 def texthooker():
     return send_from_directory('templates', 'index.html')
 
+
 @app.route('/textreplacements')
 def textreplacements():
     return flask.render_template('text_replacements.html')
 
+
 @app.route('/data', methods=['GET'])
 def get_data():
     return jsonify([event.to_dict() for event in event_manager])
 
+
 @app.route('/get_ids', methods=['GET'])
 def get_ids():
     return jsonify(event_manager.get_ids())
 
+
 @app.route('/clear_history', methods=['POST'])
 def clear_history():
     temp_em = EventManager()
@@ -268,8 +291,8 @@ async def add_event_to_texthooker(line: GameLine):
     })
     if get_config().advanced.plaintext_websocket_port:
         await plaintext_websocket_server_thread.send_text(line.text)
-        
-        
+
+
 async def send_word_coordinates_to_overlay(boxes):
     if boxes and len(boxes) > 0 and overlay_server_thread:
         await overlay_server_thread.send_text(boxes)
@@ -286,6 +309,7 @@ def update_event():
     event_manager.get(event_id).checked = not event.checked
     return jsonify({'message': 'Event updated successfully'}), 200
 
+
 @app.route('/get-screenshot', methods=['Post'])
 def get_screenshot():
     """Endpoint to get a screenshot of the current game screen."""
@@ -294,12 +318,13 @@ def get_screenshot():
     if event_id is None:
         return jsonify({'error': 'Missing id'}), 400
     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 or gsm_state.previous_line_for_audio:
+    if gsm_state.previous_line_for_screenshot and gsm_state.line_for_screenshot == gsm_state.previous_line_for_screenshot or gsm_state.previous_line_for_audio and gsm_state.line_for_screenshot == gsm_state.previous_line_for_audio:
         handle_texthooker_button(gsm_state.previous_replay)
     else:
         obs.save_replay_buffer()
     return jsonify({}), 200
 
+
 @app.route('/play-audio', methods=['POST'])
 def play_audio():
     """Endpoint to play audio for a specific event."""
@@ -307,13 +332,16 @@ def play_audio():
     event_id = data.get('id')
     if event_id is None:
         return jsonify({'error': 'Missing id'}), 400
+    print(f"Playing audio for event ID: {event_id}")
     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 or gsm_state.previous_line_for_screenshot:
+    print(f"gsm_state.line_for_audio: {gsm_state.line_for_audio}")
+    if gsm_state.previous_line_for_audio and gsm_state.line_for_audio == gsm_state.previous_line_for_audio or gsm_state.previous_line_for_screenshot and gsm_state.line_for_audio == gsm_state.previous_line_for_screenshot:
         handle_texthooker_button(gsm_state.previous_replay)
     else:
         obs.save_replay_buffer()
     return jsonify({}), 200
 
+
 @app.route("/translate-line", methods=['POST'])
 def translate_line():
     data = request.get_json()
@@ -362,9 +390,11 @@ def get_status():
 def get_selected_lines():
     return [item.line for item in event_manager if item.checked]
 
+
 def are_lines_selected():
     return any(item.checked for item in event_manager)
 
+
 def reset_checked_lines():
     async def send_reset_message():
         await websocket_server_thread.send_text({
@@ -373,9 +403,11 @@ def reset_checked_lines():
     event_manager.reset_checked_lines()
     asyncio.run(send_reset_message())
 
+
 def open_texthooker():
     webbrowser.open(url + '/texthooker')
 
+
 def start_web_server():
     logger.debug("Starting web server...")
     import logging
@@ -386,7 +418,8 @@ def start_web_server():
     if get_config().general.open_multimine_on_startup:
         open_texthooker()
 
-    app.run(host='0.0.0.0', port=port, debug=False) # debug=True provides helpful error messages during development
+    # debug=True provides helpful error messages during development
+    app.run(host='0.0.0.0', port=port, debug=False)
 
 
 websocket_queue = queue.Queue()
@@ -445,7 +478,7 @@ class WebsocketServerThread(threading.Thread):
                 text = json.dumps(text)
             return asyncio.run_coroutine_threadsafe(
                 self.send_text_coroutine(text), self.loop)
-            
+
     def has_clients(self):
         return len(self.clients) > 0
 
@@ -467,24 +500,30 @@ class WebsocketServerThread(threading.Thread):
                         await stop_event.wait()
                     return
                 except Exception as e:
-                    logger.warning(f"WebSocket server encountered an error: {e}. Retrying...")
+                    logger.warning(
+                        f"WebSocket server encountered an error: {e}. Retrying...")
                     await asyncio.sleep(1)
 
         asyncio.run(main())
 
+
 def handle_exit_signal(loop):
     logger.info("Received exit signal. Shutting down...")
     for task in asyncio.all_tasks(loop):
         task.cancel()
-        
-websocket_server_thread = WebsocketServerThread(read=True, get_ws_port_func=lambda : get_config().get_field_value('advanced', 'texthooker_communication_websocket_port'))
+
+
+websocket_server_thread = WebsocketServerThread(read=True, get_ws_port_func=lambda: get_config(
+).get_field_value('advanced', 'texthooker_communication_websocket_port'))
 websocket_server_thread.start()
 
 if get_config().advanced.plaintext_websocket_port:
-    plaintext_websocket_server_thread = WebsocketServerThread(read=False, get_ws_port_func=lambda : get_config().get_field_value('advanced', 'plaintext_websocket_port'))
+    plaintext_websocket_server_thread = WebsocketServerThread(
+        read=False, get_ws_port_func=lambda: get_config().get_field_value('advanced', 'plaintext_websocket_port'))
     plaintext_websocket_server_thread.start()
-    
-overlay_server_thread = WebsocketServerThread(read=False, get_ws_port_func=lambda : get_config().get_field_value('wip', 'overlay_websocket_port'))
+
+overlay_server_thread = WebsocketServerThread(
+    read=False, get_ws_port_func=lambda: get_config().get_field_value('wip', 'overlay_websocket_port'))
 overlay_server_thread.start()
 
 websocket_server_threads = [
@@ -493,6 +532,7 @@ websocket_server_threads = [
     overlay_server_thread
 ]
 
+
 async def texthooker_page_coro():
     global websocket_server_thread, plaintext_websocket_server_thread, overlay_server_thread
     # Run the WebSocket server in the asyncio event loop
@@ -502,11 +542,13 @@ async def texthooker_page_coro():
 
     # Keep the main asyncio event loop running (for the WebSocket server)
 
+
 def run_text_hooker_page():
     try:
         asyncio.run(texthooker_page_coro())
     except KeyboardInterrupt:
         logger.info("Shutting down due to KeyboardInterrupt.")
 
+
 if __name__ == '__main__':
-    asyncio.run(texthooker_page_coro())
+    asyncio.run(texthooker_page_coro())

{gamesentenceminer-2.13.10 → gamesentenceminer-2.13.12}/GameSentenceMiner.egg-info/PKG-INFO

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

{gamesentenceminer-2.13.10 → gamesentenceminer-2.13.12}/PKG-INFO

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

{gamesentenceminer-2.13.10 → gamesentenceminer-2.13.12}/pyproject.toml

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