roberto/siti-image-convertor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored code to be more maintainable

Browse Source
This commit is contained in:
QuBerto
2024-07-13 17:58:27 +02:00
parent 1183327e7e
commit 901daf6c06
12 changed files with 355 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

314
ui/local_processing_tab.py
View File

@@ -1,7 +1,6 @@
import tkinter as tk
from tkinter import ttk
from tkinter.scrolledtext import ScrolledText
from tkinter import filedialog
from PIL import Image, ImageTk
import tempfile
import os
@@ -9,196 +8,161 @@ from utils.file_operations import browse_directory, process_directory_with_loggi
from utils.image_processing import set_canvas_size, resize_image
from api.woocommerce import process_product_images, process_all_products
class LocalProcessingTab:
def __init__(self, tab_parent, text, log):
self.log = log
self.tab = ttk.Frame(tab_parent)
tab_parent.add(self.tab, text=text)
self.log_window = None
self.create_log_window()
canvas_width = 900
canvas_height = 900
self.canvas_width = 900
self.canvas_height = 900
self.source_type = tk.StringVar(value="local")
self.checkbox_var = tk.BooleanVar(value=False)
def create_tab_local(tab_parent, text, log):
tab = ttk.Frame(tab_parent)
tab_parent.add(tab, text=text)
self.setup_ui()
self.update_source_fields()
log_window = None
def create_log_window():
nonlocal log_window
if log_window and tk.Toplevel.winfo_exists(log_window):
def create_log_window(self):
if self.log_window and tk.Toplevel.winfo_exists(self.log_window):
return
log_window = tk.Toplevel()
log_window.title("Processing Log")
log_text = ScrolledText(log_window, state='disabled', wrap='word', height=20, width=80)
log_text.pack(expand=True, fill='both')
self.log_window = tk.Toplevel()
self.log_window.title("Processing Log")
self.log_text = ScrolledText(self.log_window, state='disabled', wrap='word', height=20, width=80)
self.log_text.pack(expand=True, fill='both')
def log_message(message):
log_text.config(state='normal')
log_text.insert(tk.END, message + "\n")
log_text.see(tk.END)
log_text.config(state='disabled')
log_text.update_idletasks() # Ensure the GUI updates
return log_message
def log_message(self, message):
self.log_text.config(state='normal')
self.log_text.insert(tk.END, message + "\n")
self.log_text.see(tk.END)
self.log_text.config(state='disabled')
self.log_text.update_idletasks()
# Source selection section
source_label = tk.Label(tab, text="Source Type:")
source_label.grid(row=0, column=0, padx=5, pady=5, sticky='w')
source_type = tk.StringVar(value="local")
source_dropdown = ttk.Combobox(tab, textvariable=source_type, values=["local", "product", "all_products"], state="readonly")
source_dropdown.grid(row=1, column=0, padx=5, pady=5, sticky='w')
source_dropdown.bind("<<ComboboxSelected>>", lambda e: update_source_fields())
def setup_ui(self):
# Local Directory selection section
def update_directory():
directory = browse_directory()
if directory:
# Show only the last directory name with ../
truncated_directory = f"../{os.path.basename(directory)}"
button_browse.config(text=truncated_directory)
update_previews()
# Source selection section
self.source_label = tk.Label(self.tab, text="Source Type:")
self.source_label.grid(row=0, column=0, padx=5, pady=5, sticky='w')
self.source_type = tk.StringVar(value="local")
self.source_dropdown = ttk.Combobox(self.tab, textvariable=self.source_type, values=["local", "product", "all_products"], state="readonly")
self.source_dropdown.grid(row=1, column=0, padx=5, pady=5, sticky='w')
self.source_dropdown.bind("<<ComboboxSelected>>", lambda e: self.update_source_fields())
button_browse = tk.Button(tab, text="Browse", command=update_directory)
button_browse.grid(row=2, column=0, padx=5, pady=5, sticky='nw')
# WooCommerce Product ID section
product_id_label = tk.Label(tab, text="Product ID:")
product_id_label.grid(row=2, column=0, padx=5, pady=5, sticky='w')
product_id_entry = tk.Entry(tab)
product_id_entry.grid(row=3, column=0, padx=5, pady=5, sticky='w')
# SKU section
additional_name_label = tk.Label(tab, text="Add suffix:")
additional_name_label.grid(row=3, column=1, padx=5, pady=5, sticky='w')
additional_name_entry = tk.Entry(tab)
additional_name_entry.grid(row=3, column=2, padx=5, pady=5, sticky='w')
self.browse_button = ttk.Button(self.tab, text="Browse", command=self.browse_directory_command)
self.browse_button.grid(row=2, column=0, padx=5, pady=5, sticky='w')
# WooCommerce Product ID section
self.product_id_label = tk.Label(self.tab, text="Product ID:")
self.product_id_label.grid(row=2, column=0, padx=5, pady=5, sticky='w')
self.product_id_entry = tk.Entry(self.tab)
self.product_id_entry.grid(row=3, column=0, padx=5, pady=5, sticky='w')
# SKU section
self.additional_name_label = tk.Label(self.tab, text="Add suffix:")
self.additional_name_label.grid(row=3, column=1, padx=5, pady=5, sticky='w')
self.additional_name_entry = tk.Entry(self.tab)
self.additional_name_entry.grid(row=3, column=2, padx=5, pady=5, sticky='w')
# Template section
template_label = tk.Label(tab, text="Filename Template:")
template_label.grid(row=3, column=1, padx=5, pady=5, sticky='w')
template_entry = tk.Entry(tab)
template_entry.insert(0, "{slug}_{sku}_{width}x{height}")
template_entry.grid(row=3, column=2, padx=5, columnspan=2, pady=5, sticky='w')
# Template section
self.template_label = tk.Label(self.tab, text="Filename Template:")
self.template_label.grid(row=3, column=1, padx=5, pady=5, sticky='w')
self.template_entry = tk.Entry(self.tab)
self.template_entry.insert(0, "{slug}_{sku}_{width}x{height}")
self.template_entry.grid(row=3, column=2, padx=5, columnspan=2, pady=5, sticky='w')
def update_source_fields():
print(source_type.get())
if source_type.get() == "local":
button_browse.grid()
product_id_label.grid_remove()
product_id_entry.grid_remove()
additional_name_label.grid()
additional_name_entry.grid()
template_entry.grid_remove()
template_label.grid_remove()
elif source_type.get() == "product":
button_browse.grid_remove()
product_id_label.grid()
product_id_entry.grid()
additional_name_label.grid_remove()
additional_name_entry.grid_remove()
# Canvas size section
width_label = tk.Label(self.tab, text="Canvas Width:")
width_label.grid(row=0, column=1, padx=5, pady=5, sticky='w')
self.width_entry = tk.Entry(self.tab)
self.width_entry.insert(0, "900")
self.width_entry.grid(row=0, column=2, padx=5, pady=5, sticky='w')
self.height_label = tk.Label(self.tab, text="Canvas Height:")
self.height_label.grid(row=1, column=1, padx=5, pady=5, sticky='w')
self.height_entry = tk.Entry(self.tab)
self.height_entry.insert(0, "900")
self.height_entry.grid(row=1, column=2, padx=5, pady=5, sticky='w')
self.button_set_size = tk.Button(self.tab, text="Save Size", command=self.apply_canvas_size)
self.button_set_size.grid(row=2, column=1, columnspan=2, padx=5, pady=5, sticky='w')
# Checkbox for deleting images
self.checkbox_var = tk.BooleanVar()
self.checkbox = tk.Checkbutton(self.tab, text="Delete image when done", variable=self.checkbox_var)
self.checkbox.grid(row=0, column=3, columnspan=2, padx=5, pady=5, sticky='w')
self.button_start = tk.Button(self.tab, text="Start Processing", command=self.start_processing)
self.button_start.grid(row=1, column=3, columnspan=2, padx=5, pady=5, sticky='w')
# Image previews
self.before_label = tk.Label(self.tab, text="Before:")
self.before_label.grid(row=5, column=0, padx=5, pady=5, sticky='w')
self.before_image_label = tk.Label(self.tab)
self.before_image_label.grid(row=6, column=0, padx=5, pady=5, sticky='w')
self.after_label = tk.Label(self.tab, text="After:")
self.after_label.grid(row=5, column=1, padx=5, pady=5, sticky='w')
self.after_image_label = tk.Label(self.tab)
self.after_image_label.grid(row=6, column=1, padx=5, pady=5, sticky='w')
def update_source_fields(self):
source = self.source_type.get()
if source == "local":
self.browse_button.grid()
self.product_id_label.grid_remove()
self.product_id_entry.grid_remove()
self.update_previews()
else:
button_browse.grid_remove()
product_id_label.grid_remove()
product_id_entry.grid_remove()
product_id_label.grid()
product_id_entry.grid()
additional_name_label.grid_remove()
additional_name_entry.grid_remove()
self.browse_button.grid_remove()
self.product_id_label.grid()
self.product_id_entry.grid()
update_source_fields() # Initial call to set correct fields
# Canvas size section
width_label = tk.Label(tab, text="Canvas Width:")
width_label.grid(row=0, column=1, padx=5, pady=5, sticky='w')
width_entry = tk.Entry(tab)
width_entry.insert(0, "900")
width_entry.grid(row=0, column=2, padx=5, pady=5, sticky='w')
height_label = tk.Label(tab, text="Canvas Height:")
height_label.grid(row=1, column=1, padx=5, pady=5, sticky='w')
height_entry = tk.Entry(tab)
height_entry.insert(0, "900")
height_entry.grid(row=1, column=2, padx=5, pady=5, sticky='w')
def apply_canvas_size():
global canvas_width, canvas_height
canvas_width = int(width_entry.get())
canvas_height = int(height_entry.get())
set_canvas_size(canvas_width, canvas_height)
update_previews()
button_set_size = tk.Button(tab, text="Save Size", command=apply_canvas_size)
button_set_size.grid(row=2, column=1, columnspan=2, padx=5, pady=5, sticky='w')
# Checkbox for deleting images
checkbox_var = tk.BooleanVar()
checkbox = tk.Checkbutton(tab, text="Delete image when done", variable=checkbox_var)
checkbox.grid(row=0, column=3, columnspan=2, padx=5, pady=5, sticky='w')
# Start Processing button
def start_processing():
log_message = None # create_log_window()
if source_type.get() == "local":
process_directory_with_logging(additional_name_entry.get(), checkbox_var.get(), log_message, update_previews)
elif source_type.get() == "product":
product_id = product_id_entry.get()
process_product_images(product_id, template_entry.get(), canvas_width, canvas_height)
else:
process_all_products(template_entry.get(), canvas_width, canvas_height)
button_start = tk.Button(tab, text="Start Processing", command=start_processing)
button_start.grid(row=1, column=3, columnspan=2, padx=5, pady=5, sticky='w')
# Image previews
before_label = tk.Label(tab, text="Before:")
before_label.grid(row=5, column=0, columnspan=2, padx=5, pady=5, sticky='w')
before_image_label = tk.Label(tab)
before_image_label.grid(row=6, columnspan=2, column=0, padx=5, pady=5, sticky='w')
after_label = tk.Label(tab, text="After:")
after_label.grid(row=5, columnspan=2, column=2, padx=5, pady=5, sticky='w')
after_image_label = tk.Label(tab)
after_image_label.grid(row=6, columnspan=2, column=2, padx=5, pady=5, sticky='w')
def update_previews(before_path=None, after_path=None):
def update_previews(self, before_path=None, after_path=None):
if before_path and after_path:
before_img = Image.open(before_path)
before_img.thumbnail((150, 150))
before_photo = ImageTk.PhotoImage(before_img)
before_image_label.config(image=before_photo)
before_image_label.image = before_photo
after_img = Image.open(after_path)
after_img.thumbnail((150, 150))
after_photo = ImageTk.PhotoImage(after_img)
after_image_label.config(image=after_photo)
after_image_label.image = after_photo
self.set_image_preview(before_path, self.before_image_label)
self.set_image_preview(after_path, self.after_image_label)
else:
first_image_path = get_first_image_path()
if first_image_path:
with tempfile.NamedTemporaryFile(suffix='.jpg', delete=False) as temp_file:
output_path = temp_file.name
resize_image(first_image_path, output_path, additional_name_entry.get())
before_img = Image.open(first_image_path)
before_img.thumbnail((150, 150))
before_photo = ImageTk.PhotoImage(before_img)
before_image_label.config(image=before_photo)
before_image_label.image = before_photo
self.set_image_preview(first_image_path, self.before_image_label)
self.after_image_label.config(image='')
after_img = Image.open(output_path)
after_img.thumbnail((150, 150))
after_photo = ImageTk.PhotoImage(after_img)
after_image_label.config(image=after_photo)
after_image_label.image = after_photo
def set_image_preview(self, image_path, label):
img = Image.open(image_path)
img.thumbnail((150, 150))
photo = ImageTk.PhotoImage(img)
label.config(image=photo)
label.image = photo
# Configure column weights to allow the log_text to expand
tab.columnconfigure(0, weight=1)
tab.columnconfigure(1, weight=1)
tab.columnconfigure(2, weight=1)
tab.columnconfigure(3, weight=1)
tab.rowconfigure(6, weight=1)
def browse_directory_command(self):
directory = browse_directory()
if directory:
self.browse_button.config(text=directory)
self.update_previews()
def apply_canvas_size(self):
self.canvas_width = int(self.width_entry.get())
self.canvas_height = int(self.height_entry.get())
set_canvas_size(self.canvas_width, self.canvas_height)
self.update_previews()
def start_processing(self):
source = self.source_type.get()
print(self.checkbox_var.get())
if source == "local":
process_directory_with_logging(self.browse_button.cget("text"), self.additional_name_entry.get(), self.checkbox_var.get(), self.log_message, self.update_previews)
elif source == "product":
process_product_images(self.product_id_entry.get(), self.canvas_width, self.canvas_height, self.log_message)
elif source == "all_products":
process_all_products(self.canvas_width, self.canvas_height, self.log_message)
self.update_previews()

