switching images to byte
This commit is contained in:
parent
d7a291a58f
commit
188b462540
78
mp-server.py
78
mp-server.py
@ -10,7 +10,8 @@ import subprocess
|
||||
from PIL import Image, ImageTk
|
||||
import pystray # Add this import for system tray functionality
|
||||
import io
|
||||
import time
|
||||
import uuid
|
||||
import shutil
|
||||
|
||||
class MacroPadServer:
|
||||
def __init__(self, root):
|
||||
@ -18,6 +19,10 @@ class MacroPadServer:
|
||||
self.root.title("MacroPad Server")
|
||||
self.root.geometry("800x600")
|
||||
|
||||
# Create the image Directory
|
||||
self.images_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "macro_images")
|
||||
os.makedirs(self.images_dir, exist_ok=True)
|
||||
|
||||
# Set dark theme colors
|
||||
self.bg_color = "#2E2E2E"
|
||||
self.fg_color = "#FFFFFF"
|
||||
@ -167,12 +172,13 @@ class MacroPadServer:
|
||||
frame.grid(row=row, column=col, padx=10, pady=10, sticky="nsew")
|
||||
|
||||
# Load image if exists
|
||||
if "image_data" in macro and macro["image_data"]:
|
||||
if "image_path" in macro and macro["image_path"]:
|
||||
try:
|
||||
image_data = base64.b64decode(macro["image_data"])
|
||||
image = Image.open(io.BytesIO(image_data))
|
||||
image = image.resize((64, 64), Image.LANCZOS)
|
||||
photo = ImageTk.PhotoImage(image)
|
||||
img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), macro["image_path"])
|
||||
img = Image.open(img_path)
|
||||
# Resize for display
|
||||
img.thumbnail((64, 64)) # Keep aspect ratio for display
|
||||
photo = ImageTk.PhotoImage(img)
|
||||
label = tk.Label(frame, image=photo, bg=self.highlight_color)
|
||||
label.image = photo # Keep a reference
|
||||
label.pack()
|
||||
@ -256,12 +262,22 @@ class MacroPadServer:
|
||||
macro_id = str(len(self.macros) + 1)
|
||||
|
||||
# Process image
|
||||
image_data = ""
|
||||
image_path_reference = ""
|
||||
img_path = image_path.get()
|
||||
if img_path:
|
||||
try:
|
||||
with open(img_path, "rb") as img_file:
|
||||
image_data = base64.b64encode(img_file.read()).decode('utf-8')
|
||||
# Generate unique filename for the image
|
||||
file_ext = os.path.splitext(img_path)[1].lower()
|
||||
unique_filename = f"{uuid.uuid4().hex}{file_ext}"
|
||||
dest_path = os.path.join(self.images_dir, unique_filename)
|
||||
|
||||
# Resize image to max 256x256
|
||||
with Image.open(img_path) as img:
|
||||
img.thumbnail((256, 256))
|
||||
img.save(dest_path)
|
||||
|
||||
# Store the relative path to the image
|
||||
image_path_reference = os.path.join("macro_images", unique_filename)
|
||||
except Exception as e:
|
||||
print(f"Error processing image: {e}")
|
||||
|
||||
@ -270,7 +286,7 @@ class MacroPadServer:
|
||||
"name": name,
|
||||
"type": macro_type,
|
||||
"command": command,
|
||||
"image_data": image_data,
|
||||
"image_path": image_path_reference,
|
||||
"modifiers": {
|
||||
"ctrl": ctrl_var.get(),
|
||||
"alt": alt_var.get(),
|
||||
@ -398,21 +414,32 @@ class MacroPadServer:
|
||||
command = command_text.get("1.0", tk.END).strip()
|
||||
|
||||
# Keep the old image or update with new one
|
||||
image_data = macro.get("image_data", "")
|
||||
image_path_reference = macro.get("image_path", "")
|
||||
img_path = image_path.get()
|
||||
if img_path:
|
||||
try:
|
||||
with open(img_path, "rb") as img_file:
|
||||
image_data = base64.b64encode(img_file.read()).decode('utf-8')
|
||||
# Generate unique filename for the image
|
||||
file_ext = os.path.splitext(img_path)[1].lower()
|
||||
unique_filename = f"{uuid.uuid4().hex}{file_ext}"
|
||||
dest_path = os.path.join(self.images_dir, unique_filename)
|
||||
|
||||
# Resize image to max 256x256
|
||||
with Image.open(img_path) as img:
|
||||
img.thumbnail((256, 256))
|
||||
img.save(dest_path)
|
||||
|
||||
# Store the relative path to the image
|
||||
image_path_reference = os.path.join("macro_images", unique_filename)
|
||||
except Exception as e:
|
||||
print(f"Error processing image: {e}")
|
||||
|
||||
|
||||
# Update macro with modifiers
|
||||
self.macros[macro_id] = {
|
||||
"name": name,
|
||||
"type": new_type,
|
||||
"command": command,
|
||||
"image_data": image_data,
|
||||
"image_path": image_path_reference,
|
||||
"modifiers": {
|
||||
"ctrl": ctrl_var.get(),
|
||||
"alt": alt_var.get(),
|
||||
@ -463,6 +490,15 @@ class MacroPadServer:
|
||||
|
||||
# Confirm deletion
|
||||
if tk.messagebox.askyesno("Confirm Deletion", f"Are you sure you want to delete macro '{selected_name}'?"):
|
||||
# Delete associated image file if it exists
|
||||
macro = self.macros[selected_macro_id]
|
||||
if "image_path" in macro and macro["image_path"]:
|
||||
try:
|
||||
img_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), macro["image_path"])
|
||||
if os.path.exists(img_path):
|
||||
os.remove(img_path)
|
||||
except Exception as e:
|
||||
print(f"Error removing image file: {e}")
|
||||
del self.macros[selected_macro_id]
|
||||
self.save_macros()
|
||||
self.display_macros()
|
||||
@ -572,6 +608,20 @@ class MacroPadServer:
|
||||
success = self.execute_macro(request['macro_id'])
|
||||
response = {'success': success}
|
||||
client_socket.send(json.dumps(response).encode('utf-8'))
|
||||
elif request['action'] == 'get_image':
|
||||
image_path = request['image_path']
|
||||
if os.path.exists(image_path):
|
||||
try:
|
||||
with open(image_path, 'rb') as f:
|
||||
image_data =f.read
|
||||
image_size = len(image_data)
|
||||
client_socket.send(str(image_size).encode('utf-8'))
|
||||
client_socket.recv(1024) # Wait for acknowledgment
|
||||
client_socket.sendall(image_data)
|
||||
except FileNotFoundError:
|
||||
client_socket.send(b"ERROR: Image not found")
|
||||
except Exception as e:
|
||||
client_socket.send(f"ERROR: {str(e)}".encode('utf-8'))
|
||||
else:
|
||||
client_socket.send(json.dumps({'error': 'Unknown action'}).encode('utf-8'))
|
||||
except (json.JSONDecodeError, KeyError, TypeError) as e:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user