piwave 2.1.10__tar.gz → 2.1.12__tar.gz

{piwave-2.1.10 → piwave-2.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piwave
-Version: 2.1.10
+Version: 2.1.12
 Summary: A python module to broadcast radio waves with your Raspberry Pi.
 Home-page: https://github.com/douxxtech/piwave
 Author: Douxx
@@ -31,9 +31,6 @@ 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
@@ -761,4 +758,5 @@ Please submit pull requests or open issues on [GitHub](https://github.com/douxxt
 
 **PiWave** - FM Broadcasting module for Raspberry Pi
 
+
 ![Made by Douxx](https://madeby.douxx.tech)

{piwave-2.1.10 → piwave-2.1.12}/README.md

@@ -3,9 +3,6 @@
 <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
@@ -733,4 +730,5 @@ Please submit pull requests or open issues on [GitHub](https://github.com/douxxt
 
 **PiWave** - FM Broadcasting module for Raspberry Pi
 
-![Made by Douxx](https://madeby.douxx.tech)
+
+![Made by Douxx](https://madeby.douxx.tech)

{piwave-2.1.10 → piwave-2.1.12}/piwave/backends/base.py

@@ -6,10 +6,11 @@ from abc import ABC, abstractmethod
 from typing import Optional
 import subprocess
 import os
-import signal
 import shutil
 from pathlib import Path
 
+from ..logger import Log
+
 class BackendError(Exception):
     pass
 
@@ -63,18 +64,25 @@ class Backend(ABC):
     
     def _find_executable(self) -> str:
         # Check cache first
+        Log.debug(f"Checking cache at {self.cache_file}")
+
         if self.cache_file.exists():
             try:
                 cached_path = self.cache_file.read_text().strip()
                 if self._is_valid_executable(cached_path):
+                    Log.debug(f"Cache hit: {cached_path}")
                     return cached_path
                 else:
                     self.cache_file.unlink()
             except Exception:
                 self.cache_file.unlink(missing_ok=True)
+
+        Log.debug(f"Cache miss, searching filesystem...")
         
         # Only then search for it
         found_path = self._search_executable()
+        Log.debug(f"Found executable at: {found_path}")
+
         if found_path:
             try:
                 self.cache_file.write_text(found_path)
@@ -82,6 +90,8 @@ class Backend(ABC):
                 pass
             return found_path
         
+        Log.debug(f"Failed to find {self.name} on the filesystem.")
+        
         raise BackendError(f"Could not find path for {self.name}. Please manually add one with python3 -m piwave add {self.name} <path>")
     
     @abstractmethod
@@ -230,12 +240,16 @@ class Backend(ABC):
             raise BackendError(f"{self.name} supports {min_freq}-{max_freq}MHz, got {self.frequency}MHz")
             
         cmd = self.build_command(wav_file, loop)
+        Log.debug(f"Build command: {' '.join(cmd)}")
         self.current_process = subprocess.Popen(
             cmd,
             stdout=subprocess.DEVNULL,
             stderr=subprocess.DEVNULL,
             stdin=subprocess.DEVNULL
         )
+
+        Log.debug(f"Process PID: {self.current_process.pid}")
+
         return self.current_process
     
     def stop(self):

{piwave-2.1.10 → piwave-2.1.12}/piwave/logger.py

@@ -12,7 +12,8 @@ class Logger(DLogger):
         'warning': 'WARN',
         'info': 'INFO',
         'file': 'FILE',
-        'broadcast': 'BCAST'
+        'broadcast': 'BCAST',
+        'debug': 'DEBUG'
     }
     
     STYLES = {
@@ -21,10 +22,12 @@ class Logger(DLogger):
         'warning': 'bright_yellow',
         'info': 'bright_cyan',
         'file': 'yellow',
-        'broadcast': 'bright_magenta'
+        'broadcast': 'bright_magenta',
+        'debug': 'orange'
     }
     
     SILENT = False
+    DEBUG = False
     
     def __init__(self):
         # Initialize with prebuilt icons & styles and silent support.
@@ -35,12 +38,17 @@ class Logger(DLogger):
         )
     
     @classmethod
-    def config(self, silent: bool = False):
+    def config(self, silent: bool = False, debug: bool = False):
         self.SILENT = silent
+        self.DEBUG = debug
     
     def print(self, message: str, style: str = '', icon: str = '', end: str = '\n'):
         if self.SILENT:
             return
+        
+        if icon == "DEBUG" and not self.DEBUG:
+            return 
+        
         super().print(message, style, icon, end)
 
 Log = Logger()

{piwave-2.1.10 → piwave-2.1.12}/piwave/piwave.py

@@ -84,10 +84,12 @@ class PiWave:
         self.live_thread: Optional[threading.Thread] = None
         self.audio_queue: Optional[queue.Queue] = None
         
-        Log.config(silent=silent)
+        Log.config(silent=silent, debug=debug)
 
+        Log.debug(f"Validating environment...")
         self._validate_environment()
         
+        Log.debug(f"Discovering backends...")
         discover_backends()
 
         self.backend_use = used_for
@@ -118,6 +120,9 @@ class PiWave:
             pi=self.pi
         )
 
+        Log.debug(f"Selected backend: {backend_name}")
+
+
 
         min_freq, max_freq = self.backend.frequency_range
         rds_support = "with RDS" if self.backend.supports_rds else "no RDS"
@@ -127,11 +132,6 @@ class PiWave:
         
         Log.info(f"PiWave initialized - Frequency: {frequency}MHz, PS: {ps}, Loop: {loop}")
 
-    def _log_debug(self, message: str):
-        if self.debug:
-            Log.print(f"[DEBUG] {message}", 'bright_cyan')
-
-
     def _validate_environment(self):
 
         #validate that we're running on a Raspberry Pi as root
@@ -153,57 +153,6 @@ class PiWave:
     def _is_root(self) -> bool:
         return os.geteuid() == 0
 
-    def _find_pi_fm_rds_path(self) -> str:
-        current_dir = Path(__file__).parent
-        cache_file = current_dir / "pi_fm_rds_path"
-        
-        if cache_file.exists():
-            try:
-                cached_path = cache_file.read_text().strip()
-                if self._is_valid_executable(cached_path):
-                    return cached_path
-                else:
-                    cache_file.unlink()
-            except Exception as e:
-                Log.warning(f"Error reading cache file: {e}")
-                cache_file.unlink(missing_ok=True)
-        
-        search_paths = ["/opt", "/usr/local/bin", "/usr/bin", "/bin", "/home"]
-        
-        for search_path in search_paths:
-            if not Path(search_path).exists():
-                continue
-                
-            try:
-                for root, dirs, files in os.walk(search_path):
-                    if "pi_fm_rds" in files:
-                        executable_path = Path(root) / "pi_fm_rds"
-                        if self._is_valid_executable(str(executable_path)):
-                            cache_file.write_text(str(executable_path))
-                            return str(executable_path)
-            except (PermissionError, OSError):
-                continue
-        
-        print("Could not automatically find `pi_fm_rds`. Please enter the full path manually.")
-        user_path = input("Enter the path to `pi_fm_rds`: ").strip()
-        
-        if self._is_valid_executable(user_path):
-            cache_file.write_text(user_path)
-            return user_path
-        
-        raise PiWaveError("Invalid pi_fm_rds path provided")
-
-    def _is_valid_executable(self, path: str) -> bool:
-        try:
-            result = subprocess.run(
-                [path, "--help"], 
-                stdout=subprocess.PIPE, 
-                stderr=subprocess.PIPE, 
-                timeout=5
-            )
-            return result.returncode == 0
-        except (subprocess.CalledProcessError, subprocess.TimeoutExpired, FileNotFoundError):
-            return False
 
     def _is_wav_file(self, filepath: str) -> bool:
         return filepath.lower().endswith('.wav')
@@ -211,6 +160,7 @@ class PiWave:
 
     def _convert_to_wav(self, filepath: str) -> Optional[str]:
         if self._is_wav_file(filepath):
+            Log.debug(f"File is already WAV, skipping conversion")
             return filepath
         
         Log.file(f"Converting {filepath} to WAV")
@@ -221,8 +171,15 @@ class PiWave:
             'ffmpeg', '-i', filepath, '-acodec', 'pcm_s16le', 
             '-ar', '44100', '-ac', '2', '-y', output_file
         ]
+
+        if self.debug:
+            cmd.extend(['-v', 'debug'])
+        else:
+            cmd.extend(['-v', 'quiet'])
         
         try:
+            Log.debug(f"Starting FFmpeg conversion: {' '.join(cmd)}")
+
             subprocess.run(
                 cmd,
                 stdout=subprocess.PIPE,
@@ -231,7 +188,7 @@ class PiWave:
                 check=True
             )
             
-            self._log_debug(f"FFmpeg conversion successful for {filepath}")
+            Log.debug(f"Conversion completed: {output_file}")
             
             return output_file
             
@@ -246,11 +203,15 @@ class PiWave:
             return None
 
     def _get_file_duration(self, wav_file: str) -> float:
-        cmd = [
-            'ffprobe', '-i', wav_file, '-show_entries', 'format=duration',
-            '-v', 'quiet', '-of', 'csv=p=0'
-        ]
+        cmd = ['ffprobe', '-i', wav_file, '-show_entries', 'format=duration', '-of', 'csv=p=0']
         
+        if self.debug:
+            cmd.extend(['-v', 'debug'])
+        else:
+            cmd.extend(['-v', 'quiet'])
+
+        Log.debug(f"Running command: {' '.join(cmd)}")
+
         try:
             result = subprocess.run(
                 cmd,
@@ -407,6 +368,7 @@ class PiWave:
                     if self.stop_event.is_set():
                         break
                     if chunk:
+                        Log.debug(f"Producer: sending chunk of {len(chunk)} bytes")
                         self.audio_queue.put(chunk, timeout=1)
             
             elif callable(audio_source):
@@ -414,6 +376,7 @@ class PiWave:
                     chunk = audio_source()
                     if not chunk:
                         break
+                    Log.debug(f"Producer: sending chunk of {len(chunk)} bytes")
                     self.audio_queue.put(chunk, timeout=1)
             
             elif hasattr(audio_source, 'read'):
@@ -421,6 +384,7 @@ class PiWave:
                     chunk = audio_source.read(chunk_size)
                     if not chunk:
                         break
+                    Log.debug(f"Producer: sending chunk of {len(chunk)} bytes")
                     self.audio_queue.put(chunk, timeout=1)
             
         except Exception as e:
@@ -438,6 +402,8 @@ class PiWave:
                     chunk = self.audio_queue.get(timeout=0.1)
                     if chunk is None:
                         break
+
+                    Log.debug(f"Consumer: queue size = {self.audio_queue.qsize()}")
                     
                     if self.current_process and self.current_process.stdin:
                         self.current_process.stdin.write(chunk)
@@ -460,7 +426,7 @@ class PiWave:
             self.is_live_streaming = False
 
     def _playback_worker(self):
-        self._log_debug("Playback worker started")
+        Log.debug("Playback worker started")
 
         if not self.current_file:
             Log.error("No file specified for playback")
@@ -483,7 +449,7 @@ class PiWave:
                 Log.error(f"Playback failed for {wav_file}")
 
         self.is_playing = False
-        self._log_debug("Playback worker finished")
+        Log.debug("Playback worker finished")
 
 
     def play(self, source, sample_rate: int = 44100, channels: int = 2, chunk_size: int = 4096, blocking: bool = False):
@@ -703,11 +669,11 @@ class PiWave:
             updated_settings.append(f"PI: {self.pi}")
         
         if debug is not None:
-            self.debug = debug
+            Log.config(silent=Log.SILENT, debug=debug)
             updated_settings.append(f"debug: {debug}")
         
         if silent is not None:
-            Log.config(silent=silent)
+            Log.config(silent=silent, debug=Log.DEBUG)
             updated_settings.append(f"silent: {silent}")
         
         if loop is not None:

{piwave-2.1.10 → piwave-2.1.12}/piwave.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piwave
-Version: 2.1.10
+Version: 2.1.12
 Summary: A python module to broadcast radio waves with your Raspberry Pi.
 Home-page: https://github.com/douxxtech/piwave
 Author: Douxx
@@ -31,9 +31,6 @@ 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
@@ -761,4 +758,5 @@ Please submit pull requests or open issues on [GitHub](https://github.com/douxxt
 
 **PiWave** - FM Broadcasting module for Raspberry Pi
 
+
 ![Made by Douxx](https://madeby.douxx.tech)

{piwave-2.1.10 → piwave-2.1.12}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = piwave
-version = 2.1.10
+version = 2.1.12
 description = A python module to broadcast radio waves with your Raspberry Pi.
 long_description = file: README.md
 long_description_content_type = text/markdown