piwave 2.1.6__py3-none-any.whl → 2.1.8__py3-none-any.whl

piwave/backends/base.py

@@ -232,20 +232,24 @@ class Backend(ABC):
         cmd = self.build_command(wav_file, loop)
         self.current_process = subprocess.Popen(
             cmd,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            stdin=subprocess.DEVNULL
         )
         return self.current_process
     
     def stop(self):
         if self.current_process:
             try:
-                os.killpg(os.getpgid(self.current_process.pid), signal.SIGTERM)
+                self.current_process.terminate()
                 self.current_process.wait(timeout=5)
-            except (ProcessLookupError, subprocess.TimeoutExpired):
+            except subprocess.TimeoutExpired:
                 try:
-                    os.killpg(os.getpgid(self.current_process.pid), signal.SIGKILL)
-                except ProcessLookupError:
+                    self.current_process.kill()
+                    self.current_process.wait(timeout=2)
+                except:
                     pass
+            except ProcessLookupError:
+                pass
             finally:
                 self.current_process = None

piwave/piwave.py

@@ -2,11 +2,10 @@
 # Licensed under GPLv3.0, main GitHub repository at https://github.com/douxxtech/piwave/
 # piwave/piwave.py : main entry
 
+import atexit
 import os
 import subprocess
-import signal
 import threading
-import time
 
 import tempfile
 import shutil
@@ -88,6 +87,7 @@ class PiWave:
         Log.config(silent=silent)
 
         self._validate_environment()
+        atexit.register(self._stop_curproc)
         
         discover_backends()
 
@@ -288,7 +288,8 @@ class PiWave:
             rds_info = f" (PS: {self.ps})" if self.backend.supports_rds and self.ps else ""
             Log.broadcast(f"Playing {wav_file} ({loop_status}) at {self.frequency}MHz{rds_info}")
 
-            self.current_process = self.backend.play_file(wav_file, self.loop)
+            self.backend.play_file(wav_file, self.loop)
+            self.current_process = self.backend.current_process
 
             if self.on_track_change:
                 self.on_track_change(wav_file)
@@ -298,10 +299,10 @@ class PiWave:
                 # Only manually loop if the backend does not support it
                 while not self.stop_event.is_set():
                     if self.stop_event.wait(timeout=0.1):
-                        self._stop_current_process()
+                        self._stop_curproc()
                         return False
                     
-                    if self.current_process.poll() is not None:
+                    if self.backend.current_process.poll() is not None:
                         Log.error("Process ended unexpectedly while looping")
                         return False
                     
@@ -309,9 +310,9 @@ class PiWave:
                 # fi backend supports looping or we are not looping, just wait for the process to finish
                 while not self.stop_event.is_set():
                     if self.stop_event.wait(timeout=0.1):
-                        self._stop_current_process()
+                        self._stop_curproc()
                         return False
-                    if not self.loop and self.current_process.poll() is not None:
+                    if not self.loop and self.backend.current_process.poll() is not None:
                         break
             return True
         
@@ -319,7 +320,7 @@ class PiWave:
             Log.error(f"Error playing {wav_file}: {e}")
             if self.on_error:
                 self.on_error(e)
-            self._stop_current_process()
+            self._stop_curproc()
             return False
 
         
@@ -373,8 +374,8 @@ class PiWave:
             self.current_process = subprocess.Popen(
                 cmd,
                 stdin=subprocess.PIPE,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE
+                stdout=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL
             )
         except Exception as e:
             Log.error(f"Failed to start live stream: {e}")
@@ -457,21 +458,6 @@ class PiWave:
                     pass
             self.is_live_streaming = False
 
-
-    def _stop_current_process(self):
-        if self.current_process:
-            try:
-                os.killpg(os.getpgid(self.current_process.pid), signal.SIGTERM)
-                self.current_process.wait(timeout=5)
-            except (ProcessLookupError, subprocess.TimeoutExpired):
-                try:
-                    os.killpg(os.getpgid(self.current_process.pid), signal.SIGKILL)
-                except ProcessLookupError:
-                    pass
-            finally:
-                self.current_process = None
-
-
     def _playback_worker(self):
         self._log_debug("Playback worker started")
 
@@ -564,14 +550,7 @@ class PiWave:
                 except queue.Empty:
                     break
         
