Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-04-24 06:40:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix weather satellite mode returning false success on SatDump startup failure

Browse Source 
Add synchronous startup verification after Popen() — sleep 0.5s and poll
the process before returning to the caller. If SatDump exits immediately
(missing device, bad args), raise RuntimeError with the actual error
message instead of returning status: 'started'. Keep a shorter (2s) async
backup check for slower failures.

Also fix --source_id handling: omit the flag entirely when no serial number
is found instead of passing "0" which SatDump may reject. Change start()
and start_from_file() to return (bool, str|None) tuples so error messages
propagate through to the HTTP response.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Smittix
2026-02-25 21:49:16 +00:00
parent a50f77629c
commit 935b7a4d9d
7 changed files with 197 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
routes/weather_sat.py
View File

@@ -26,48 +26,48 @@ logger = get_logger('intercept.weather_sat')
weather_sat_bp = Blueprint('weather_sat', __name__, url_prefix='/weather-sat') weather_sat_bp = Blueprint('weather_sat', __name__, url_prefix='/weather-sat')
# Queue for SSE progress streaming # Queue for SSE progress streaming
_weather_sat_queue: queue.Queue = queue.Queue(maxsize=100) _weather_sat_queue: queue.Queue = queue.Queue(maxsize=100)
def _progress_callback(progress: CaptureProgress) -> None: def _progress_callback(progress: CaptureProgress) -> None:
"""Callback to queue progress updates for SSE stream.""" """Callback to queue progress updates for SSE stream."""
try: try:
_weather_sat_queue.put_nowait(progress.to_dict()) _weather_sat_queue.put_nowait(progress.to_dict())
except queue.Full: except queue.Full:
try: try:
_weather_sat_queue.get_nowait() _weather_sat_queue.get_nowait()
_weather_sat_queue.put_nowait(progress.to_dict()) _weather_sat_queue.put_nowait(progress.to_dict())
except queue.Empty: except queue.Empty:
pass pass
def _release_weather_sat_device(device_index: int) -> None: def _release_weather_sat_device(device_index: int) -> None:
"""Release an SDR device only if weather-sat currently owns it.""" """Release an SDR device only if weather-sat currently owns it."""
if device_index < 0: if device_index < 0:
return return
try: try:
import app as app_module import app as app_module
except ImportError: except ImportError:
return return
owner = None owner = None
get_status = getattr(app_module, 'get_sdr_device_status', None) get_status = getattr(app_module, 'get_sdr_device_status', None)
if callable(get_status): if callable(get_status):
try: try:
owner = get_status().get(device_index) owner = get_status().get(device_index)
except Exception: except Exception:
owner = None owner = None
if owner and owner != 'weather_sat': if owner and owner != 'weather_sat':
logger.debug( logger.debug(
'Skipping SDR release for device %s owned by %s', 'Skipping SDR release for device %s owned by %s',
device_index, device_index,
owner, owner,
) )
return return
app_module.release_sdr_device(device_index) app_module.release_sdr_device(device_index)
@weather_sat_bp.route('/status') @weather_sat_bp.route('/status')
@@ -178,15 +178,15 @@ def start_capture():
except queue.Empty: except queue.Empty:
break break
# Set callback and on-complete handler for SDR release # Set callback and on-complete handler for SDR release
decoder.set_callback(_progress_callback) decoder.set_callback(_progress_callback)
def _release_device(): def _release_device():
_release_weather_sat_device(device_index) _release_weather_sat_device(device_index)
decoder.set_on_complete(_release_device) decoder.set_on_complete(_release_device)
success = decoder.start( success, error_msg = decoder.start(
satellite=satellite, satellite=satellite,
device_index=device_index, device_index=device_index,
gain=gain, gain=gain,
@@ -208,7 +208,7 @@ def start_capture():
_release_device() _release_device()
return jsonify({ return jsonify({
'status': 'error', 'status': 'error',
'message': 'Failed to start capture' 'message': error_msg or 'Failed to start capture'
}), 500 }), 500
@@ -310,7 +310,7 @@ def test_decode():
decoder.set_callback(_progress_callback) decoder.set_callback(_progress_callback)
decoder.set_on_complete(None) decoder.set_on_complete(None)
success = decoder.start_from_file( success, error_msg = decoder.start_from_file(
satellite=satellite, satellite=satellite,
input_file=input_file, input_file=input_file,
sample_rate=sample_rate, sample_rate=sample_rate,
@@ -329,7 +329,7 @@ def test_decode():
else: else:
return jsonify({ return jsonify({
'status': 'error', 'status': 'error',
'message': 'Failed to start file decode' 'message': error_msg or 'Failed to start file decode'
}), 500 }), 500
@@ -343,9 +343,9 @@ def stop_capture():
decoder = get_weather_sat_decoder() decoder = get_weather_sat_decoder()
device_index = decoder.device_index device_index = decoder.device_index
decoder.stop() decoder.stop()
_release_weather_sat_device(device_index) _release_weather_sat_device(device_index)
return jsonify({'status': 'stopped'}) return jsonify({'status': 'stopped'})

29
tests/test_weather_sat_decoder.py
View File

@@ -73,9 +73,10 @@ class TestWeatherSatDecoder:
callback = MagicMock() callback = MagicMock()
decoder.set_callback(callback) decoder.set_callback(callback)
success = decoder.start(satellite='NOAA-18', device_index=0, gain=40.0) success, error_msg = decoder.start(satellite='NOAA-18', device_index=0, gain=40.0)
assert success is False assert success is False
assert error_msg is not None
callback.assert_called() callback.assert_called()
progress = callback.call_args[0][0] progress = callback.call_args[0][0]
assert progress.status == 'error' assert progress.status == 'error'
@@ -88,7 +89,7 @@ class TestWeatherSatDecoder:
callback = MagicMock() callback = MagicMock()
decoder.set_callback(callback) decoder.set_callback(callback)
success = decoder.start(satellite='FAKE-SAT', device_index=0, gain=40.0) success, error_msg = decoder.start(satellite='FAKE-SAT', device_index=0, gain=40.0)
assert success is False assert success is False
callback.assert_called() callback.assert_called()
@@ -113,7 +114,7 @@ class TestWeatherSatDecoder:
callback = MagicMock() callback = MagicMock()
decoder.set_callback(callback) decoder.set_callback(callback)
success = decoder.start( success, error_msg = decoder.start(
satellite='NOAA-18', satellite='NOAA-18',
device_index=0, device_index=0,
gain=40.0, gain=40.0,
@@ -121,6 +122,7 @@ class TestWeatherSatDecoder:
) )
assert success is True assert success is True
assert error_msg is None
assert decoder.is_running is True assert decoder.is_running is True
assert decoder.current_satellite == 'NOAA-18' assert decoder.current_satellite == 'NOAA-18'
assert decoder.current_frequency == 137.9125 assert decoder.current_frequency == 137.9125
@@ -143,9 +145,10 @@ class TestWeatherSatDecoder:
decoder = WeatherSatDecoder() decoder = WeatherSatDecoder()
decoder._running = True decoder._running = True
success = decoder.start(satellite='NOAA-18', device_index=0, gain=40.0) success, error_msg = decoder.start(satellite='NOAA-18', device_index=0, gain=40.0)
assert success is True assert success is True
assert error_msg is None
mock_popen.assert_not_called() mock_popen.assert_not_called()
@patch('subprocess.Popen') @patch('subprocess.Popen')
@@ -160,9 +163,10 @@ class TestWeatherSatDecoder:
callback = MagicMock() callback = MagicMock()
decoder.set_callback(callback) decoder.set_callback(callback)
success = decoder.start(satellite='NOAA-18', device_index=0, gain=40.0) success, error_msg = decoder.start(satellite='NOAA-18', device_index=0, gain=40.0)
assert success is False assert success is False
assert error_msg is not None
assert decoder.is_running is False assert decoder.is_running is False
callback.assert_called() callback.assert_called()
progress = callback.call_args[0][0] progress = callback.call_args[0][0]
@@ -175,12 +179,13 @@ class TestWeatherSatDecoder:
callback = MagicMock() callback = MagicMock()
decoder.set_callback(callback) decoder.set_callback(callback)
success = decoder.start_from_file( success, error_msg = decoder.start_from_file(
satellite='NOAA-18', satellite='NOAA-18',
input_file='data/test.wav', input_file='data/test.wav',
) )
assert success is False assert success is False
assert error_msg is not None
callback.assert_called() callback.assert_called()
@patch('subprocess.Popen') @patch('subprocess.Popen')
@@ -200,19 +205,21 @@ class TestWeatherSatDecoder:
mock_pty.return_value = (10, 11) mock_pty.return_value = (10, 11)
mock_process = MagicMock() mock_process = MagicMock()
mock_process.poll.return_value = None # Process still running
mock_popen.return_value = mock_process mock_popen.return_value = mock_process
decoder = WeatherSatDecoder() decoder = WeatherSatDecoder()
callback = MagicMock() callback = MagicMock()
decoder.set_callback(callback) decoder.set_callback(callback)
success = decoder.start_from_file( success, error_msg = decoder.start_from_file(
satellite='NOAA-18', satellite='NOAA-18',
input_file='data/test.wav', input_file='data/test.wav',
sample_rate=1000000, sample_rate=1000000,
) )
assert success is True assert success is True
assert error_msg is None
assert decoder.is_running is True assert decoder.is_running is True
assert decoder.current_satellite == 'NOAA-18' assert decoder.current_satellite == 'NOAA-18'
@@ -236,7 +243,7 @@ class TestWeatherSatDecoder:
callback = MagicMock() callback = MagicMock()
decoder.set_callback(callback) decoder.set_callback(callback)
success = decoder.start_from_file( success, error_msg = decoder.start_from_file(
satellite='NOAA-18', satellite='NOAA-18',
input_file='/etc/passwd', input_file='/etc/passwd',
) )
@@ -259,7 +266,7 @@ class TestWeatherSatDecoder:
callback = MagicMock() callback = MagicMock()
decoder.set_callback(callback) decoder.set_callback(callback)
success = decoder.start_from_file( success, error_msg = decoder.start_from_file(
satellite='NOAA-18', satellite='NOAA-18',
input_file='data/missing.wav', input_file='data/missing.wav',
) )
@@ -426,12 +433,12 @@ class TestWeatherSatDecoder:
@patch('subprocess.run') @patch('subprocess.run')
def test_resolve_device_id_fallback(self, mock_run): def test_resolve_device_id_fallback(self, mock_run):
"""_resolve_device_id() should fall back to index string.""" """_resolve_device_id() should return None when no serial found."""
mock_run.side_effect = FileNotFoundError mock_run.side_effect = FileNotFoundError
serial = WeatherSatDecoder._resolve_device_id(0) serial = WeatherSatDecoder._resolve_device_id(0)
assert serial == '0' assert serial is None
def test_parse_product_name_rgb(self): def test_parse_product_name_rgb(self):
"""_parse_product_name() should identify RGB composite.""" """_parse_product_name() should identify RGB composite."""

3
tests/test_weather_sat_regressions.py
View File

@@ -106,13 +106,14 @@ class TestWeatherSatDecoderRegressions:
mock_resolve.return_value = resolved mock_resolve.return_value = resolved
decoder = WeatherSatDecoder(output_dir=tmp_path / 'weather_sat_out') decoder = WeatherSatDecoder(output_dir=tmp_path / 'weather_sat_out')
success = decoder.start_from_file( success, error_msg = decoder.start_from_file(
satellite='METEOR-M2-3', satellite='METEOR-M2-3',
input_file='data/weather_sat/samples/sample.wav', input_file='data/weather_sat/samples/sample.wav',
sample_rate=1_000_000, sample_rate=1_000_000,
) )
assert success is True assert success is True
assert error_msg is None
assert decoder.device_index == -1 assert decoder.device_index == -1
mock_start.assert_called_once() mock_start.assert_called_once()

8
tests/test_weather_sat_routes.py
View File

@@ -73,7 +73,7 @@ class TestWeatherSatRoutes:
mock_decoder = MagicMock() mock_decoder = MagicMock()
mock_decoder.is_running = False mock_decoder.is_running = False
mock_decoder.start.return_value = True mock_decoder.start.return_value = (True, None)
mock_get.return_value = mock_decoder mock_get.return_value = mock_decoder
payload = { payload = {
@@ -233,7 +233,7 @@ class TestWeatherSatRoutes:
mock_decoder = MagicMock() mock_decoder = MagicMock()
mock_decoder.is_running = False mock_decoder.is_running = False
mock_decoder.start.return_value = False mock_decoder.start.return_value = (False, 'SatDump exited immediately (code 1)')
mock_get.return_value = mock_decoder mock_get.return_value = mock_decoder
payload = {'satellite': 'NOAA-18'} payload = {'satellite': 'NOAA-18'}
@@ -246,7 +246,7 @@ class TestWeatherSatRoutes:
assert response.status_code == 500 assert response.status_code == 500
data = response.get_json() data = response.get_json()
assert data['status'] == 'error' assert data['status'] == 'error'
assert 'Failed to start capture' in data['message'] assert 'SatDump exited immediately' in data['message']
def test_test_decode_success(self, client): def test_test_decode_success(self, client):
"""POST /weather-sat/test-decode successfully starts file decode.""" """POST /weather-sat/test-decode successfully starts file decode."""
@@ -262,7 +262,7 @@ class TestWeatherSatRoutes:
mock_decoder = MagicMock() mock_decoder = MagicMock()
mock_decoder.is_running = False mock_decoder.is_running = False
mock_decoder.start_from_file.return_value = True mock_decoder.start_from_file.return_value = (True, None)
mock_get.return_value = mock_decoder mock_get.return_value = mock_decoder
payload = { payload = {

6
tests/test_weather_sat_scheduler.py
View File

@@ -546,7 +546,7 @@ class TestWeatherSatScheduler:
mock_decoder = MagicMock() mock_decoder = MagicMock()
mock_decoder.is_running = False mock_decoder.is_running = False
mock_decoder.start.return_value = True mock_decoder.start.return_value = (True, None)
mock_get.return_value = mock_decoder mock_get.return_value = mock_decoder
mock_timer_instance = MagicMock() mock_timer_instance = MagicMock()
@@ -590,7 +590,7 @@ class TestWeatherSatScheduler:
mock_decoder = MagicMock() mock_decoder = MagicMock()
mock_decoder.is_running = False mock_decoder.is_running = False
mock_decoder.start.return_value = False mock_decoder.start.return_value = (False, 'Start failed')
mock_get.return_value = mock_decoder mock_get.return_value = mock_decoder
pass_data = { pass_data = {
@@ -798,7 +798,7 @@ class TestSchedulerIntegration:
mock_decoder = MagicMock() mock_decoder = MagicMock()
mock_decoder.is_running = False mock_decoder.is_running = False
mock_decoder.start.return_value = True mock_decoder.start.return_value = (True, None)
mock_get_decoder.return_value = mock_decoder mock_get_decoder.return_value = mock_decoder
scheduler = WeatherSatScheduler() scheduler = WeatherSatScheduler()

160
utils/weather_sat.py
View File

@@ -241,7 +241,7 @@ class WeatherSatDecoder:
satellite: str, satellite: str,
input_file: str | Path, input_file: str | Path,
sample_rate: int = DEFAULT_SAMPLE_RATE, sample_rate: int = DEFAULT_SAMPLE_RATE,
) -> bool: ) -> tuple[bool, str | None]:
"""Start weather satellite decode from a pre-recorded IQ/WAV file. """Start weather satellite decode from a pre-recorded IQ/WAV file.
No SDR hardware is required — SatDump runs in offline mode. No SDR hardware is required — SatDump runs in offline mode.
@@ -252,28 +252,30 @@ class WeatherSatDecoder:
sample_rate: Sample rate of the recording in Hz sample_rate: Sample rate of the recording in Hz
Returns: Returns:
True if started successfully Tuple of (success, error_message). error_message is None on success.
""" """
with self._lock: with self._lock:
if self._running: if self._running:
return True return True, None
if not self._decoder: if not self._decoder:
logger.error("No weather satellite decoder available") logger.error("No weather satellite decoder available")
msg = 'SatDump not installed. Build from source or install via package manager.'
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
message='SatDump not installed. Build from source or install via package manager.' message=msg,
)) ))
return False return False, msg
sat_info = WEATHER_SATELLITES.get(satellite) sat_info = WEATHER_SATELLITES.get(satellite)
if not sat_info: if not sat_info:
logger.error(f"Unknown satellite: {satellite}") logger.error(f"Unknown satellite: {satellite}")
msg = f'Unknown satellite: {satellite}'
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
message=f'Unknown satellite: {satellite}' message=msg,
)) ))
return False return False, msg
input_path = Path(input_file) input_path = Path(input_file)
@@ -283,25 +285,28 @@ class WeatherSatDecoder:
resolved = input_path.resolve() resolved = input_path.resolve()
if not resolved.is_relative_to(allowed_base): if not resolved.is_relative_to(allowed_base):
logger.warning(f"Path traversal blocked in start_from_file: {input_file}") logger.warning(f"Path traversal blocked in start_from_file: {input_file}")
msg = 'Input file must be under the data/ directory'
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
message='Input file must be under the data/ directory' message=msg,
)) ))
return False return False, msg
except (OSError, ValueError): except (OSError, ValueError):
msg = 'Invalid file path'
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
message='Invalid file path' message=msg,
)) ))
return False return False, msg
if not input_path.is_file(): if not input_path.is_file():
logger.error(f"Input file not found: {input_file}") logger.error(f"Input file not found: {input_file}")
msg = 'Input file not found'
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
message='Input file not found' message=msg,
)) ))
return False return False, msg
self._current_satellite = satellite self._current_satellite = satellite
self._current_frequency = sat_info['frequency'] self._current_frequency = sat_info['frequency']
@@ -331,17 +336,18 @@ class WeatherSatDecoder:
capture_phase='decoding', capture_phase='decoding',
)) ))
return True return True, None
except Exception as e: except Exception as e:
self._running = False self._running = False
error_msg = str(e)
logger.error(f"Failed to start file decode: {e}") logger.error(f"Failed to start file decode: {e}")
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
satellite=satellite, satellite=satellite,
message=str(e) message=error_msg,
)) ))
return False return False, error_msg
def start( def start(
self, self,
@@ -350,7 +356,7 @@ class WeatherSatDecoder:
gain: float = 40.0, gain: float = 40.0,
sample_rate: int = DEFAULT_SAMPLE_RATE, sample_rate: int = DEFAULT_SAMPLE_RATE,
bias_t: bool = False, bias_t: bool = False,
) -> bool: ) -> tuple[bool, str | None]:
"""Start weather satellite capture and decode. """Start weather satellite capture and decode.
Args: Args:
@@ -361,17 +367,18 @@ class WeatherSatDecoder:
bias_t: Enable bias-T power for LNA bias_t: Enable bias-T power for LNA
Returns: Returns:
True if started successfully Tuple of (success, error_message). error_message is None on success.
""" """
# Validate satellite BEFORE acquiring the lock # Validate satellite BEFORE acquiring the lock
sat_info = WEATHER_SATELLITES.get(satellite) sat_info = WEATHER_SATELLITES.get(satellite)
if not sat_info: if not sat_info:
logger.error(f"Unknown satellite: {satellite}") logger.error(f"Unknown satellite: {satellite}")
msg = f'Unknown satellite: {satellite}'
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
message=f'Unknown satellite: {satellite}' message=msg,
)) ))
return False return False, msg
# Resolve device ID BEFORE lock — this runs rtl_test which can # Resolve device ID BEFORE lock — this runs rtl_test which can
# take up to 5s and has no side effects on instance state. # take up to 5s and has no side effects on instance state.
@@ -379,15 +386,16 @@ class WeatherSatDecoder:
with self._lock: with self._lock:
if self._running: if self._running:
return True return True, None
if not self._decoder: if not self._decoder:
logger.error("No weather satellite decoder available") logger.error("No weather satellite decoder available")
msg = 'SatDump not installed. Build from source or install via package manager.'
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
message='SatDump not installed. Build from source or install via package manager.' message=msg,
)) ))
return False return False, msg
self._current_satellite = satellite self._current_satellite = satellite
self._current_frequency = sat_info['frequency'] self._current_frequency = sat_info['frequency']
@@ -415,17 +423,18 @@ class WeatherSatDecoder:
capture_phase=self._capture_phase, capture_phase=self._capture_phase,
)) ))
return True return True, None
except Exception as e: except Exception as e:
self._running = False self._running = False
error_msg = str(e)
logger.error(f"Failed to start weather satellite capture: {e}") logger.error(f"Failed to start weather satellite capture: {e}")
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
satellite=satellite, satellite=satellite,
message=str(e) message=error_msg,
)) ))
return False return False, error_msg
def _start_satdump( def _start_satdump(
self, self,
@@ -457,9 +466,14 @@ class WeatherSatDecoder:
'--samplerate', str(sample_rate), '--samplerate', str(sample_rate),
'--frequency', str(freq_hz), '--frequency', str(freq_hz),
'--gain', str(int(gain)), '--gain', str(int(gain)),
'--source_id', source_id,
] ]
# Only pass --source_id if we have a real serial number.
# When _resolve_device_id returns None (no serial found),
# omit the flag so SatDump uses the first available device.
if source_id is not None:
cmd.extend(['--source_id', source_id])
if bias_t: if bias_t:
cmd.append('--bias') cmd.append('--bias')
@@ -484,34 +498,28 @@ class WeatherSatDecoder:
except OSError: except OSError:
pass pass
# Check for early exit asynchronously (avoid blocking /start for 3s) # Synchronous startup check — catch immediate failures (bad args,
# missing device) before returning to the caller.
time.sleep(0.5)
if self._process.poll() is not None:
error_output = self._drain_pty_output(master_fd)
if error_output:
logger.error(f"SatDump output:\n{error_output}")
error_msg = self._extract_error(error_output, self._process.returncode)
raise RuntimeError(error_msg)
# Backup async check for slower failures (e.g. device opens then
# fails after a second or two).
def _check_early_exit(): def _check_early_exit():
"""Poll once after 3s; if SatDump died, emit an error event.""" """Poll once after 2s; if SatDump died, emit an error event."""
time.sleep(3) time.sleep(2)
process = self._process process = self._process
if process is None or process.poll() is None: if process is None or process.poll() is None:
return # still running or already cleaned up return # still running or already cleaned up
retcode = process.returncode error_output = self._drain_pty_output(master_fd)
output = b'' if error_output:
try: logger.error(f"SatDump output:\n{error_output}")
while True: error_msg = self._extract_error(error_output, process.returncode)
r, _, _ = select.select([master_fd], [], [], 0.1)
if not r:
break
chunk = os.read(master_fd, 4096)
if not chunk:
break
output += chunk
except OSError:
pass
output_str = output.decode('utf-8', errors='replace')
error_msg = f"SatDump exited immediately (code {retcode})"
if output_str:
for line in output_str.strip().splitlines():
if 'error' in line.lower() or 'could not' in line.lower() or 'cannot' in line.lower():
error_msg = line.strip()
break
logger.error(f"SatDump output:\n{output_str}")
self._emit_progress(CaptureProgress( self._emit_progress(CaptureProgress(
status='error', status='error',
satellite=self._current_satellite, satellite=self._current_satellite,
@@ -587,9 +595,16 @@ class WeatherSatDecoder:
except OSError: except OSError:
pass pass
# For offline mode, don't check for early exit — file decoding # Synchronous startup check — catch immediate failures (bad args,
# may complete very quickly and exit code 0 is normal success. # missing pipeline). For offline mode, exit code 0 is normal success
# The reader thread will handle output and detect errors. # (file decoding can finish quickly), so only raise on non-zero.
time.sleep(0.5)
if self._process.poll() is not None and self._process.returncode != 0:
error_output = self._drain_pty_output(master_fd)
if error_output:
logger.error(f"SatDump offline output:\n{error_output}")
error_msg = self._extract_error(error_output, self._process.returncode)
raise RuntimeError(error_msg)
# Start reader thread to monitor output # Start reader thread to monitor output
self._reader_thread = threading.Thread( self._reader_thread = threading.Thread(
@@ -622,12 +637,12 @@ class WeatherSatDecoder:
return 'info' return 'info'
@staticmethod @staticmethod
def _resolve_device_id(device_index: int) -> str: def _resolve_device_id(device_index: int) -> str | None:
"""Resolve RTL-SDR device index to serial number string for SatDump v1.2+. """Resolve RTL-SDR device index to serial number string for SatDump v1.2+.
SatDump v1.2+ expects --source_id as a device serial string, not a SatDump v1.2+ expects --source_id as a device serial string, not a
numeric index. Try to look up the serial via rtl_test, fall back to numeric index. Try to look up the serial via rtl_test, return None
the string representation of the index. if no serial can be found (caller should omit --source_id).
""" """
try: try:
result = subprocess.run( result = subprocess.run(
@@ -653,8 +668,35 @@ class WeatherSatDecoder:
except (subprocess.TimeoutExpired, FileNotFoundError, OSError) as e: except (subprocess.TimeoutExpired, FileNotFoundError, OSError) as e:
logger.debug(f"Could not detect device serial: {e}") logger.debug(f"Could not detect device serial: {e}")
# Fall back to string index # No serial found — caller should omit --source_id
return str(device_index) return None
@staticmethod
def _drain_pty_output(master_fd: int) -> str:
"""Read all available output from a PTY master fd."""
output = b''
try:
while True:
r, _, _ = select.select([master_fd], [], [], 0.1)
if not r:
break
chunk = os.read(master_fd, 4096)
if not chunk:
break
output += chunk
except OSError:
pass
return output.decode('utf-8', errors='replace')
@staticmethod
def _extract_error(output: str, returncode: int) -> str:
"""Extract a meaningful error message from SatDump output."""
if output:
for line in output.strip().splitlines():
lower = line.lower()
if 'error' in lower or 'could not' in lower or 'cannot' in lower or 'failed' in lower:
return line.strip()
return f"SatDump exited immediately (code {returncode})"
def _read_pty_lines(self): def _read_pty_lines(self):
"""Read lines from the PTY master fd, splitting on \\n and \\r. """Read lines from the PTY master fd, splitting on \\n and \\r.

42
utils/weather_sat_scheduler.py
View File

@@ -319,30 +319,30 @@ class WeatherSatScheduler:
if self._progress_callback: if self._progress_callback:
decoder.set_callback(self._progress_callback) decoder.set_callback(self._progress_callback)
def _release_device(): def _release_device():
try: try:
import app as app_module import app as app_module
owner = None owner = None
get_status = getattr(app_module, 'get_sdr_device_status', None) get_status = getattr(app_module, 'get_sdr_device_status', None)
if callable(get_status): if callable(get_status):
try: try:
owner = get_status().get(self._device) owner = get_status().get(self._device)
except Exception: except Exception:
owner = None owner = None
if owner and owner != 'weather_sat': if owner and owner != 'weather_sat':
logger.debug( logger.debug(
"Skipping SDR release for device %s owned by %s", "Skipping SDR release for device %s owned by %s",
self._device, self._device,
owner, owner,
) )
return return
app_module.release_sdr_device(self._device) app_module.release_sdr_device(self._device)
except ImportError: except ImportError:
pass pass
decoder.set_on_complete(lambda: self._on_capture_complete(sp, _release_device)) decoder.set_on_complete(lambda: self._on_capture_complete(sp, _release_device))
success = decoder.start( success, _error_msg = decoder.start(
satellite=sp.satellite, satellite=sp.satellite,
device_index=self._device, device_index=self._device,
gain=self._gain, gain=self._gain,