GameSentenceMiner 2.19.13__py3-none-any.whl → 2.19.15__py3-none-any.whl

GameSentenceMiner/gsm.py

@@ -12,8 +12,14 @@ def handle_error_in_initialization(e):
         logger.info("Exiting due to initialization error.")
         sys.exit(1)
 
+Icon = None
 
 try:
+    import GameSentenceMiner.util.configuration
+    from GameSentenceMiner.util.configuration import logger, gsm_state, get_config, anki_results, AnkiUpdateResult, \
+    get_temporary_directory, get_log_path, get_master_config, switch_profile_and_save, get_app_directory, gsm_status, \
+    is_windows, is_linux, get_ffmpeg_path, is_mac
+    
     import asyncio
     import os
     import shutil
@@ -33,16 +39,16 @@ try:
     import keyboard
     import ttkbootstrap as ttk
     from PIL import Image
-    from pystray import Icon, Menu, MenuItem
+    try:
+        pass
+        # from pystray import Icon, Menu, MenuItem
+    except Exception:
+        logger.warning("pystray not installed correctly, tray icon will not work.")
     from watchdog.events import FileSystemEventHandler
     from watchdog.observers import Observer
     import psutil
 
     start_time = time.time()
-    import GameSentenceMiner.util.configuration
-    from GameSentenceMiner.util.configuration import logger, gsm_state, get_config, anki_results, AnkiUpdateResult, \
-    get_temporary_directory, get_log_path, get_master_config, switch_profile_and_save, get_app_directory, gsm_status, \
-    is_windows, is_linux, get_ffmpeg_path
 
     logger.debug(f"[Import] configuration: {time.time() - start_time:.3f}s")
     
@@ -443,9 +449,15 @@ class GSMTray(threading.Thread):
         self.icon = None
 
     def run(self):
+        if not Icon:
+            logger.warning("Tray icon functionality is not available.")
+            return
         self.run_tray()
 
     def run_tray(self):
