mirror of
https://github.com/smittix/intercept.git
synced 2026-07-29 02:58:11 -07:00
Fix API/frontend field name mismatches
- Add 'available' alias for 'can_scan' in capabilities - Add 'preferred_backend' alias for 'recommended_backend' - Add 'id' field to adapter info for frontend compatibility Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -130,6 +130,7 @@ def _check_adapters(caps: SystemCapabilities) -> None:
|
|||||||
if 'org.bluez.Adapter1' in interfaces:
|
if 'org.bluez.Adapter1' in interfaces:
|
||||||
adapter_props = interfaces['org.bluez.Adapter1']
|
adapter_props = interfaces['org.bluez.Adapter1']
|
||||||
adapter_info = {
|
adapter_info = {
|
||||||
|
'id': str(path), # Alias for frontend
|
||||||
'path': str(path),
|
'path': str(path),
|
||||||
'name': str(adapter_props.get('Name', 'Unknown')),
|
'name': str(adapter_props.get('Name', 'Unknown')),
|
||||||
'address': str(adapter_props.get('Address', 'Unknown')),
|
'address': str(adapter_props.get('Address', 'Unknown')),
|
||||||
@@ -168,9 +169,11 @@ def _check_adapters_hciconfig(caps: SystemCapabilities) -> None:
|
|||||||
# Match adapter line (e.g., "hci0: Type: Primary Bus: USB")
|
# Match adapter line (e.g., "hci0: Type: Primary Bus: USB")
|
||||||
adapter_match = re.match(r'^(hci\d+):', line)
|
adapter_match = re.match(r'^(hci\d+):', line)
|
||||||
if adapter_match:
|
if adapter_match:
|
||||||
|
adapter_name = adapter_match.group(1)
|
||||||
current_adapter = {
|
current_adapter = {
|
||||||
'path': f'/org/bluez/{adapter_match.group(1)}',
|
'id': adapter_name, # Alias for frontend
|
||||||
'name': adapter_match.group(1),
|
'path': f'/org/bluez/{adapter_name}',
|
||||||
|
'name': adapter_name,
|
||||||
'address': 'Unknown',
|
'address': 'Unknown',
|
||||||
'powered': False,
|
'powered': False,
|
||||||
'discovering': False,
|
'discovering': False,
|
||||||
|
|||||||
@@ -336,6 +336,8 @@ class SystemCapabilities:
|
|||||||
def to_dict(self) -> dict:
|
def to_dict(self) -> dict:
|
||||||
"""Convert to dictionary for JSON serialization."""
|
"""Convert to dictionary for JSON serialization."""
|
||||||
return {
|
return {
|
||||||
|
'available': self.can_scan, # Alias for frontend compatibility
|
||||||
|
'can_scan': self.can_scan,
|
||||||
'has_dbus': self.has_dbus,
|
'has_dbus': self.has_dbus,
|
||||||
'has_bluez': self.has_bluez,
|
'has_bluez': self.has_bluez,
|
||||||
'bluez_version': self.bluez_version,
|
'bluez_version': self.bluez_version,
|
||||||
@@ -349,7 +351,7 @@ class SystemCapabilities:
|
|||||||
'has_hcitool': self.has_hcitool,
|
'has_hcitool': self.has_hcitool,
|
||||||
'has_bluetoothctl': self.has_bluetoothctl,
|
'has_bluetoothctl': self.has_bluetoothctl,
|
||||||
'has_btmgmt': self.has_btmgmt,
|
'has_btmgmt': self.has_btmgmt,
|
||||||
|
'preferred_backend': self.recommended_backend, # Alias for frontend
|
||||||
'recommended_backend': self.recommended_backend,
|
'recommended_backend': self.recommended_backend,
|
||||||
'can_scan': self.can_scan,
|
|
||||||
'issues': self.issues,
|
'issues': self.issues,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user