MacroPad/MP-Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update v2 to not be dependent on Windows C++ runtimes, add QRCode, Add Refresh button to Web Interface

Browse Source
This commit is contained in:
jknapp 2025-03-18 12:43:08 -07:00
parent 933e166b06
commit d9d870096d
3 changed files with 234 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
dist/mp-server-v2.exe vendored Normal file
View File

Binary file not shown.

122
mp-server-v2.py
View File

@ -12,7 +12,9 @@ from flask import Flask, render_template_string, request, jsonify, send_file
import webbrowser import webbrowser
from waitress import serve from waitress import serve
import logging import logging
import netifaces import socket
import qrcode
import sys
class MacroPadServer: class MacroPadServer:
def __init__(self, root): def __init__(self, root):
@ -22,9 +24,13 @@ class MacroPadServer:
self.configure_styles() self.configure_styles()
# Set up directories # Set up directories
if getattr(sys, 'frozen', False):
base_dir = os.path.dirname(sys.executable)
else:
base_dir = os.path.dirname(os.path.abspath(__file__)) base_dir = os.path.dirname(os.path.abspath(__file__))
self.data_file = os.path.join(base_dir, "macros.json") self.data_file = os.path.join(base_dir, "macros.json")
self.images_dir = os.path.join(base_dir, "macro_images") self.images_dir = os.path.join(base_dir, "macro_images")
self.app_dir = base_dir
os.makedirs(self.images_dir, exist_ok=True) os.makedirs(self.images_dir, exist_ok=True)
self.macros = {} self.macros = {}
@ -178,7 +184,7 @@ class MacroPadServer:
if macro["image_path"] in self.image_cache: if macro["image_path"] in self.image_cache:
button_image = self.image_cache[macro["image_path"]] button_image = self.image_cache[macro["image_path"]]
else: else:
img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), macro["image_path"]) img_path = os.path.join(self.app_dir, macro["image_path"])
img = Image.open(img_path) img = Image.open(img_path)
img = img.resize((32, 32)) img = img.resize((32, 32))
button_image = ImageTk.PhotoImage(img) button_image = ImageTk.PhotoImage(img)
@ -213,19 +219,19 @@ class MacroPadServer:
self.flask_thread.start() self.flask_thread.start()
self.server_button.config(text="Stop Web Server") self.server_button.config(text="Stop Web Server")
# Get all IP addresses to display # Get the systems internal IP address
ip_addresses = self.get_ip_addresses() ip_address = self.get_ip_addresses()
if ip_addresses: if ip_address:
# Set the URL display # Set the URL display
urls = [f"http://{ip}:{self.server_port}" for ip in ip_addresses] url = f"http://{ip_address}:{self.server_port}"
url_text = "Web UI available at:\n" + "\n".join(urls) url_text = "Web UI available at:\n" + "\n" + url
self.url_var.set(url_text) self.url_var.set(url_text)
# Enable browser button # Enable browser button
self.browser_button.config(state=tk.NORMAL) self.browser_button.config(state=tk.NORMAL)
# Generate and display QR code for the first IP # Generate and display QR code for the first IP
self.generate_qr_code(urls[0]) self.generate_qr_code(url)
else: else:
self.url_var.set("No network interfaces found") self.url_var.set("No network interfaces found")
except Exception as e: except Exception as e:
@ -246,30 +252,34 @@ class MacroPadServer:
# The Flask server will be stopped on the next request # The Flask server will be stopped on the next request
def get_ip_addresses(self): def get_ip_addresses(self):
ip_addresses = [] """Get the primary internal IPv4 address of the machine."""
try: try:
# Get all network interfaces # Create a socket to connect to an external server
interfaces = netifaces.interfaces() # This helps determine which network interface is used for outbound connections
for interface in interfaces: s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# Skip loopback interface # We don't need to actually send data - just configure the socket
if interface.startswith('lo'): s.connect(("8.8.8.8", 80))
continue # Get the IP address that would be used for this connection
ip = s.getsockname()[0]
# Get addresses for this interface s.close()
addresses = netifaces.ifaddresses(interface) return ip
if netifaces.AF_INET in addresses:
for address in addresses[netifaces.AF_INET]:
ip = address.get('addr')
if ip and not ip.startswith('127.'):
ip_addresses.append(ip)
# Always include localhost
ip_addresses.append('localhost')
return ip_addresses
except Exception as e: except Exception as e:
print(f"Error getting IP addresses: {e}") print(f"Error getting IP address: {e}")
return ['localhost'] # Fallback method if the above doesn't work
try:
hostname = socket.gethostname()
ip = socket.gethostbyname(hostname)
# Don't return localhost address
if ip.startswith("127."):
for addr_info in socket.getaddrinfo(hostname, None):
potential_ip = addr_info[4][0]
# If IPv4 and not localhost
if '.' in potential_ip and not potential_ip.startswith("127."):
return potential_ip
else:
return ip
except:
return "127.0.0.1" # Last resort fallback
def generate_qr_code(self, url): def generate_qr_code(self, url):
try: try:
@ -329,9 +339,33 @@ class MacroPadServer:
background-color: #2e2e2e; background-color: #2e2e2e;
color: #ffffff; color: #ffffff;
} }
.header-container {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20px;
}
h1 { h1 {
color: #007acc; color: #007acc;
text-align: center; margin: 0;
}
.refresh-button {
background-color: #505050;
color: white;
border: none;
border-radius: 8px;
padding: 10px 15px;
font-size: 16px;
cursor: pointer;
transition: background-color 0.3s;
display: flex;
align-items: center;
}
.refresh-button:hover {
background-color: #007acc;
}
.refresh-button svg {
margin-right: 5px;
} }
.macro-grid { .macro-grid {
display: grid; display: grid;
@ -390,41 +424,47 @@ class MacroPadServer:
h1 { h1 {
font-size: 24px; font-size: 24px;
} }
.refresh-button {
padding: 8px 12px;
font-size: 14px;
}
} }
</style> </style>
</head> </head>
<body> <body>
<div class="header-container">
<h1>MacroPad Web Interface</h1> <h1>MacroPad Web Interface</h1>
<button class="refresh-button" onclick="loadMacros()">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" viewBox="0 0 16 16">
<path d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z"/>
<path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z"/>
</svg>
Refresh
</button>
</div>
<div class="status success" id="success-status">Macro executed successfully!</div> <div class="status success" id="success-status">Macro executed successfully!</div>
<div class="status error" id="error-status">Failed to execute macro</div> <div class="status error" id="error-status">Failed to execute macro</div>
<div class="macro-grid" id="macro-grid"> <div class="macro-grid" id="macro-grid">
<!-- Macros will be loaded here --> <!-- Macros will be loaded here -->
</div> </div>
<script> <script>
document.addEventListener('DOMContentLoaded', function() { document.addEventListener('DOMContentLoaded', function() {
loadMacros(); loadMacros();
}); });
function loadMacros() { function loadMacros() {
fetch('/api/macros') fetch('/api/macros')
.then(response => response.json()) .then(response => response.json())
.then(macros => { .then(macros => {
const macroGrid = document.getElementById('macro-grid'); const macroGrid = document.getElementById('macro-grid');
macroGrid.innerHTML = ''; macroGrid.innerHTML = '';
if (Object.keys(macros).length === 0) { if (Object.keys(macros).length === 0) {
macroGrid.innerHTML = '<p style="grid-column: 1 / -1; text-align: center;">No macros defined.</p>'; macroGrid.innerHTML = '<p style="grid-column: 1 / -1; text-align: center;">No macros defined.</p>';
return; return;
} }
for (const [macroId, macro] of Object.entries(macros)) { for (const [macroId, macro] of Object.entries(macros)) {
const button = document.createElement('button'); const button = document.createElement('button');
button.className = 'macro-button'; button.className = 'macro-button';
button.onclick = function() { executeMacro(macroId); }; button.onclick = function() { executeMacro(macroId); };
// Add image if available // Add image if available
if (macro.image_path) { if (macro.image_path) {
const img = document.createElement('img'); const img = document.createElement('img');
@ -435,10 +475,8 @@ class MacroPadServer:
}; };
button.appendChild(img); button.appendChild(img);
} }
const text = document.createTextNode(macro.name); const text = document.createTextNode(macro.name);
button.appendChild(text); button.appendChild(text);
macroGrid.appendChild(button); macroGrid.appendChild(button);
} }
}) })
@ -446,7 +484,6 @@ class MacroPadServer:
console.error('Error loading macros:', error); console.error('Error loading macros:', error);
}); });
} }
function executeMacro(macroId) { function executeMacro(macroId) {
fetch('/api/execute', { fetch('/api/execute', {
method: 'POST', method: 'POST',
@ -459,7 +496,6 @@ class MacroPadServer:
.then(data => { .then(data => {
const successStatus = document.getElementById('success-status'); const successStatus = document.getElementById('success-status');
const errorStatus = document.getElementById('error-status'); const errorStatus = document.getElementById('error-status');
if (data.success) { if (data.success) {
successStatus.style.display = 'block'; successStatus.style.display = 'block';
errorStatus.style.display = 'none'; errorStatus.style.display = 'none';
@ -495,7 +531,7 @@ class MacroPadServer:
try: try:
# Using os.path.join would translate slashes incorrectly on Windows # Using os.path.join would translate slashes incorrectly on Windows
# Use normpath instead # Use normpath instead
image_path = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), image_path)) image_path = os.path.join(self.app_dir, image_path)
return send_file(image_path) return send_file(image_path)
except Exception as e: except Exception as e:
return str(e), 404 return str(e), 404

1
requirements.txt
View File

@ -4,3 +4,4 @@ pystray
flask flask
waitress waitress
netifaces netifaces
qrcode