Merge pull request 'fix: drop netifaces (unbuildable), harden build install' (#9) from fix/netifaces-build into main
This commit was merged in pull request #9.
This commit is contained in:
@@ -87,9 +87,21 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
||||||
|
# Native command failures do NOT trip $ErrorActionPreference, so check
|
||||||
|
# $LASTEXITCODE explicitly — otherwise a broken install ships silently.
|
||||||
& $env:PYTHON -m pip install --upgrade pip
|
& $env:PYTHON -m pip install --upgrade pip
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "pip upgrade failed ($LASTEXITCODE)" }
|
||||||
& $env:PYTHON -m pip install -e .
|
& $env:PYTHON -m pip install -e .
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "pip install -e . failed ($LASTEXITCODE)" }
|
||||||
& $env:PYTHON -m pip install pyinstaller
|
& $env:PYTHON -m pip install pyinstaller
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "pip install pyinstaller failed ($LASTEXITCODE)" }
|
||||||
|
|
||||||
|
- name: Verify runtime imports
|
||||||
|
shell: powershell
|
||||||
|
run: |
|
||||||
|
# Fail fast if any runtime dependency is missing before we bundle.
|
||||||
|
& $env:PYTHON -c "import PySide6.QtWidgets, fastapi, uvicorn, aiohttp, PIL, pystray, qrcode, pyautogui, pyperclip, websockets, multipart; print('deps OK')"
|
||||||
|
if ($LASTEXITCODE -ne 0) { throw "dependency import smoke test failed ($LASTEXITCODE)" }
|
||||||
|
|
||||||
- name: Build Windows executable
|
- name: Build Windows executable
|
||||||
shell: powershell
|
shell: powershell
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ A cross-platform macro management application with desktop and web interfaces. C
|
|||||||
- PyAutoGUI (Keyboard automation)
|
- PyAutoGUI (Keyboard automation)
|
||||||
- Pillow (Image processing)
|
- Pillow (Image processing)
|
||||||
- pystray (System tray)
|
- pystray (System tray)
|
||||||
- netifaces (Network detection)
|
|
||||||
- qrcode (QR code generation)
|
- qrcode (QR code generation)
|
||||||
- aiohttp (Relay server client)
|
- aiohttp (Relay server client)
|
||||||
|
|
||||||
|
|||||||
+30
-10
@@ -469,19 +469,39 @@ class MainWindow(QMainWindow):
|
|||||||
# QR/copied URL lets a LAN device authenticate against the API.
|
# QR/copied URL lets a LAN device authenticate against the API.
|
||||||
token = self.settings_manager.get_web_auth_token()
|
token = self.settings_manager.get_web_auth_token()
|
||||||
token_qs = f"?token={token}" if token else ""
|
token_qs = f"?token={token}" if token else ""
|
||||||
|
ip = self._detect_lan_ip()
|
||||||
|
if ip:
|
||||||
|
self.ip_label.setText(f"http://{ip}:{DEFAULT_PORT}{token_qs}")
|
||||||
|
return
|
||||||
|
self.ip_label.setText(f"http://localhost:{DEFAULT_PORT}{token_qs}")
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _detect_lan_ip():
|
||||||
|
"""Best-effort primary LAN IPv4, with no third-party dependency.
|
||||||
|
|
||||||
|
Uses a UDP socket to discover which local interface would be used to
|
||||||
|
reach the internet (no packets are actually sent), then falls back to
|
||||||
|
resolving the hostname. Returns None if only loopback is available.
|
||||||
|
"""
|
||||||
|
import socket
|
||||||
try:
|
try:
|
||||||
import netifaces
|
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||||
for iface in netifaces.interfaces():
|
try:
|
||||||
addrs = netifaces.ifaddresses(iface)
|
s.connect(("8.8.8.8", 80))
|
||||||
if netifaces.AF_INET in addrs:
|
ip = s.getsockname()[0]
|
||||||
for addr in addrs[netifaces.AF_INET]:
|
finally:
|
||||||
ip = addr.get('addr', '')
|
s.close()
|
||||||
if ip and not ip.startswith('127.'):
|
if ip and not ip.startswith("127."):
|
||||||
self.ip_label.setText(f"http://{ip}:{DEFAULT_PORT}{token_qs}")
|
return ip
|
||||||
return
|
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
self.ip_label.setText(f"http://localhost:{DEFAULT_PORT}{token_qs}")
|
try:
|
||||||
|
for ip in socket.gethostbyname_ex(socket.gethostname())[2]:
|
||||||
|
if not ip.startswith("127."):
|
||||||
|
return ip
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
return None
|
||||||
|
|
||||||
def copy_url_to_clipboard(self):
|
def copy_url_to_clipboard(self):
|
||||||
"""Copy the web interface URL to clipboard."""
|
"""Copy the web interface URL to clipboard."""
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ a = Analysis(
|
|||||||
'pyautogui',
|
'pyautogui',
|
||||||
'pyperclip',
|
'pyperclip',
|
||||||
'pystray',
|
'pystray',
|
||||||
'netifaces',
|
|
||||||
'websockets',
|
'websockets',
|
||||||
'multipart',
|
'multipart',
|
||||||
# Relay client (imported lazily in the GUI, so declare explicitly)
|
# Relay client (imported lazily in the GUI, so declare explicitly)
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ a = Analysis(
|
|||||||
'pyperclip',
|
'pyperclip',
|
||||||
'pystray',
|
'pystray',
|
||||||
'pystray._base',
|
'pystray._base',
|
||||||
'netifaces',
|
|
||||||
'websockets',
|
'websockets',
|
||||||
'multipart',
|
'multipart',
|
||||||
# Linux system tray
|
# Linux system tray
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ a = Analysis(
|
|||||||
'pyautogui',
|
'pyautogui',
|
||||||
'pyperclip',
|
'pyperclip',
|
||||||
'pystray',
|
'pystray',
|
||||||
'netifaces',
|
|
||||||
'websockets',
|
'websockets',
|
||||||
'multipart',
|
'multipart',
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -23,8 +23,6 @@ dependencies = [
|
|||||||
"uvicorn>=0.24.0",
|
"uvicorn>=0.24.0",
|
||||||
"websockets>=12.0",
|
"websockets>=12.0",
|
||||||
"python-multipart>=0.0.6", # For file uploads
|
"python-multipart>=0.0.6", # For file uploads
|
||||||
# Network utilities
|
|
||||||
"netifaces>=0.11.0",
|
|
||||||
# QR code generation
|
# QR code generation
|
||||||
"qrcode>=7.4.2",
|
"qrcode>=7.4.2",
|
||||||
# Desktop GUI
|
# Desktop GUI
|
||||||
|
|||||||
Reference in New Issue
Block a user