-        if self.current_process:
-            try:
-                os.killpg(os.getpgid(self.current_process.pid), signal.SIGTERM)
-                self.current_process.wait(timeout=5)
-            except Exception:
-                pass
-            finally:
-                self.current_process = None
+        self._stop_curproc()
         
         if self.playback_thread and self.playback_thread.is_alive():
             self.playback_thread.join(timeout=5)
@@ -582,6 +561,25 @@ class PiWave:
         self.is_live_streaming = False
         Log.success("Stopped")
 
+    def _stop_curproc(self):
+        if self.backend.current_process:
+                self.backend.stop()
+        elif self.current_process:
+            # live streaming
+            try:
+                self.current_process.terminate()
+                self.current_process.wait(timeout=5)
+            except subprocess.TimeoutExpired:
+                try:
+                    self.current_process.kill()
+                    self.current_process.wait(timeout=2)
+                except:
+                    pass
+            except ProcessLookupError:
+                pass
+            finally:
+                self.current_process = None
+
     def pause(self):
         """Pause the current playback.
 
@@ -592,7 +590,7 @@ class PiWave:
             >>> pw.pause()
         """
         if self.is_playing:
-            self._stop_current_process()
+            self._stop_curproc()
             Log.info("Playback paused")
 
     def resume(self):

{piwave-2.1.6.dist-info → piwave-2.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piwave
-Version: 2.1.6
+Version: 2.1.8
 Summary: A python module to broadcast radio waves with your Raspberry Pi.
 Home-page: https://github.com/douxxtech/piwave
 Author: Douxx
@@ -31,6 +31,9 @@ Dynamic: license-file
 <h1>PiWave</h1>
 </div>
 
+> [!CAUTION]
+> `piwave==2.1.6` is broken ! Please use `piwave==2.1.5`
+
 **PiWave** is a Python module designed to manage and control your Raspberry Pi radio using multiple FM transmission backends. It provides a unified interface for broadcasting audio files with multiple backends support and RDS (Radio Data System) support.
 
 ## Features

{piwave-2.1.6.dist-info → piwave-2.1.8.dist-info}/RECORD

@@ -1,13 +1,13 @@
 piwave/__init__.py,sha256=jz2r-qclltKTxJjlGnqhAwIlUgjvRTR31f4hjTHP5NA,230
 piwave/__main__.py,sha256=-Z3RI7TiicE5UwWc4dZaHX82-MpwVXWkfMZXOC457_Q,4089
 piwave/logger.py,sha256=ipWzdNcEYob0xjXP8bbTq9enA3nryU-GKzAOKayRqlg,1149
-piwave/piwave.py,sha256=8vuShHa3zcKyzt9Yw2942R1QwfKRjleRfElEfw_yFAI,32395
+piwave/piwave.py,sha256=6ns1VmQ8hZFwrI_8HTLwvSD_CwMCzzUWGqms0u1MKeQ,32293
 piwave/backends/__init__.py,sha256=DUbdyYf2V2XcDB05vmFWEkuJ292YTNiNJjzh1raJ5Cg,3756
-piwave/backends/base.py,sha256=D-VbyDNSJUMpZ7PYjCsqEmP5xA3zwWStCm_biZWWAvI,7765
+piwave/backends/base.py,sha256=PJNXEEXZ8wgc343SO5FJ1oGOop--Y-7t01PUWSa5GuE,7818
 piwave/backends/fm_transmitter.py,sha256=Wzsoyi5hqLLZF5eNPmZ7WFvP27OMs2ywJlwrJVut-8w,1403
 piwave/backends/pi_fm_rds.py,sha256=VjcbFeje8LHVr4cBjlL36IcvA3WRfI1hHSGG2ui8Pb0,1467
-piwave-2.1.6.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-piwave-2.1.6.dist-info/METADATA,sha256=UdEh22ba6NYygU5WRt9G4CG8GcKbRigZevjjwMn5Od8,20819
-piwave-2.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-piwave-2.1.6.dist-info/top_level.txt,sha256=xUbZ7Rk6OymSdDxmb9bfO8N-avJ9VYxP41GnXfwKYi8,7
-piwave-2.1.6.dist-info/RECORD,,
+piwave-2.1.8.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+piwave-2.1.8.dist-info/METADATA,sha256=eO1OgUr8q13UI5TVqcdzokAcUOZnh1WDFGXL5GtJItI,20890
+piwave-2.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+piwave-2.1.8.dist-info/top_level.txt,sha256=xUbZ7Rk6OymSdDxmb9bfO8N-avJ9VYxP41GnXfwKYi8,7
+piwave-2.1.8.dist-info/RECORD,,