+        if not Icon:
+            logger.warning("Tray icon functionality is not available.")
+            return
         def run_anki_confirmation_window():
             settings_window.show_anki_confirmation_dialog(expression="こんにちは",
                 sentence="こんにちは、世界！元気ですか？",
@@ -475,6 +487,8 @@ class GSMTray(threading.Thread):
 
     def update_icon(self, profile=None):
         global menu, icon
+        if not self.icon:
+            return
         # Recreate the menu with the updated button text
         profile_menu = Menu(
             *[MenuItem(("Active: " if profile == get_master_config().current_profile else "") + profile, self.switch_profile) for
@@ -496,6 +510,8 @@ class GSMTray(threading.Thread):
         self.icon.update_menu()
 
     def switch_profile(self, icon, item):
+        if not self.icon:
+            return
         if "Active:" in item.text:
             logger.error("You cannot switch to the currently active profile!")
             return
@@ -509,11 +525,15 @@ class GSMTray(threading.Thread):
             send_restart_signal()
 
     def play_pause(self, icon, item):
+        if not self.icon:
+            return
         global obs_paused, menu
         obs.toggle_replay_buffer()
         self.update_icon()
 
     def stop(self):
+        if not self.icon:
+            return
         if self.icon:
             self.icon.stop()
 
@@ -681,6 +701,9 @@ def initialize(reloading=False):
             if shutil.which("ffmpeg") is None:
                 os.environ["PATH"] += os.pathsep + \
                     os.path.dirname(get_ffmpeg_path())
+        if is_mac():
+            if shutil.which("ffmpeg") is None:
+                os.environ["PATH"] += os.pathsep + "/opt/homebrew/bin"
         if get_config().obs.open_obs:
             obs_process = obs.start_obs()
             # obs.connect_to_obs(start_replay=True)
@@ -861,13 +884,15 @@ async def async_main(reloading=False):
         try:
             if get_config().general.open_config_on_startup:
                 root.after(50, settings_window.show)
-            root.after(50, gsm_tray.start)
+            if Icon:
+                root.after(50, gsm_tray.start)
             # root.after(100, settings_window.show_anki_confirmation_dialog(expression="こんにちは",
             #     sentence="こんにちは、世界！元気ですか？",
             #     screenshot_path="test_image.png",
             #     audio_path="C:/path/to/my/audio.mp3",
             #     translation="Hello world! How are you?"))
-            settings_window.add_save_hook(gsm_tray.update_icon)
+            if Icon:
+                settings_window.add_save_hook(gsm_tray.update_icon)
             settings_window.add_save_hook(on_config_changed)
             settings_window.on_exit = exit_program
             root.mainloop()

GameSentenceMiner/util/configuration.py

@@ -89,6 +89,9 @@ def is_linux():
 def is_windows():
     return platform == 'win32'
 
+def is_mac():
+    return platform == 'darwin'
+
 
 class Locale(Enum):
     English = 'en_us'
@@ -1394,10 +1397,22 @@ is_beangate = os.path.exists("C:/Users/Beangate")
 
 
 def get_ffmpeg_path():
-    return os.path.join(get_app_directory(), "ffmpeg", "ffmpeg.exe") if is_windows() else "ffmpeg"
+    path = os.path.join(get_app_directory(), "ffmpeg", "ffmpeg.exe") if is_windows() else "ffmpeg"
+    if shutil.which(path) is not None:
+        return path
+    elif is_mac():
+        if shutil.which("/opt/homebrew/bin/ffmpeg") is not None:
+            return "/opt/homebrew/bin/ffmpeg"
+    return path
 
 def get_ffprobe_path():
-    return os.path.join(get_app_directory(), "ffmpeg", "ffprobe.exe") if is_windows() else "ffprobe"
+    path = os.path.join(get_app_directory(), "ffmpeg", "ffprobe.exe") if is_windows() else "ffprobe"
+    if shutil.which(path) is not None:
+        return path
+    elif is_mac():
+        if shutil.which("/opt/homebrew/bin/ffprobe") is not None:
+            return "/opt/homebrew/bin/ffprobe"
+    return path
 
 ffmpeg_base_command_list = [get_ffmpeg_path(), "-hide_banner", "-loglevel", "error", '-nostdin']
 

{gamesentenceminer-2.19.13.dist-info → gamesentenceminer-2.19.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GameSentenceMiner
-Version: 2.19.13
+Version: 2.19.15
 Summary: A tool for mining sentences from games. Update: Dependencies, replay buffer based line searching, and bug fixes.
 Author-email: Beangate <bpwhelan95@gmail.com>
 License: MIT License

{gamesentenceminer-2.19.13.dist-info → gamesentenceminer-2.19.15.dist-info}/RECORD

@@ -1,7 +1,7 @@
 GameSentenceMiner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/anki.py,sha256=SvmkL-7AqMKtCWfgwyxALvEHBOoxmQabi_uSYahf5nU,29982
 GameSentenceMiner/gametext.py,sha256=4PPm7QSWDmvsyooVjFANkd1Vnoy5ixbGRMHfYfhwGs0,13320
-GameSentenceMiner/gsm.py,sha256=N4m3tqesHkwkgLeOAlBvzwCYiy2INNZ85maZWCdglUM,36186
+GameSentenceMiner/gsm.py,sha256=3jmcW5NZ8VDsGgwr_RaWEcTtd_HdBSA-smdtAeGbZlo,36938
 GameSentenceMiner/obs.py,sha256=UB4_OJ-vZQbHyuupB8JmwhSFdYyQX_5f5TpRXU1D7Kk,43300
 GameSentenceMiner/vad.py,sha256=iMSsoUZ7-aNoWKzDKfOHdB3Zk5U2hV7x5hqTny6rj08,21501
 GameSentenceMiner/ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,7 +42,7 @@ GameSentenceMiner/ui/furigana_filter_preview.py,sha256=DAT2-j6vSDHr9ufk6PiaLikEs
 GameSentenceMiner/ui/screenshot_selector.py,sha256=MnR1MZWRUeHXCFTHc5ACK3WS08f9MUK5fJ6IQEGdCEY,9127
 GameSentenceMiner/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 GameSentenceMiner/util/audio_player.py,sha256=-yFsf0qoTSS1ga5rCmEJZJGUSJzXCvfZHY3t0NxycDk,7896
-GameSentenceMiner/util/configuration.py,sha256=X6AFueDXi-HabDCGf8u44Z1rPO8XR6Wal3SvGz7hcbI,48806
+GameSentenceMiner/util/configuration.py,sha256=lmk0CEGbu-wFU40O-1X8MvLZNNpNT3g1apghgOjidCM,49265
 GameSentenceMiner/util/db.py,sha256=iCHUzlgOJgNjQ5-oDa7gnDWmzdlEryOzbXfn9ToQPfY,33034
 GameSentenceMiner/util/electron_config.py,sha256=KfeJToeFFVw0IR5MKa-gBzpzaGrU-lyJbR9z-sDEHYU,8767
 GameSentenceMiner/util/ffmpeg.py,sha256=KZhoVVCGnlPIoVJ83XVQmjHDnzO4WefZRoLyceS6pEE,40100
@@ -135,9 +135,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.19.13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-gamesentenceminer-2.19.13.dist-info/METADATA,sha256=IfL5PQ5pFr7zYNl2dNtx3F7S0cG5U0jCdq7A4oNtL04,8187
-gamesentenceminer-2.19.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-gamesentenceminer-2.19.13.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
-gamesentenceminer-2.19.13.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
-gamesentenceminer-2.19.13.dist-info/RECORD,,
+gamesentenceminer-2.19.15.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+gamesentenceminer-2.19.15.dist-info/METADATA,sha256=94chKcRdmWWf6N4BGCli2xQNrNFOLpEHLuGTBvtX_bM,8187
+gamesentenceminer-2.19.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+gamesentenceminer-2.19.15.dist-info/entry_points.txt,sha256=2APEP25DbfjSxGeHtwBstMH8mulVhLkqF_b9bqzU6vQ,65
+gamesentenceminer-2.19.15.dist-info/top_level.txt,sha256=V1hUY6xVSyUEohb0uDoN4UIE6rUZ_JYx8yMyPGX4PgQ,18
+gamesentenceminer-2.19.15.dist-info/RECORD,,