piwave 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

piwave/piwave.py

@@ -90,7 +90,6 @@ class PiWave:
         Log.config(silent=silent)
 
         self._validate_environment()
-        atexit.register(self.cleanup)
         
         discover_backends()
 
@@ -326,6 +325,28 @@ class PiWave:
             self._stop_current_process()
             return False
         
+    def _playback_worker_wrapper(self):
+        # wrapper for non-blocking playback
+        try:
+            wav_file = self._convert_to_wav(self.current_file)
+            if not wav_file:
+                Log.error(f"Failed to convert {self.current_file}")
+                self.is_playing = False
+                return
+
+            if not os.path.exists(wav_file):
+                Log.error(f"File not found: {wav_file}")
+                self.is_playing = False
+                return
+
+            self._play_file(wav_file)
+        except Exception as e:
+            Log.error(f"Playback error: {e}")
+            if self.on_error:
+                self.on_error(e)
+        finally:
+            self.is_playing = False
+        
 
     def _play_live(self, audio_source, sample_rate: int, channels: int, chunk_size: int) -> bool:
         if self.is_playing or self.is_live_streaming:
@@ -443,11 +464,9 @@ class PiWave:
     def _stop_current_process(self):
         if self.current_process:
             try:
-                Log.info("Stopping current process...")
                 os.killpg(os.getpgid(self.current_process.pid), signal.SIGTERM)
                 self.current_process.wait(timeout=5)
             except (ProcessLookupError, subprocess.TimeoutExpired):
-                Log.warning("Forcing kill of current process")
                 try:
                     os.killpg(os.getpgid(self.current_process.pid), signal.SIGKILL)
                 except ProcessLookupError:
@@ -483,18 +502,14 @@ class PiWave:
         self._log_debug("Playback worker finished")
 
 
-    def _handle_interrupt(self, signum, frame):
-        Log.warning("Interrupt received, stopping playback...")
-        self.stop()
-        os._exit(0)
-
-    def play(self, source, sample_rate: int = 44100, channels: int = 2, chunk_size: int = 4096):
+    def play(self, source, sample_rate: int = 44100, channels: int = 2, chunk_size: int = 4096, blocking: bool = False):
         """Play audio from file or live source.
         
         :param source: Either a file path (str) or live audio source (generator/callable/file-like)
         :param sample_rate: Sample rate for live audio (ignored for files)
         :param channels: Channels for live audio (ignored for files)
         :param chunk_size: Chunk size for live audio (ignored for files)
+        :param blocking: If the playback should be blocking or not (ignored for live, always non-blocking)
         :return: True if playback/streaming started successfully
         :rtype: bool
         
@@ -506,7 +521,23 @@ class PiWave:
         # autodetect if source is live or file
         if isinstance(source, str):
             # file (string)
-            return self._play_file(source)
+            if blocking:
+                return self._play_file(source)
+            else:
+                if self.is_playing:
+                    self.stop()
+                
+                self.current_file = source
+                self.is_playing = True
+                self.stop_event.clear()
+                
+                self.playback_thread = threading.Thread(
+                    target=self._playback_worker_wrapper,
+                    daemon=True
+                )
+                self.playback_thread.start()
+                return True
+        
         else:
             # live
             return self._play_live(source, sample_rate, channels, chunk_size)
@@ -520,7 +551,8 @@ class PiWave:
         Example:
             >>> pw.stop()
         """
-        if not self.is_playing and not self.is_live_streaming:
+        
+        if not self.is_playing and not self.is_live_streaming and not self.current_process:
             return
         
         Log.warning("Stopping...")
@@ -786,8 +818,6 @@ class PiWave:
         
         Log.info("Cleanup completed")
 
-    def __del__(self):
-        self.cleanup()
 
     def send(self, file_path: str):
         """Alias for the play method.

{piwave-2.1.1.dist-info → piwave-2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piwave
-Version: 2.1.1
+Version: 2.1.3
 Summary: A python module to broadcast radio waves with your Raspberry Pi.
 Home-page: https://github.com/douxxtech/piwave
 Author: Douxx
@@ -518,8 +518,11 @@ status = pw.get_status()
 ##### `cleanup()`
 Clean up resources and temporary files.
 
+> [!WARNING]
+> Always clean up behind you! Dropped support of auto-cleanup on version > 2.1.2
+
 ```python
-pw.cleanup()  # Called automatically on object destruction
+pw.cleanup()
 ```
 
 ### Backend Management

{piwave-2.1.1.dist-info → piwave-2.1.3.dist-info}/RECORD

@@ -1,13 +1,13 @@
 piwave/__init__.py,sha256=jz2r-qclltKTxJjlGnqhAwIlUgjvRTR31f4hjTHP5NA,230
 piwave/__main__.py,sha256=ygl6F8VmOZjsnnUbAbzLoA7_1qv18ruG6TW4EocSaQE,3927
 piwave/logger.py,sha256=lPG3cz3ByqC1p1UKpwlv3R9KgiAb0zzyu6c3bhTpST0,2766
-piwave/piwave.py,sha256=p9rsvwx5BdV7bHIW30vj1ipWOrSJOOMjczvs_DtghYA,31335
+piwave/piwave.py,sha256=f3v0n3RBr7sxQ7D1jXunAmplxe0D-6_mdaDLJmGwVpM,32423
 piwave/backends/__init__.py,sha256=DUbdyYf2V2XcDB05vmFWEkuJ292YTNiNJjzh1raJ5Cg,3756
 piwave/backends/base.py,sha256=amjdR3pwx-0XN2ngpwfYNt74j5kWrW1cI0zMOTMU-q8,7668
 piwave/backends/fm_transmitter.py,sha256=6CuYpkCgb40PEpemMlbTkQ6Gq8qFe3C1TSSLLnwXXX4,1338
 piwave/backends/pi_fm_rds.py,sha256=l1y9JUKjw-d9lh9X7HLQNEwbNVO-whYlzaYnqEfRviI,1429
-piwave-2.1.1.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-piwave-2.1.1.dist-info/METADATA,sha256=4nXRHn0KaoiUzo7KegQyG5tEMDx9ZDn4WWBlpzxYa2c,20563
-piwave-2.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-piwave-2.1.1.dist-info/top_level.txt,sha256=xUbZ7Rk6OymSdDxmb9bfO8N-avJ9VYxP41GnXfwKYi8,7
-piwave-2.1.1.dist-info/RECORD,,
+piwave-2.1.3.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+piwave-2.1.3.dist-info/METADATA,sha256=opQ0LdqJda66i1iaOGccjdw0gdZT9b7CKwDC1Ym_xWM,20612
+piwave-2.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+piwave-2.1.3.dist-info/top_level.txt,sha256=xUbZ7Rk6OymSdDxmb9bfO8N-avJ9VYxP41GnXfwKYi8,7
+piwave-2.1.3.dist-info/RECORD,,