GameSentenceMiner 2.9.16__py3-none-any.whl → 2.9.18__py3-none-any.whl

GameSentenceMiner/gsm.py

@@ -279,14 +279,14 @@ def play_video_in_external(line, filepath):
 
     command = [get_config().advanced.video_player_path]
 
-    start, _, _, _ = get_video_timings(filepath, line)
+    start, _, _, _ = get_video_timings(new_filepath, line)
 
     if start:
         if "vlc" in get_config().advanced.video_player_path:
             command.extend(["--start-time", convert_to_vlc_seconds(start), '--one-instance'])
         else:
             command.extend(["--start", convert_to_vlc_seconds(start)])
-    command.append(os.path.normpath(filepath))
+    command.append(os.path.normpath(new_filepath))
 
     logger.info(" ".join(command))
 

GameSentenceMiner/obs.py

@@ -29,12 +29,12 @@ class OBSConnectionManager(threading.Thread):
         while self.running:
             time.sleep(1)
             try:
-                if not client or not client.get_version() and not connecting:
-                    logger.info("OBS WebSocket not connected. Attempting to reconnect...")
-                    gsm_status.obs_connected = False
-                    asyncio.run(connect_to_obs())
+                if not connecting:
+                    client.get_version()
             except Exception as e:
-                logger.debug(f"Error checking OBS connection: {e}")
+                logger.info(f"OBS WebSocket not connected. Attempting to reconnect... {e}")
+                gsm_status.obs_connected = False
+                asyncio.run(connect_to_obs())
 
     def stop(self):
         self.running = False

GameSentenceMiner/util/ffmpeg.py

@@ -124,7 +124,7 @@ def get_screenshot_for_line(video_file, game_line, try_selector=False):
     return get_screenshot(video_file, get_screenshot_time(video_file, game_line), try_selector)
 
 
-def get_screenshot_time(video_path, game_line, default_beginning=False, vad_result=None, doing_multi_line=False, previous_line=False):
+def get_screenshot_time(video_path, game_line, default_beginning=False, vad_result=None, doing_multi_line=False, previous_line=False, anki_card_creation_time=0):
     if game_line:
         line_time = game_line.time
     else:
@@ -136,7 +136,10 @@ def get_screenshot_time(video_path, game_line, default_beginning=False, vad_resu
         logger.debug("Calculating screenshot time for line: " + str(game_line.text))
 
     file_length = get_video_duration(video_path)
-    file_mod_time = get_file_modification_time(video_path)
+    if anki_card_creation_time:
+        file_mod_time = anki_card_creation_time
+    else:
+        file_mod_time = get_file_modification_time(video_path)
 
     # Calculate when the line occurred within the video file (seconds from start)
     time_delta = file_mod_time - line_time
@@ -279,6 +282,83 @@ def get_audio_and_trim(video_path, game_line, next_line_time, anki_card_creation
 
     return trim_audio_based_on_last_line(untrimmed_audio, video_path, game_line, next_line_time, anki_card_creation_time)
 
+def get_audio_and_trim_combined(video_path, game_line, next_line_time, anki_card_creation_time):
+    supported_formats = {
+        'opus': 'libopus',
+        'mp3': 'libmp3lame',
+        'ogg': 'libvorbis',
+        'aac': 'aac',
+        'm4a': 'aac',
+    }
+
+    codec = get_audio_codec(video_path)
+    output_extension = get_config().audio.extension
+    output_audio_path = tempfile.NamedTemporaryFile(
+        dir=configuration.get_temporary_directory(),
+        suffix=f".{output_extension}",
+        delete=False
+    ).name
+
+    if codec == output_extension:
+        codec_command = ['-c:a', 'copy']
+        logger.debug(f"Extracting {output_extension} from video (copying)")
+    else:
+        codec_command = ["-c:a", f"{supported_formats[output_extension]}"]
+        logger.debug(f"Re-encoding {codec} to {output_extension}")
+
+    start_trim_time, start_time_float, total_seconds_after_offset, file_length = get_video_timings(video_path, game_line, anki_card_creation_time)
+
+    ffmpeg_command = ffmpeg_base_command_list + [
+        "-ss", str(start_trim_time),
+        "-i", video_path,
+        "-map", "0:a"
+    ]
+
+    end_trim_time_str = ""
+
+    if next_line_time and next_line_time > game_line.time:
+        end_total_seconds = next_line_time + get_config().audio.pre_vad_end_offset
+        hours, remainder = divmod(end_total_seconds, 3600)
+        minutes, seconds = divmod(remainder, 60)
+        end_trim_time_str = "{:02}:{:02}:{:06.3f}".format(int(hours), int(minutes), seconds)
+        ffmpeg_command.extend(['-to', end_trim_time_str])
+        logger.debug(
+            f"Trimming end of audio to {end_trim_time_str} based on next line time.")
+    elif get_config().audio.pre_vad_end_offset is not None and get_config().audio.pre_vad_end_offset < 0:
+        end_total_seconds = file_length + get_config().audio.pre_vad_end_offset
+        end_total_seconds = max(end_total_seconds, start_time_float)
+
+        hours, remainder = divmod(end_total_seconds, 3600)
+        minutes, seconds = divmod(remainder, 60)
+        end_trim_time_str = "{:02}:{:02}:{:06.3f}".format(int(hours), int(minutes), seconds)
+        ffmpeg_command.extend(['-to', end_trim_time_str])
+        logger.debug(f"Trimming end of audio to {end_trim_time_str} due to negative pre-vad end offset.")
+
+    ffmpeg_command.extend(codec_command)
+    ffmpeg_command.append(output_audio_path)
+
+    logger.debug("Executing combined audio extraction and trimming command")
+    logger.debug(" ".join(ffmpeg_command))
+
+    try:
+        subprocess.run(ffmpeg_command, check=True)
+        logger.debug(f"{total_seconds_after_offset} trimmed off of beginning")
+
+        if end_trim_time_str:
+            logger.info(f"Audio Extracted and trimmed to {start_trim_time} seconds with end time {end_trim_time_str}")
+        else:
+            logger.info(f"Audio Extracted and trimmed to {start_trim_time} seconds (to end of file)")
+
+        logger.debug(f"Audio trimmed and saved to {output_audio_path}")
+        return output_audio_path
+    except subprocess.CalledProcessError as e:
+        logger.error(f"FFmpeg command failed: {e}")
+        logger.error(f"Command: {' '.join(ffmpeg_command)}")
+        raise
+    except Exception as e:
+        logger.error(f"An unexpected error occurred: {e}")
+        raise
+
 
 def get_video_duration(file_path):
     ffprobe_command = [
@@ -339,7 +419,7 @@ def trim_audio_based_on_last_line(untrimmed_audio, video_path, game_line, next_l
     return trimmed_audio
 
 def get_video_timings(video_path, game_line, anki_card_creation_time=None):
-    if anki_card_creation_time and get_config().advanced.use_anki_note_creation_time:
+    if anki_card_creation_time:
         file_mod_time = anki_card_creation_time
     else:
         file_mod_time = get_file_modification_time(video_path)

GameSentenceMiner/web/texthooking_page.py

@@ -296,7 +296,6 @@ def play_audio():
 
 @app.route('/get_status', methods=['GET'])
 def get_status():
-    gsm_status.clipboard_enabled
     return jsonify(gsm_status.to_dict()), 200
 
 

{gamesentenceminer-2.9.16.dist-info → gamesentenceminer-2.9.18.dist-info}/METADATA

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

{gamesentenceminer-2.9.16.dist-info → gamesentenceminer-2.9.18.dist-info}/RECORD

@@ -2,8 +2,8 @@ GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 GameSentenceMiner/anki.py,sha256=hNHBIoJRrsWIhLe0sehOYPXTWzPREeXl4gYCPHUCaiE,16331
 GameSentenceMiner/config_gui.py,sha256=iAOLD47sQW67kzBcZKSQ0Dwctc1ngZK1lwSVIaLpQPI,83559
 GameSentenceMiner/gametext.py,sha256=iO1o2980XBzBc2nsgBVr_ZaKHRLotebVpDhwGqBCK9k,6696
-GameSentenceMiner/gsm.py,sha256=j6Y4Nd79Qi09r-Pgt2y3THxeP-yBAfZSFbbsISE9Ah8,29251
-GameSentenceMiner/obs.py,sha256=21GQ4DzjccLc-m4rU5Tfm4E3n1R1U4vRwmIWfKqcjmw,14805
+GameSentenceMiner/gsm.py,sha256=MFptrbACty8wP3dCSb8VLSBmoTsiBUvomJgAcIpBZw4,29259
+GameSentenceMiner/obs.py,sha256=YG8LwBf9BTsGbROm_Uq6LhFDSrbf3jgogp78rBbJq94,14728
 GameSentenceMiner/vad.py,sha256=TbP3NVdjfB1TFJeB0QpOXZysgo_UHHKLdx95pYmM0JI,14902
 GameSentenceMiner/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/ai/ai_prompting.py,sha256=0jBAnngNwmc3dqJiVWe_QRy4Syr-muV-ML2rq0FiUtU,10215
@@ -30,7 +30,7 @@ GameSentenceMiner/owocr/owocr/screen_coordinate_picker.py,sha256=Na6XStbQBtpQUSd
 GameSentenceMiner/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/util/configuration.py,sha256=Wgr1UAf_JoXBlp9h_f3-d2DAmIWnR1FtCmMX6mCfMNM,27461
 GameSentenceMiner/util/electron_config.py,sha256=3VmIrcXhC-wIMMc4uqV85NrNenRl4ZUbnQfSjWEwuig,9852
-GameSentenceMiner/util/ffmpeg.py,sha256=daItJprEqi5PQe-aFb836rls3tBHNqIQKz61vlJK07M,19276
+GameSentenceMiner/util/ffmpeg.py,sha256=Z3lD5jd7P59-aNWIQDgovwmjT1kCo4-7DLxoG_VBU4M,22618
 GameSentenceMiner/util/gsm_utils.py,sha256=Z_Lu4jSIfUaM2VljIJXQkSJD0UsyJ5hMB46H2NS0gZo,8819
 GameSentenceMiner/util/model.py,sha256=iDtLTfR6D-ZC0gCiDqYno6-gA6Z07PZTM4B5MAA6xZI,5704
 GameSentenceMiner/util/notification.py,sha256=0OnEYjn3DUEZ6c6OtPjdVZe-DG-QSoMAl9fetjjCvNU,3874
@@ -45,7 +45,7 @@ GameSentenceMiner/util/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 GameSentenceMiner/util/downloader/download_tools.py,sha256=mvnOjDHFlV1AbjHaNI7mdnC5_CH5k3N4n1ezqzzbzGA,8139
 GameSentenceMiner/util/downloader/oneocr_dl.py,sha256=o3ANp5IodEQoQ8GPcJdg9Y8JzA_lictwnebFPwwUZVk,10144
 GameSentenceMiner/web/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-GameSentenceMiner/web/texthooking_page.py,sha256=kDRNeTz6eIzc9rqrnupAqEmdVF3GuhB1PSgv9azEaAI,15191
+GameSentenceMiner/web/texthooking_page.py,sha256=d3OiPPgxZ4H5wIh9HrlZutDSiwY3ayvMNrY4c0PdRAE,15158
 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
@@ -59,9 +59,9 @@ GameSentenceMiner/web/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 GameSentenceMiner/web/templates/index.html,sha256=HZKiIjiGJV8PGQ9T2aLDUNSfJn71qOwbYCjbRuSIjpY,213583
 GameSentenceMiner/web/templates/text_replacements.html,sha256=tV5c8mCaWSt_vKuUpbdbLAzXZ3ATZeDvQ9PnnAfqY0M,8598
 GameSentenceMiner/web/templates/utility.html,sha256=3flZinKNqUJ7pvrZk6xu__v67z44rXnaK7UTZ303R-8,16946
-gamesentenceminer-2.9.16.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.9.16.dist-info/METADATA,sha256=ybDsHKiVvTzpQUq5v7g8XQa8NKmf0Vl0Pcsuw18DXIo,7221
-gamesentenceminer-2.9.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.9.16.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.9.16.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.9.16.dist-info/RECORD,,
+gamesentenceminer-2.9.18.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.9.18.dist-info/METADATA,sha256=wgfdfg6X6daqvG3SlEiFlFgU_TVV8QPBpmBl57eV-_4,7221
+gamesentenceminer-2.9.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.9.18.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.9.18.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.9.18.dist-info/RECORD,,