not1mm 24.4.30__tar.gz → 24.5.9__tar.gz

{not1mm-24.4.30 → not1mm-24.5.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.30
+Version: 24.5.9
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -169,6 +169,7 @@ I wish to thank those who've contributed to the project.
 - CQ World Wide SSB
 - CWOps CWT
 - IARU HF
+- ICWC MST
 - Japan International DX CW
 - Japan International DX SSB
 - NAQP CW
@@ -180,24 +181,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-4-30] Allowsending CW via rigctld if your radio supports it.
-- [24-4-27] Cleaned up dark mode code.
-- [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
-- [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
-- [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
-- [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.
-- [24-4-15] checkwindow.py Tighter results. Changed the call selection to use a single click.
-- [24-4-9-4] Check for portaudio instead of crash boom. Removed empty dockwidget. Tested on Plasma 6.
-- [24-4-9-3] Ugh. It's not a real day unless you forget to test.
-- [24-4-9-2] Put back the floatable dock widgets, 'cause Wayland strikes again.
-- [24-4-9-1] Removed DockWidgetFloatable from the dock widgets since my wee brain can't figure out how to add a dragable window frame to them once they are floating. Added a minimum size for the VFO LCD digits. Defaulted bandmap window to the right.
-- [24-4-9] Fixed Checkwindow not showing calls from logged contacts.
-- [24-4-7] Added FT8Watcher class to prep for FT8 support.
-- [24-4-4-1] Made docking widgets open state persistent.
-- [24-4-4] Added per-contest echange hint when adding new contest.
-- [24-4-2] Migrated to PyQt6. I'm sure there are broken things.
-- [24-4-1-2] Added color text indicators to the Check Partial window. Poached the code from @kyleboyle. Thanks! Fixed the Log, VFO and Check Partial windows to be actual docking widgets. Refocus call field after double clicking on item in the check partial window.
-- [24-4-1] Removed some un-needed loops and widgets from the check window. Fixed docking to the left side.
+- [24-5-9] Add ICWC MST.
+- [24-5-1] Moved the voice keying into it's own thread.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 
@@ -229,8 +214,11 @@ noted the minimum steps needed to install not1mm.
 ```bash
 sudo apt update
 sudo apt upgrade
-sudo apt install -y libportaudio2 python3-pip python3-pyqt6 python3-numpy
-pip install -U not1mm
+sudo apt install -y python3-pip python3-numpy libxcb-cursor0 libportaudio2
+python3 -m pip install -U pip
+# Logout and back in
+pip3 install PyQt6
+pip3 install not1mm
 ```
 
 #### Ubuntu 23.04

{not1mm-24.4.30 → not1mm-24.5.9}/README.md

@@ -137,6 +137,7 @@ I wish to thank those who've contributed to the project.
 - CQ World Wide SSB
 - CWOps CWT
 - IARU HF
+- ICWC MST
 - Japan International DX CW
 - Japan International DX SSB
 - NAQP CW
@@ -148,24 +149,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-4-30] Allowsending CW via rigctld if your radio supports it.
-- [24-4-27] Cleaned up dark mode code.
-- [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
-- [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
-- [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
-- [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.
-- [24-4-15] checkwindow.py Tighter results. Changed the call selection to use a single click.
-- [24-4-9-4] Check for portaudio instead of crash boom. Removed empty dockwidget. Tested on Plasma 6.
-- [24-4-9-3] Ugh. It's not a real day unless you forget to test.
-- [24-4-9-2] Put back the floatable dock widgets, 'cause Wayland strikes again.
-- [24-4-9-1] Removed DockWidgetFloatable from the dock widgets since my wee brain can't figure out how to add a dragable window frame to them once they are floating. Added a minimum size for the VFO LCD digits. Defaulted bandmap window to the right.
-- [24-4-9] Fixed Checkwindow not showing calls from logged contacts.
-- [24-4-7] Added FT8Watcher class to prep for FT8 support.
-- [24-4-4-1] Made docking widgets open state persistent.
-- [24-4-4] Added per-contest echange hint when adding new contest.
-- [24-4-2] Migrated to PyQt6. I'm sure there are broken things.
-- [24-4-1-2] Added color text indicators to the Check Partial window. Poached the code from @kyleboyle. Thanks! Fixed the Log, VFO and Check Partial windows to be actual docking widgets. Refocus call field after double clicking on item in the check partial window.
-- [24-4-1] Removed some un-needed loops and widgets from the check window. Fixed docking to the left side.
+- [24-5-9] Add ICWC MST.
+- [24-5-1] Moved the voice keying into it's own thread.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 
@@ -197,8 +182,11 @@ noted the minimum steps needed to install not1mm.
 ```bash
 sudo apt update
 sudo apt upgrade
-sudo apt install -y libportaudio2 python3-pip python3-pyqt6 python3-numpy
-pip install -U not1mm
+sudo apt install -y python3-pip python3-numpy libxcb-cursor0 libportaudio2
+python3 -m pip install -U pip
+# Logout and back in
+pip3 install PyQt6
+pip3 install not1mm
 ```
 
 #### Ubuntu 23.04

{not1mm-24.4.30 → not1mm-24.5.9}/not1mm/__main__.py

@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
 """
-NOT1MM Logger
+not1mm Contest logger
+Email: michael.bridak@gmail.com
+GPL V3
+Purpose: Provides main logging window and a crap ton more.
 """
 # pylint: disable=unused-import, c-extension-no-member, no-member, invalid-name, too-many-lines, no-name-in-module
 # pylint: disable=logging-fstring-interpolation, logging-not-lazy, line-too-long, bare-except
@@ -35,7 +38,6 @@ except OSError as exception:
     print(exception)
     print("portaudio is not installed")
     sd = None
-import soundfile as sf
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QDir, Qt, QThread
 from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor
@@ -75,6 +77,7 @@ from not1mm.checkwindow import CheckWindow
 from not1mm.bandmap import BandMapWindow
 from not1mm.vfo import VfoWindow
 from not1mm.radio import Radio
+from not1mm.voice_keying import Voice
 
 poll_time = datetime.datetime.now()
 
@@ -188,6 +191,7 @@ class MainWindow(QtWidgets.QMainWindow):
     current_palette = None
 
     radio_thread = QThread()
+    voice_thread = QThread()
 
     rig_control = None
     log_window = None
@@ -479,6 +483,18 @@ class MainWindow(QtWidgets.QMainWindow):
         with open(fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8") as c_file:
             self.ctyfile = loads(c_file.read())
         self.readpreferences()
+
+        self.voice_process = Voice()
+        self.voice_process.moveToThread(self.voice_thread)
+        self.voice_thread.started.connect(self.voice_process.run)
+        self.voice_thread.finished.connect(self.voice_process.deleteLater)
+        self.voice_process.ptt_on.connect(self.ptt_on)
+        self.voice_process.ptt_off.connect(self.ptt_off)
+        self.voice_process.current_op = self.current_op
+        self.voice_process.data_path = fsutils.USER_DATA_PATH
+        self.voice_process.sounddevice = self.pref.get("sounddevice", "default")
+        self.voice_thread.start()
+
         self.dbname = fsutils.USER_DATA_PATH / self.pref.get(
             "current_database", "ham.db"
         )
@@ -492,6 +508,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.station = {}
         self.contact = self.database.empty_contact
         self.current_op = self.station.get("Call", "")
+        self.voice_process.current_op = self.current_op
         self.make_op_dir()
         self.read_cw_macros()
         self.clearinputs()
@@ -922,6 +939,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.station is None:
                 self.station = {}
             self.current_op = self.station.get("Call", "")
+            self.voice_process.current_op = self.current_op
             self.make_op_dir()
             cmd = {}
             cmd["cmd"] = "NEWDB"
@@ -958,6 +976,7 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.station.get("Call", "") == "":
                 self.edit_station_settings()
             self.current_op = self.station.get("Call", "")
+            self.voice_process.current_op = self.current_op
             self.make_op_dir()
             cmd = {}
             cmd["cmd"] = "NEWDB"
@@ -1231,6 +1250,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     else:
                         self.cw_speed.hide()
 
+                self.clearinputs()
                 cmd = {}
                 cmd["cmd"] = "NEWDB"
                 cmd["station"] = platform.node()
@@ -1832,6 +1852,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.contact = self.database.empty_contact
         self.heading_distance.setText("")
         self.dx_entity.setText("")
+
         if self.contest:
             mults = self.contest.show_mults(self)
             qsos = self.contest.show_qso(self)
@@ -1840,13 +1861,16 @@ class MainWindow(QtWidgets.QMainWindow):
             score = self.contest.calc_score(self)
             self.score.setText(str(score))
             self.contest.reset_label(self)
+            if self.contest.name != "ICWC Medium Speed Test":
+                if self.current_mode == "CW":
+                    self.sent.setText("599")
+                    self.receive.setText("599")
+                else:
+                    self.sent.setText("59")
+                    self.receive.setText("59")
+            else:
+                self.sent.setText("")
         self.callsign.clear()
-        if self.current_mode == "CW":
-            self.sent.setText("599")
-            self.receive.setText("599")
-        else:
-            self.sent.setText("59")
-            self.receive.setText("59")
         self.other_1.clear()
         self.other_2.clear()
         self.callsign.setFocus()
@@ -2118,6 +2142,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.settings_dialog.close()
         if self.current_op == "":
             self.current_op = self.station.get("Call", "")
+            self.voice_process.current_op = self.current_op
             self.make_op_dir()
         contest_count = self.database.fetch_all_contests()
         if len(contest_count) == 0:
@@ -2199,61 +2224,6 @@ class MainWindow(QtWidgets.QMainWindow):
         )
         return macro
 
-    def voice_string(self, the_string: str) -> None:
-        """
-        voices string using nato phonetics.
-
-        Parameters
-        ----------
-        the_string : str
-        String to voicify.
-
-        Returns
-        -------
-        None
-        """
-
-        logger.debug("Voicing: %s", the_string)
-        if sd is None:
-            logger.warning("Sounddevice/portaudio not installed.")
-            return
-        op_path = fsutils.USER_DATA_PATH / self.current_op
-        if "[" in the_string:
-            sub_string = the_string.strip("[]").lower()
-            filename = f"{str(op_path)}/{sub_string}.wav"
-            if Path(filename).is_file():
-                logger.debug("Voicing: %s", filename)
-                data, _fs = sf.read(filename, dtype="float32")
-                self.ptt_on()
-                try:
-                    sd.default.device = self.pref.get("sounddevice", "default")
-                    sd.default.samplerate = 44100.0
-                    sd.play(data, blocking=False)
-                    # _status = sd.wait()
-                    # https://snyk.io/advisor/python/sounddevice/functions/sounddevice.PortAudioError
-                except sd.PortAudioError as err:
-                    logger.warning("%s", f"{err}")
-
-                self.ptt_off()
-            return
-        self.ptt_on()
-        for letter in the_string.lower():
-            if letter in "abcdefghijklmnopqrstuvwxyz 1234567890":
-                if letter == " ":
-                    letter = "space"
-                filename = f"{str(op_path)}/{letter}.wav"
-                if Path(filename).is_file():
-                    logger.debug("Voicing: %s", filename)
-                    data, _fs = sf.read(filename, dtype="float32")
-                    try:
-                        sd.default.device = self.pref.get("sounddevice", "default")
-                        sd.default.samplerate = 44100.0
-                        sd.play(data, blocking=False)
-                        logger.debug("%s", f"{sd.wait()}")
-                    except sd.PortAudioError as err:
-                        logger.warning("%s", f"{err}")
-        self.ptt_off()
-
     def ptt_on(self) -> None:
         """
         Turn on ptt for rig.
@@ -2285,6 +2255,7 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         None
         """
+
         logger.debug("PTT Off")
         if self.rig_control:
             self.leftdot.setPixmap(self.reddot)
@@ -2309,7 +2280,8 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.n1mm:
             self.n1mm.radio_info["FunctionKeyCaption"] = function_key.text()
         if self.radio_state.get("mode") in ["LSB", "USB", "SSB"]:
-            self.voice_string(self.process_macro(function_key.toolTip()))
+            self.voice_process.voice_string(self.process_macro(function_key.toolTip()))
+            # self.voice_string(self.process_macro(function_key.toolTip()))
             return
         if self.cw:
             if self.pref.get("cwtype") == 3 and self.rig_control is not None:
@@ -3046,15 +3018,16 @@ class MainWindow(QtWidgets.QMainWindow):
         if mode == "CW":
             if self.current_mode != "CW":
                 self.current_mode = "CW"
-                # self.mode.setText("CW")
                 self.sent.setText("599")
                 self.receive.setText("599")
                 self.read_cw_macros()
+                if self.contest:
+                    if self.contest.name == "ICWC Medium Speed Test":
+                        self.contest.prefill(self)
             return
         if mode == "SSB":
             if self.current_mode != "SSB":
                 self.current_mode = "SSB"
-                # self.mode.setText("SSB")
                 self.sent.setText("59")
                 self.receive.setText("59")
                 self.read_cw_macros()
@@ -3062,7 +3035,6 @@ class MainWindow(QtWidgets.QMainWindow):
         if mode == "RTTY":
             if self.current_mode != "RTTY":
                 self.current_mode = "RTTY"
-                # self.mode.setText("RTTY")
                 self.sent.setText("59")
                 self.receive.setText("59")
 
@@ -3103,6 +3075,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
         if self.opon_dialog.NewOperator.text():
             self.current_op = self.opon_dialog.NewOperator.text().upper()
+            self.voice_process.current_op = self.current_op
         self.opon_dialog.close()
         logger.debug("New Op: %s", self.current_op)
         self.make_op_dir()

{not1mm-24.4.30 → not1mm-24.5.9}/not1mm/bandmap.py

@@ -1,8 +1,10 @@
 #!/usr/bin/env python3
 """
-K6GTE Contest logger
+not1mm Contest logger
 Email: michael.bridak@gmail.com
 GPL V3
+Class: BandMapWindow
+Purpose: Onscreen widget to show realtime spots from an AR cluster.
 """
 
 # pylint: disable=unused-import, c-extension-no-member, no-member, invalid-name, too-many-lines

{not1mm-24.4.30 → not1mm-24.5.9}/not1mm/checkwindow.py

@@ -1,6 +1,10 @@
 #!/usr/bin/env python3
 """
-Check Window
+not1mm Contest logger
+Email: michael.bridak@gmail.com
+GPL V3
+Class: CheckWindow
+Purpose: Onscreen widget to show possible matches to callsigns entered in the main window.
 """
 # pylint: disable=no-name-in-module, unused-import, no-member, invalid-name, c-extension-no-member
 # pylint: disable=logging-fstring-interpolation, line-too-long

{not1mm-24.4.30 → not1mm-24.5.9}/not1mm/data/new_contest.ui

@@ -297,6 +297,11 @@
        <string>CWT</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>ICWC MST</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>IARU HF</string>

not1mm-24.5.9/not1mm/lib/playsound.py

@@ -0,0 +1,296 @@
+import logging
+from platform import system
+
+logger = logging.getLogger(__name__)
+
+
+class PlaysoundException(Exception):
+    pass
+
+
+def _canonicalizePath(path):
+    """
+    Support passing in a pathlib.Path-like object by converting to str.
+    """
+    import sys
+
+    if sys.version_info[0] >= 3:
+        return str(path)
+    else:
+        # On earlier Python versions, str is a byte string, so attempting to
+        # convert a unicode string to str will fail. Leave it alone in this case.
+        return path
+
+
+def _playsoundWin(sound, block=True):
+    """
+    Utilizes windll.winmm. Tested and known to work with MP3 and WAVE on
+    Windows 7 with Python 2.7. Probably works with more file formats.
+    Probably works on Windows XP thru Windows 10. Probably works with all
+    versions of Python.
+
+    Inspired by (but not copied from) Michael Gundlach <gundlach@gmail.com>'s mp3play:
+    https://github.com/michaelgundlach/mp3play
+
+    I never would have tried using windll.winmm without seeing his code.
+    """
+    sound = '"' + _canonicalizePath(sound) + '"'
+
+    from ctypes import create_unicode_buffer, windll, wintypes
+
+    windll.winmm.mciSendStringW.argtypes = [
+        wintypes.LPCWSTR,
+        wintypes.LPWSTR,
+        wintypes.UINT,
+        wintypes.HANDLE,
+    ]
+    windll.winmm.mciGetErrorStringW.argtypes = [
+        wintypes.DWORD,
+        wintypes.LPWSTR,
+        wintypes.UINT,
+    ]
+
+    def winCommand(*command):
+        bufLen = 600
+        buf = create_unicode_buffer(bufLen)
+        command = " ".join(command)
+        errorCode = int(
+            windll.winmm.mciSendStringW(command, buf, bufLen - 1, 0)
+        )  # use widestring version of the function
+        if errorCode:
+            errorBuffer = create_unicode_buffer(bufLen)
+            windll.winmm.mciGetErrorStringW(
+                errorCode, errorBuffer, bufLen - 1
+            )  # use widestring version of the function
+            exceptionMessage = (
+                "\n    Error " + str(errorCode) + " for command:"
+                "\n        " + command + "\n    " + errorBuffer.value
+            )
+            logger.error(exceptionMessage)
+            raise PlaysoundException(exceptionMessage)
+        return buf.value
+
+    try:
+        logger.debug("Starting")
+        winCommand("open {}".format(sound))
+        winCommand("play {}{}".format(sound, " wait" if block else ""))
+        logger.debug("Returning")
+    finally:
+        try:
+            winCommand("close {}".format(sound))
+        except PlaysoundException:
+            logger.warning("Failed to close the file: {}".format(sound))
+            # If it fails, there's nothing more that can be done...
+            pass
+
+
+def _handlePathOSX(sound):
+    sound = _canonicalizePath(sound)
+
+    if "://" not in sound:
+        if not sound.startswith("/"):
+            from os import getcwd
+
+            sound = getcwd() + "/" + sound
+        sound = "file://" + sound
+
+    try:
+        # Don't double-encode it.
+        sound.encode("ascii")
+        return sound.replace(" ", "%20")
+    except UnicodeEncodeError:
+        try:
+            from urllib.parse import quote  # Try the Python 3 import first...
+        except ImportError:
+            from urllib import (
+                quote,
+            )  # Try using the Python 2 import before giving up entirely...
+
+        parts = sound.split("://", 1)
+        return parts[0] + "://" + quote(parts[1].encode("utf-8")).replace(" ", "%20")
+
+
+def _playsoundOSX(sound, block=True):
+    """
+    Utilizes AppKit.NSSound. Tested and known to work with MP3 and WAVE on
+    OS X 10.11 with Python 2.7. Probably works with anything QuickTime supports.
+    Probably works on OS X 10.5 and newer. Probably works with all versions of
+    Python.
+
+    Inspired by (but not copied from) Aaron's Stack Overflow answer here:
+    http://stackoverflow.com/a/34568298/901641
+
+    I never would have tried using AppKit.NSSound without seeing his code.
+    """
+    try:
+        from AppKit import NSSound
+    except ImportError:
+        logger.warning(
+            "playsound could not find a copy of AppKit - falling back to using macOS's system copy."
+        )
+        sys.path.append(
+            "/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/PyObjC"
+        )
+        from AppKit import NSSound
+
+    from Foundation import NSURL
+    from time import sleep
+
+    sound = _handlePathOSX(sound)
+    url = NSURL.URLWithString_(sound)
+    if not url:
+        raise PlaysoundException("Cannot find a sound with filename: " + sound)
+
+    for i in range(5):
+        nssound = NSSound.alloc().initWithContentsOfURL_byReference_(url, True)
+        if nssound:
+            break
+        else:
+            logger.debug("Failed to load sound, although url was good... " + sound)
+    else:
+        raise PlaysoundException(
+            "Could not load sound with filename, although URL was good... " + sound
+        )
+    nssound.play()
+
+    if block:
+        sleep(nssound.duration())
+
+
+def _playsoundNix(sound, block=True):
+    """Play a sound using GStreamer.
+
+    Inspired by this:
+    https://gstreamer.freedesktop.org/documentation/tutorials/playback/playbin-usage.html
+    """
+    sound = _canonicalizePath(sound)
+
+    # pathname2url escapes non-URL-safe characters
+    from os.path import abspath, exists
+
+    try:
+        from urllib.request import pathname2url
+    except ImportError:
+        # python 2
+        from urllib import pathname2url
+
+    import gi
+
+    gi.require_version("Gst", "1.0")
+    from gi.repository import Gst
+
+    Gst.init(None)
+
+    playbin = Gst.ElementFactory.make("playbin", "playbin")
+    if sound.startswith(("http://", "https://")):
+        playbin.props.uri = sound
+    else:
+        path = abspath(sound)
+        if not exists(path):
+            raise PlaysoundException("File not found: {}".format(path))
+        playbin.props.uri = "file://" + pathname2url(path)
+
+    set_result = playbin.set_state(Gst.State.PLAYING)
+    if set_result != Gst.StateChangeReturn.ASYNC:
+        raise PlaysoundException("playbin.set_state returned " + repr(set_result))
+
+    # FIXME: use some other bus method than poll() with block=False
+    # https://lazka.github.io/pgi-docs/#Gst-1.0/classes/Bus.html
+    logger.debug("Starting play")
+    if block:
+        bus = playbin.get_bus()
+        try:
+            bus.poll(Gst.MessageType.EOS, Gst.CLOCK_TIME_NONE)
+        finally:
+            playbin.set_state(Gst.State.NULL)
+
+    logger.debug("Finishing play")
+
+
+def _playsoundAnotherPython(otherPython, sound, block=True, macOS=False):
+    """
+    Mostly written so that when this is run on python3 on macOS, it can invoke
+    python2 on macOS... but maybe this idea could be useful on linux, too.
+    """
+    from inspect import getsourcefile
+    from os.path import abspath, exists
+    from subprocess import check_call
+    from threading import Thread
+
+    sound = _canonicalizePath(sound)
+
+    class PropogatingThread(Thread):
+        def run(self):
+            self.exc = None
+            try:
+                self.ret = self._target(*self._args, **self._kwargs)
+            except BaseException as e:
+                self.exc = e
+
+        def join(self, timeout=None):
+            super().join(timeout)
+            if self.exc:
+                raise self.exc
+            return self.ret
+
+    # Check if the file exists...
+    if not exists(abspath(sound)):
+        raise PlaysoundException("Cannot find a sound with filename: " + sound)
+
+    playsoundPath = abspath(getsourcefile(lambda: 0))
+    t = PropogatingThread(
+        target=lambda: check_call(
+            [otherPython, playsoundPath, _handlePathOSX(sound) if macOS else sound]
+        )
+    )
+    t.start()
+    if block:
+        t.join()
+
+
+system = system()
+
+if system == "Windows":
+    playsound = _playsoundWin
+elif system == "Darwin":
+    playsound = _playsoundOSX
+    import sys
+
+    if sys.version_info[0] > 2:
+        try:
+            from AppKit import NSSound
+        except ImportError:
+            logger.warning(
+                "playsound is relying on a python 2 subprocess. Please use `pip3 install PyObjC` if you want playsound to run more efficiently."
+            )
+            playsound = lambda sound, block=True: _playsoundAnotherPython(
+                "/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python",
+                sound,
+                block,
+                macOS=True,
+            )
+else:
+    playsound = _playsoundNix
+    if (
+        __name__ != "__main__"
+    ):  # Ensure we don't infinitely recurse trying to get another python instance.
+        try:
+            import gi
+
+            gi.require_version("Gst", "1.0")
+            from gi.repository import Gst
+        except:
+            logger.warning(
+                "playsound is relying on another python subprocess. Please use `pip install pygobject` if you want playsound to run more efficiently."
+            )
+            playsound = lambda sound, block=True: _playsoundAnotherPython(
+                "/usr/bin/python3", sound, block, macOS=False
+            )
+
+del system
+
+if __name__ == "__main__":
+    # block is always True if you choose to run this from the command line.
+    from sys import argv
+
+    playsound(argv[1])

{not1mm-24.4.30 → not1mm-24.5.9}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.4.30"
+__version__ = "24.5.9"