27
ui/log_window.py
View File

@@ -1,16 +1,17 @@
import tkinter as tk
from tkinter.scrolledtext import ScrolledText
from tkinter import Toplevel, Text
class LogWindow(tk.Toplevel):
def __init__(self, parent):
super().__init__(parent)
self.title("Processing Log")
self.geometry("600x400")
self.log_text = ScrolledText(self, state='disabled', wrap='word')
self.log_text.pack(expand=True, fill='both')
class LogWindow(Toplevel):
def __init__(self, master=None, **kwargs):
super().__init__(master, **kwargs)
self.title("Log Window")
self.geometry("500x300")
self.text = Text(self)
self.text.pack(expand=True, fill='both')
self.protocol("WM_DELETE_WINDOW", self.hide)
def log(self, message):
self.log_text.config(state='normal')
self.log_text.insert(tk.END, message + "\n")
self.log_text.see(tk.END)
self.log_text.config(state='disabled')
self.text.insert('end', message + '\n')
self.text.see('end')
def hide(self):
self.withdraw()

107
ui/settings_tab.py
View File

@@ -2,57 +2,58 @@ import tkinter as tk
from tkinter import ttk
from api.woocommerce import save_credentials, load_credentials
def create_tab_settings(tab_parent, text):
tab = ttk.Frame(tab_parent)
tab_parent.add(tab, text=text)
class SettingsTab:
def __init__(self, tab_parent, text):
self.tab = ttk.Frame(tab_parent)
tab_parent.add(self.tab, text=text)
credentials = load_credentials()
url_value = credentials['url'] if credentials else ''
consumer_key_value = credentials['consumer_key'] if credentials else ''
consumer_secret_value = credentials['consumer_secret'] if credentials else ''
username_value = credentials['username'] if credentials else ''
password_value = credentials['password'] if credentials else ''
url_label = tk.Label(tab, text="WooCommerce URL:")
url_label.pack(pady=5)
url_entry = tk.Entry(tab)
url_entry.insert(0, url_value)
url_entry.pack()
consumer_key_label = tk.Label(tab, text="Consumer Key:")
consumer_key_label.pack(pady=5)
consumer_key_entry = tk.Entry(tab)
consumer_key_entry.insert(0, consumer_key_value)
consumer_key_entry.pack()
consumer_secret_label = tk.Label(tab, text="Consumer Secret:")
consumer_secret_label.pack(pady=5)
consumer_secret_entry = tk.Entry(tab, show="*")
consumer_secret_entry.insert(0, consumer_secret_value)
consumer_secret_entry.pack()
username_label = tk.Label(tab, text="Username:")
username_label.pack(pady=5)
username_entry = tk.Entry(tab)
username_entry.insert(0, username_value)
username_entry.pack()
password_label = tk.Label(tab, text="Password:")
password_label.pack(pady=5)
password_entry = tk.Entry(tab, show="*")
password_entry.insert(0, password_value)
password_entry.pack()
button_save = tk.Button(tab, text="Save Credentials", command=lambda: save_credentials(
url_entry.get(),
consumer_key_entry.get(),
consumer_secret_entry.get(),
username_entry.get(),
password_entry.get()
))
button_save.pack(pady=5)
self.credentials = load_credentials()
self.setup_ui()
def setup_ui(self):
url_label = tk.Label(self.tab, text="WooCommerce URL:")
url_label.pack(pady=5)
self.url_entry = tk.Entry(self.tab)
self.url_entry.insert(0, self.credentials.get('url', ''))
self.url_entry.pack(pady=5)
consumer_key_label = tk.Label(self.tab, text="Consumer Key:")
consumer_key_label.pack(pady=5)
self.consumer_key_entry = tk.Entry(self.tab)
self.consumer_key_entry.insert(0, self.credentials.get('consumer_key', ''))
self.consumer_key_entry.pack(pady=5)
consumer_secret_label = tk.Label(self.tab, text="Consumer Secret:")
consumer_secret_label.pack(pady=5)
self.consumer_secret_entry = tk.Entry(self.tab, show="*")
self.consumer_secret_entry.insert(0, self.credentials.get('consumer_secret', ''))
self.consumer_secret_entry.pack(pady=5)
username_label = tk.Label(self.tab, text="Username:")
username_label.pack(pady=5)
self.username_entry = tk.Entry(self.tab)
self.username_entry.insert(0, self.credentials.get('username', ''))
self.username_entry.pack(pady=5)
password_label = tk.Label(self.tab, text="Password:")
password_label.pack(pady=5)
self.password_entry = tk.Entry(self.tab, show="*")
self.password_entry.insert(0, self.credentials.get('password', ''))
self.password_entry.pack(pady=5)
save_button = tk.Button(self.tab, text="Save Credentials", command=self.save_credentials)
save_button.pack(pady=5)
def save_credentials(self):
save_credentials(
self.url_entry.get(),
self.consumer_key_entry.get(),
self.consumer_secret_entry.get(),
self.username_entry.get(),
self.password_entry.get()
)