pumaguard 20.post235__py3-none-any.whl → 20.post241__py3-none-any.whl

pumaguard/server.py

@@ -272,7 +272,7 @@ class FolderObserver:
                 sound_file_path = os.path.join(
                     self.presets.sound_path, self.presets.deterrent_sound_file
                 )
-                playsound(sound_file_path)
+                playsound(sound_file_path, self.presets.volume)
         # Move original file into classification folder
         try:
             dest_root = (

pumaguard/sound.py

@@ -2,22 +2,155 @@
 Sounds
 """
 
+import logging
 import subprocess
 import sys
+import threading
+from typing import Optional
 
+logger = logging.getLogger(__name__)
 
-def playsound(soundfile: str):
+# Global variable to track the current playing process
+_current_process: Optional[subprocess.Popen] = None
+_process_lock = threading.Lock()
+
+
+def playsound(soundfile: str, volume: int = 80, blocking: bool = True):
     """
-    Play a sound file.
+    Play a sound file with specified volume.
+
+    Args:
+        soundfile: Path to the sound file to play
+        volume: Volume level from 0-100 (default: 80)
+        blocking: If True, wait for sound to finish. If False, return
+        immediately (default: True)
     """
+    global _current_process  # pylint: disable=global-statement
+
+    logger.info(
+        "playsound called: file=%s, volume=%d, blocking=%s",
+        soundfile,
+        volume,
+        blocking,
+    )
+
+    # mpg123 -f flag scales output samples (soft gain)
+    # Default/normal is 32768 (100%)
+    # Valid range: 0 to much higher than 32768
+    # Convert 0-100 percentage to mpg123 scale:
+    # 0% = 0 (muted), 100% = 32768 (normal), 200% = 65536 (double)
+    # Linear scaling: mpg123_volume = (volume / 100) * 32768
+    mpg123_volume = int((volume / 100.0) * 32768)
+
+    logger.debug(
+        "Volume conversion: %d%% -> mpg123 scale %d", volume, mpg123_volume
+    )
+
     try:
-        subprocess.run(["mpg123", "-o", "alsa", soundfile], check=True)
-    except subprocess.CalledProcessError as e:
+        with _process_lock:
+            # Stop any currently playing sound
+            if _current_process is not None:
+                try:
+                    _current_process.terminate()
+                    _current_process.wait(timeout=1)
+                except (subprocess.TimeoutExpired, ProcessLookupError):
+                    pass
+                _current_process = None
+
+            # Start new process
+            # pylint: disable=consider-using-with
+            cmd = ["mpg123", "-o", "alsa", "-f", str(mpg123_volume), soundfile]
+            logger.info("Executing command: %s", " ".join(cmd))
+
+            _current_process = subprocess.Popen(
+                cmd,
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+            )
+
+            logger.info(
+                "Sound playback started, PID: %d", _current_process.pid
+            )
+
+            if blocking:
+                # Wait for completion
+                _current_process.wait()
+                _current_process = None
+
+    except subprocess.SubprocessError as e:
+        logger.error("Error playing soundfile %s: %s", soundfile, e)
         print(f"Error playing soundfile {soundfile}: {e}")
+        with _process_lock:
+            _current_process = None
+
+
+def stop_sound():
+    """
+    Stop any currently playing sound.
+
+    Returns:
+        bool: True if a sound was stopped, False if nothing was playing
+    """
+    global _current_process  # pylint: disable=global-statement
+
+    with _process_lock:
+        if _current_process is not None:
+            try:
+                logger.info(
+                    "Stopping sound playback, PID: %d", _current_process.pid
+                )
+                _current_process.terminate()
+                _current_process.wait(timeout=1)
+                logger.info("Sound playback stopped successfully")
+                return True
+            except (subprocess.TimeoutExpired, ProcessLookupError):
+                try:
+                    _current_process.kill()
+                    _current_process.wait(timeout=1)
+                except (subprocess.TimeoutExpired, ProcessLookupError):
+                    pass
+                return True
+            finally:
+                _current_process = None
+        return False
+
+
+def is_playing():
+    """
+    Check if a sound is currently playing.
+
+    Returns:
+        bool: True if a sound is currently playing, False otherwise
+    """
+    global _current_process  # pylint: disable=global-statement
+
+    with _process_lock:
+        if _current_process is not None:
+            # Check if process is still running
+            if _current_process.poll() is None:
+                return True
+            # Process finished, clean up
+            _current_process = None
+        return False
 
 
 def main():
     """
     Main entry point.
     """
-    playsound(sys.argv[1])
+    if len(sys.argv) < 2:
+        print("Usage: pumaguard-sound <soundfile> [volume]")
+        sys.exit(1)
+
+    volume = 80
+    if len(sys.argv) >= 3:
+        try:
+            volume = int(sys.argv[2])
+            if volume < 0 or volume > 100:
+                print("Volume must be between 0 and 100")
+                sys.exit(1)
+        except ValueError:
+            print("Volume must be an integer")
+            sys.exit(1)
+
+    playsound(sys.argv[1], volume)

pumaguard/web_routes/settings.py

@@ -26,7 +26,9 @@ from pumaguard.model_downloader import (
     verify_file_checksum,
 )
 from pumaguard.sound import (
+    is_playing,
     playsound,
+    stop_sound,
 )
 
 if TYPE_CHECKING:
@@ -64,6 +66,8 @@ def register_settings_routes(app: "Flask", webui: "WebUI") -> None:
                 "deterrent-sound-file",
                 "file-stabilization-extra-wait",
                 "play-sound",
+                "volume",
+                "camera-url",
             ]
 
             if len(data) == 0:
@@ -71,9 +75,18 @@ def register_settings_routes(app: "Flask", webui: "WebUI") -> None:
 
             for key, value in data.items():
                 if key in allowed_settings:
-                    logger.debug("Updating %s with %s", key, value)
+                    logger.info(
+                        "Updating setting %s with value %s", key, value
+                    )
                     attr_name = key.replace("-", "_").replace("YOLO_", "yolo_")
                     setattr(webui.presets, attr_name, value)
+                    # Log verification of volume setting
+                    if key == "volume":
+                        logger.info(
+                            "Volume setting updated to %d, verified: %d",
+                            value,
+                            webui.presets.volume,
+                        )
                 else:
                     logger.debug("Skipping unknown/read-only setting: %s", key)
 
@@ -82,7 +95,11 @@ def register_settings_routes(app: "Flask", webui: "WebUI") -> None:
                 settings_dict = dict(webui.presets)
                 with open(filepath, "w", encoding="utf-8") as f:
                     yaml.dump(settings_dict, f, default_flow_style=False)
-                logger.info("Settings updated and saved to %s", filepath)
+                logger.info(
+                    "Settings updated and saved to %s (volume: %d)",
+                    filepath,
+                    webui.presets.volume,
+                )
             except YAMLError:
                 logger.exception("Error saving settings")
                 return (
@@ -151,19 +168,65 @@ def register_settings_routes(app: "Flask", webui: "WebUI") -> None:
                     404,
                 )
 
-            # Play the sound
-            logger.info("Testing sound playback: %s", sound_file_path)
-            playsound(sound_file_path)
+            # Play the sound with configured volume (non-blocking)
+            volume = webui.presets.volume
+            logger.info(
+                "Testing sound playback: file=%s, volume=%d",
+                sound_file_path,
+                volume,
+            )
+            logger.debug(
+                "Current presets.volume value before playsound: %d",
+                webui.presets.volume,
+            )
+            playsound(sound_file_path, volume, blocking=False)
             return jsonify(
                 {
                     "success": True,
-                    "message": f"Sound played: {sound_file}",
+                    "message": f"Sound started: {sound_file}",
                 }
             )
         except Exception as e:  # pylint: disable=broad-except
             logger.exception("Error testing sound")
             return jsonify({"error": str(e)}), 500
 
+    @app.route("/api/settings/stop-sound", methods=["POST"])
+    def stop_test_sound():
+        """Stop the currently playing test sound."""
+        try:
+            stopped = stop_sound()
+            if stopped:
+                logger.info("Sound playback stopped")
+                return jsonify(
+                    {
+                        "success": True,
+                        "message": "Sound stopped",
+                    }
+                )
+            return jsonify(
+                {
+                    "success": True,
+                    "message": "No sound was playing",
+                }
+            )
+        except Exception as e:  # pylint: disable=broad-except
+            logger.exception("Error stopping sound")
+            return jsonify({"error": str(e)}), 500
+
+    @app.route("/api/settings/sound-status", methods=["GET"])
+    def get_sound_status():
+        """Check if a sound is currently playing."""
+        try:
+            playing = is_playing()
+            return jsonify(
+                {
+                    "playing": playing,
+                }
+            )
+        except Exception as e:  # pylint: disable=broad-except
+            logger.exception("Error checking sound status")
+            return jsonify({"error": str(e)}), 500
+
     @app.route("/api/models/available", methods=["GET"])
     def get_available_models():
         """Get list of available models with cache status.
@@ -261,3 +324,14 @@ def register_settings_routes(app: "Flask", webui: "WebUI") -> None:
         except Exception as e:  # pylint: disable=broad-except
             logger.exception("Error getting available sounds")
             return jsonify({"error": str(e)}), 500
+
+    @app.route("/api/camera/url", methods=["GET"])
+    def get_camera_url():
+        """Get the configured camera URL."""
+        try:
+            camera_url = webui.presets.camera_url
+            logger.info("Camera URL requested: '%s'", camera_url)
+            return jsonify({"camera_url": camera_url})
+        except Exception as e:  # pylint: disable=broad-except
+            logger.exception("Error getting camera URL")
+            return jsonify({"error": str(e)}), 500

{pumaguard-20.post235.dist-info → pumaguard-20.post241.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pumaguard
-Version: 20.post235
+Version: 20.post241
 Author-email: Nicolas Bock <nicolasbock@gmail.com>
 Project-URL: Homepage, http://pumaguard.rtfd.io/
 Project-URL: Repository, https://github.com/PEEC-Nature-Youth-Group/pumaguard

{pumaguard-20.post235.dist-info → pumaguard-20.post241.dist-info}/RECORD

@@ -5,9 +5,9 @@ pumaguard/main.py,sha256=1Wazv1wjwb46yNlqgWt88HQwKSxGmY24X5OsUv8gYyE,7029
 pumaguard/model-registry.yaml,sha256=V-pTaqJrk_jJo568okBDaVhs51qTHttSqKe6PqdX6Bc,10318
 pumaguard/model_cli.py,sha256=nzDv0lXSvRKpLxs579tiHInJPPV-AFO4jzeLk5t2GaA,1394
 pumaguard/model_downloader.py,sha256=zJQgCMOF2AfhB30VsfOMYtgRxcxVxkZBAdtG8KznPyY,12895
-pumaguard/presets.py,sha256=fr3zK_c--x10rMJs8IyAxsp2dx3Qqm5tLMifjWJCGas,26915
-pumaguard/server.py,sha256=gpn1Lco61OO0IPYzG5eWQ4BaxfIpMFN-AwpBip5csSQ,14684
-pumaguard/sound.py,sha256=VKkU1jepPxSps9uAVbLSyy4blMBNlIaDGP8jMc5xHp4,383
+pumaguard/presets.py,sha256=2owFBEqpeAjrFLSYtF9o3wQCc8aDjpwnU5j_YXSyIZ0,27757
+pumaguard/server.py,sha256=zmzSXabt6K26u8kwBPdm1gI6aMAwJo3gCaSaX5Sh0vk,14705
+pumaguard/sound.py,sha256=1qIV4NFOtyRfiIpFTnjbm_hYdNw54bGjMnopeHj_bhM,4633
 pumaguard/stats.py,sha256=ZwocfnFCQ-ky7me-YTTrEoJqsIHOWAgSzeoJHItsIU4,927
 pumaguard/utils.py,sha256=w1EgOLSZGyjq_b49hvVZhBESy-lVP0yRtNHe-sXBoIU,19735
 pumaguard/verify.py,sha256=vfw3PRzDt1uuH5FKV9F5vb1PH7KQ6AEgVNhJ6jck_hQ,5513
@@ -22,14 +22,14 @@ pumaguard/pumaguard-ui/flutter.js,sha256=7V1ZIKmGiouT15CpquQWWmKWJyjUq77FoU9gDXP
 pumaguard/pumaguard-ui/flutter_bootstrap.js,sha256=RYi4PhelQMs063sa3jCr0BLWDMAzY7lKs-ksCptkaQM,9692
 pumaguard/pumaguard-ui/flutter_service_worker.js,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pumaguard/pumaguard-ui/index.html,sha256=901-ZY0WysVAZWPwj2xGatoezwm9TX9IV_jpMrlsaXg,1205
-pumaguard/pumaguard-ui/main.dart.js,sha256=84-Hk8TaSE_Ryab3pKBqZ5PmA2VJgM34cN8rkQJenQU,2673763
+pumaguard/pumaguard-ui/main.dart.js,sha256=bBi_d1lU0e1KUqxMHhoIPxfk61C_ldiDNbhswY0oDtU,2727495
 pumaguard/pumaguard-ui/manifest.json,sha256=Hhnw_eLUivdrOlL7O9KGBsGXCKKt3lix17Fh3GB0g-s,920
 pumaguard/pumaguard-ui/version.json,sha256=uXZ6musTJUZaO0N2bEbr3cy9rpx2aesAS2YFMcu2WF8,94
 pumaguard/pumaguard-ui/assets/AssetManifest.bin,sha256=Qzp1G9iPlHSW-PnHyszTxZO31_NjmTlvSBWY_REPH_8,562
 pumaguard/pumaguard-ui/assets/AssetManifest.bin.json,sha256=_6pfLT_4Bcd6SkcHE6GNc8Uoh6UyL4dxCaK7bypu5lc,754
 pumaguard/pumaguard-ui/assets/FontManifest.json,sha256=TbzXC0njmfIhJ8D_sqF4P6NGmuI9BBSOl8AzaY-zNMo,598
-pumaguard/pumaguard-ui/assets/NOTICES,sha256=36KDhv5JjUTHLHSv3M-zMkJyjezJjCQB-20DGbpx7JM,1372380
-pumaguard/pumaguard-ui/assets/fonts/MaterialIcons-Regular.otf,sha256=R8-aO9K-VgimZR7FNPwS9yffsSwG_MlvUwqMEcH0Syg,10768
+pumaguard/pumaguard-ui/assets/NOTICES,sha256=pXK1o4s9viUW6snqVEqfZsFJa-43d8tCPzyBAanqn0I,1383980
+pumaguard/pumaguard-ui/assets/fonts/MaterialIcons-Regular.otf,sha256=_jHTXqz97mq6qdprZetBY0OYMj2DjhQS8g7hSNZS9X4,11092
 pumaguard/pumaguard-ui/assets/fonts/Roboto-Bold.ttf,sha256=YfifjbSSYcL2EG6NzMNd97L37ZCQINtAo_yQXpX5kzQ,514260
 pumaguard/pumaguard-ui/assets/fonts/Roboto-Light.ttf,sha256=Ao-EOxmQukbiocTvG4JynE2pqUaw2djb9Z5iPRCV5FQ,518580
 pumaguard/pumaguard-ui/assets/fonts/Roboto-Medium.ttf,sha256=KHml7Lf7-hOn_D4s3X_sv3OqRekbVB39-ixELu0KrCE,511592
@@ -62,9 +62,9 @@ pumaguard/web_routes/diagnostics.py,sha256=EIIbjuixJyGXdnVQf8RQ6xQxJar0UHZO8dF-9
 pumaguard/web_routes/directories.py,sha256=yy5TghCEyB4reRGAcVHIEfr2vlHnuiDChIXl9ZFquRM,2410
 pumaguard/web_routes/folders.py,sha256=Z63ap6dRi6NWye70HYurpCnsSXmFgzTbTsFKYdZ1Bjk,6305
 pumaguard/web_routes/photos.py,sha256=Tac_CbaZSeZzOfaJ73vlp3iyZbvfD7ei1YM3tsb0nTY,5106
-pumaguard/web_routes/settings.py,sha256=kVkKdaBLitKCGJiePlv34H_-E0yu_HUC3Wnxxynw5QU,8982
+pumaguard/web_routes/settings.py,sha256=kjSqoX6E38UJ_J_YZRQr7QmACR7bDwFcUarqnowjHP4,11655
 pumaguard/web_routes/sync.py,sha256=Zvv6VARGE5xP29C5gWH3ul81PISRxoF8n472DITItE0,6378
-pumaguard-20.post235.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pumaguard-20.post241.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 pumaguard-sounds/cougar_call.mp3,sha256=jdPzi7Qneect3ez2G6XAeHWtetU5vSOSB6pceuB26Wc,129048
 pumaguard-sounds/cougarsounds.wav,sha256=hwVmmQ75dkOP3qd07YAvVOSm1neYtxLSzxw3Ulvs2cM,96346
 pumaguard-sounds/dark-engine-logo-141942.mp3,sha256=Vw-qyLTMPJZvsgQcZtH0DpGcP1dd7nJq-9BnHuNPGug,372819
@@ -82,8 +82,8 @@ pumaguard-sounds/mixkit-vintage-telephone-ringtone-1356.wav,sha256=zWWY2uFF0-l7P
 pumaguard-sounds/pumaguard-warning.mp3,sha256=wcCfHsulPo5P5s8MjpQAG2NYHQDsRpjqoMig1-o_MDI,232249
 pumaguard-sounds/short-round-110940.mp3,sha256=vdskGD94SeH1UJyJyR0Ek_7xGXPIZfnPdoBvxGnUt98,450816
 pumaguard-ui/ios/Flutter/ephemeral/flutter_lldb_helper.py,sha256=Bc_jl3_e5ZPvrSBJpPYtN05VxpztyKq-7lVms3rLg4Q,1276
-pumaguard-20.post235.dist-info/METADATA,sha256=7wGqQJ4BRlKsixUzRZXjE-EXc2vDDyrAQQDCrsJjaig,8618
-pumaguard-20.post235.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pumaguard-20.post235.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
-pumaguard-20.post235.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
-pumaguard-20.post235.dist-info/RECORD,,
+pumaguard-20.post241.dist-info/METADATA,sha256=em3o9el8uRwvvg1VIsOwJb83VHgNnf7IxQKjURJnB2I,8618
+pumaguard-20.post241.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pumaguard-20.post241.dist-info/entry_points.txt,sha256=rmCdBTPWrbJQvPPwABSVobXE9D7hrKsITGZ6nvCrko8,127
+pumaguard-20.post241.dist-info/top_level.txt,sha256=B-PzS4agkQNhOYbLLIrMVOyMD_pl5F-yujPBm5zYYjY,40
+pumaguard-20.post241.dist-info/RECORD,,