Now works with optima35 0.5.0
This commit is contained in:
parent
1bc135e8c3
commit
ad62200bb5
2 changed files with 189 additions and 172 deletions
135
tui.py
135
tui.py
|
|
@ -7,11 +7,13 @@ from ui.simple_tui import SimpleTUI
|
|||
|
||||
class Optima35TUI():
|
||||
def __init__(self, exif_file, settings_file):
|
||||
self.name = "TUI35"
|
||||
self.version = "0.1.0"
|
||||
self.o = OPTIMA35()
|
||||
self.u = Utilities()
|
||||
self.tui = SimpleTUI()
|
||||
self.exif_file = exif_file
|
||||
self.exif_data = self.u.read_yaml(exif_file)
|
||||
self.available_exif_data = self.u.read_yaml(exif_file)
|
||||
self.setting_file = settings_file
|
||||
self.settings = {
|
||||
"input_folder": None,
|
||||
|
|
@ -36,19 +38,16 @@ class Optima35TUI():
|
|||
"brightness"
|
||||
]
|
||||
|
||||
def process(self):
|
||||
if "Change EXIF" in self.settings["modifications"]:
|
||||
self.selected_exif = self.collect_exif_data()
|
||||
self.check_options() # Get all user selected data
|
||||
input_folder_valid = os.path.exists(self.o.settings["input_folder"])
|
||||
output_folder_valid = os.path.exists(self.o.settings["output_folder"])
|
||||
def _process(self):
|
||||
self._check_options() # Get all user selected data
|
||||
input_folder_valid = os.path.exists(self.settings["input_folder"])
|
||||
output_folder_valid = os.path.exists(self.settings["output_folder"])
|
||||
if not input_folder_valid or not output_folder_valid:
|
||||
print("Warning", f"Input location {input_folder_valid}\nOutput folder {output_folder_valid}...")
|
||||
return
|
||||
|
||||
input_folder = self.o.settings["input_folder"]
|
||||
output_folder = self.o.settings["output_folder"]
|
||||
|
||||
input_folder = self.settings["input_folder"]
|
||||
output_folder = self.settings["output_folder"]
|
||||
|
||||
image_files = [
|
||||
f for f in os.listdir(input_folder) if f.lower().endswith((".png", ".jpg", ".jpeg", ".webp"))
|
||||
|
|
@ -56,80 +55,90 @@ class Optima35TUI():
|
|||
i = 1
|
||||
for image_file in image_files:
|
||||
input_path = os.path.join(input_folder, image_file)
|
||||
if self.o.settings["new_file_names"] != False:
|
||||
image_name = self.o.name_images(self.o.settings["new_file_names"], i, len(image_files), self.o.settings["invert_image_order"])
|
||||
if self.settings["new_file_names"] != False:
|
||||
image_name = self.u.append_number_to_name(self.settings["new_file_names"], i, len(image_files), self.settings["invert_image_order"])
|
||||
else:
|
||||
image_name = os.path.splitext(image_file)[0]
|
||||
output_path = os.path.join(output_folder, image_name)
|
||||
self.o.process(input_path, output_path)
|
||||
self.o.process_image(
|
||||
image_input_file = input_path,
|
||||
image_output_file = output_path,
|
||||
file_type = self.settings["file_format"],
|
||||
quality = self.settings["jpg_quality"],
|
||||
compressing = self.settings["png_compression"],
|
||||
optimize = self.settings["optimize"],
|
||||
resize = self.settings["resize"],
|
||||
watermark = self.settings["watermark"],
|
||||
font_size = self.settings["font_size"],
|
||||
grayscale = self.settings["grayscale"],
|
||||
brightness = self.settings["brightness"],
|
||||
contrast = self.settings["contrast"],
|
||||
dict_for_exif = self.selected_exif,
|
||||
gps = self.settings["gps"],
|
||||
copy_exif = self.settings["copy_exif"])
|
||||
self.u.progress_bar(i, len(image_files))
|
||||
i += 1
|
||||
|
||||
def check_options(self):
|
||||
def _check_options(self):
|
||||
try:
|
||||
if "Resize image" in self.settings["modifications"]:
|
||||
self.o.settings["resize"] = self.settings["resize"]
|
||||
self.settings["resize"] = self.settings["resize"]
|
||||
else:
|
||||
self.o.settings["resize"] = False
|
||||
self.settings["resize"] = None
|
||||
|
||||
if "Convert to grayscale" in self.settings["modifications"]:
|
||||
self.o.settings["grayscale"] = True
|
||||
self.settings["grayscale"] = True
|
||||
else:
|
||||
self.o.settings["grayscale"] = False
|
||||
self.settings["grayscale"] = False
|
||||
|
||||
if "Change contrast" in self.settings["modifications"]:
|
||||
self.o.settings["contrast"] = self.settings["contrast"]
|
||||
self.settings["contrast"] = self.settings["contrast"]
|
||||
else:
|
||||
self.o.settings["contrast"] = False
|
||||
self.settings["contrast"] = None
|
||||
|
||||
if "Change brightness" in self.settings["modifications"]:
|
||||
self.o.settings["brightness"] = self.settings["brightness"]
|
||||
self.settings["brightness"] = self.settings["brightness"]
|
||||
else:
|
||||
self.o.settings["brightness"] = False
|
||||
self.settings["brightness"] = None
|
||||
|
||||
if "Rename images" in self.settings["modifications"]:
|
||||
self.o.settings["new_file_names"] = self.settings["new_file_names"]
|
||||
self.settings["new_file_names"] = self.settings["new_file_names"]
|
||||
else:
|
||||
self.o.settings["new_file_names"] = False
|
||||
self.settings["new_file_names"] = False
|
||||
|
||||
if "Invert image order" in self.settings["modifications"]:
|
||||
self.o.settings["invert_image_order"] = True
|
||||
self.settings["invert_image_order"] = True
|
||||
else:
|
||||
self.o.settings["invert_image_order"] = False
|
||||
self.settings["invert_image_order"] = False
|
||||
|
||||
if "Add Watermark" in self.settings["modifications"]:
|
||||
self.o.settings["watermark"] = self.settings["watermark"]
|
||||
self.settings["watermark"] = self.settings["watermark"]
|
||||
else:
|
||||
self.o.settings["watermark"] = False
|
||||
self.settings["watermark"] = None
|
||||
|
||||
self.o.settings["optimize"] = self.settings["optimize"]
|
||||
self.o.settings["png_compression"] = self.settings["png_compression"]
|
||||
self.o.settings["jpg_quality"] = self.settings["jpg_quality"]
|
||||
self.settings["optimize"] = self.settings["optimize"]
|
||||
self.settings["png_compression"] = self.settings["png_compression"]
|
||||
self.settings["jpg_quality"] = self.settings["jpg_quality"]
|
||||
|
||||
self.o.settings["input_folder"] = self.settings["input_folder"]
|
||||
self.o.settings["output_folder"] = self.settings["output_folder"]
|
||||
self.o.settings["file_format"] = self.settings["file_format"]
|
||||
self.o.settings["font_size"] = 2 # need to add option to select size
|
||||
self.settings["input_folder"] = self.settings["input_folder"]
|
||||
self.settings["output_folder"] = self.settings["output_folder"]
|
||||
self.settings["file_format"] = self.settings["file_format"]
|
||||
self.settings["font_size"] = 2 # need to add option to select size
|
||||
|
||||
self.o.settings["copy_exif"] = self.settings["copy_exif"]
|
||||
self.settings["copy_exif"] = self.settings["copy_exif"]
|
||||
|
||||
if "Change EXIF" in self.settings["modifications"]: #missing
|
||||
self.o.selected_exif = self.selected_exif #
|
||||
self.o.settings["own_exif"] = True
|
||||
if self.settings["gps"] != None:
|
||||
self.o.settings["gps"] = self.settings["gps"]
|
||||
else:
|
||||
self.o.settings["gps"] = False
|
||||
self.selected_exif = self._collect_exif_data() #
|
||||
else:
|
||||
self.o.settings["own_exif"] = False
|
||||
self.selected_exif = None
|
||||
|
||||
except Exception as e:
|
||||
print(f"Whoops: {e}")
|
||||
|
||||
def load_or_ask_settings(self):
|
||||
def _load_or_ask_settings(self):
|
||||
"""Load settings from a YAML file or ask the user if not present or incomplete."""
|
||||
try:
|
||||
if self.read_settings(self.settings_to_save):
|
||||
if self._read_settings(self.settings_to_save):
|
||||
for item in self.settings_to_save:
|
||||
print(f"{item}: {self.settings[item]}")
|
||||
use_saved = self.tui.yes_no_menu("Use these settings?")
|
||||
|
|
@ -137,12 +146,12 @@ class Optima35TUI():
|
|||
return
|
||||
else:
|
||||
print("No settings found...")
|
||||
self.ask_for_settings()
|
||||
self._ask_for_settings()
|
||||
except Exception as e:
|
||||
print(f"Error: {e}")
|
||||
self.ask_for_settings()
|
||||
self._ask_for_settings()
|
||||
|
||||
def ask_for_settings(self):
|
||||
def _ask_for_settings(self):
|
||||
print("Asking for new settings...\n")
|
||||
self.settings["resize"] = self.take_input_and_validate(question = "Default resize percentage (below 100 downscale, above upscale): ", accepted_type = int, min_value = 10, max_value = 200)
|
||||
self.settings["contrast"] = self.take_input_and_validate(question = "Default contrast percentage (negative = decrease, positive = increase): ", accepted_type = int, min_value = -100, max_value = 100)
|
||||
|
|
@ -151,16 +160,16 @@ class Optima35TUI():
|
|||
self.settings["png_compression"] = self.take_input_and_validate(question = "PNG compression level (0-9, 6 default): ", accepted_type = int, min_value = 0, max_value = 9)
|
||||
self.settings["optimize"] = self.tui.yes_no_menu("Optimize images i.e. compressing?")
|
||||
|
||||
self.write_settings(self.settings_to_save)
|
||||
self._write_settings(self.settings_to_save)
|
||||
|
||||
def write_settings(self, keys_to_save):
|
||||
def _write_settings(self, keys_to_save):
|
||||
""""Write self.setting, but only specific values"""
|
||||
keys = keys_to_save
|
||||
filtered_settings = {key: self.settings[key] for key in keys if key in self.settings}
|
||||
self.u.write_yaml(self.setting_file, filtered_settings)
|
||||
print("New settings saved successfully.")
|
||||
|
||||
def read_settings(self, keys_to_load):
|
||||
def _read_settings(self, keys_to_load):
|
||||
"""
|
||||
Read settings from the settings file and update self.settings
|
||||
with the values for specific keys without overwriting existing values.
|
||||
|
|
@ -178,7 +187,7 @@ class Optima35TUI():
|
|||
print("Settings file empty.")
|
||||
return False
|
||||
|
||||
def collect_exif_data(self):
|
||||
def _collect_exif_data(self):
|
||||
"""Collect EXIF data based on user input."""
|
||||
user_data = {}
|
||||
fields = [
|
||||
|
|
@ -187,24 +196,24 @@ class Optima35TUI():
|
|||
]
|
||||
for field in fields:
|
||||
|
||||
choise = self.tui.choose_menu(f"Enter {field.replace('_', ' ').title()}", self.exif_data[field])
|
||||
choise = self.tui.choose_menu(f"Enter {field.replace('_', ' ').title()}", self.available_exif_data[field])
|
||||
user_data[field] = choise
|
||||
|
||||
user_data["software"] = f"{self.o.name} {self.o.version}"
|
||||
new_date = self.get_date_input()
|
||||
new_date = self._get_date_input()
|
||||
|
||||
if new_date:
|
||||
user_data["date_time_original"] = new_date
|
||||
|
||||
self.settings["gps"] = self.get_gps_input(user_data)
|
||||
self.settings["gps"] = self._get_gps_input(user_data)
|
||||
|
||||
return user_data
|
||||
|
||||
def get_gps_input(self, test_exif):
|
||||
def _get_gps_input(self, test_exif):
|
||||
while True:
|
||||
lat = input("Enter Latitude (xx.xxxxxx): ")
|
||||
if lat == "":
|
||||
return False
|
||||
return None
|
||||
long = input("Enter Longitude (xx.xxxxxx): ")
|
||||
try:
|
||||
self.o.exif_handler.add_geolocation_to_exif(test_exif, float(lat), float(long))
|
||||
|
|
@ -212,7 +221,7 @@ class Optima35TUI():
|
|||
except Exception:
|
||||
print("Invalid GPS formate, try again...")
|
||||
|
||||
def get_date_input(self):
|
||||
def _get_date_input(self):
|
||||
# Partially chatGPT
|
||||
while True:
|
||||
date_input = input("Enter a date (yyyy-mm-dd): ")
|
||||
|
|
@ -224,7 +233,7 @@ class Optima35TUI():
|
|||
except ValueError:
|
||||
print("Invalid date format. Please enter the date in yyyy-mm-dd format.")
|
||||
|
||||
def get_user_settings(self):
|
||||
def _get_user_settings(self):
|
||||
"""Get initial settings from the user."""
|
||||
menu_options = [
|
||||
"Resize image",
|
||||
|
|
@ -241,7 +250,7 @@ class Optima35TUI():
|
|||
self.settings["output_folder"] = input("Enter path of output folder: ").strip()
|
||||
self.settings["file_format"] = self.take_input_and_validate(question = "Enter export file format (jpg, png, webp): ", accepted_input = ["jpg", "png", "webp"], accepted_type = str)
|
||||
self.settings["modifications"] = self.tui.multi_select_menu(
|
||||
f"\n{self.o.name} v.{self.o.version} \nSelect what you want to do (esc or q to exit)",
|
||||
f"\n{self.name} v{self.version} for {self.o.name} v.{self.o.version} \nSelect what you want to do (esc or q to exit)",
|
||||
menu_options
|
||||
)
|
||||
if "Change EXIF" not in self.settings["modifications"]:
|
||||
|
|
@ -304,9 +313,9 @@ class Optima35TUI():
|
|||
|
||||
def run(self):
|
||||
"""Run the main program."""
|
||||
self.load_or_ask_settings()
|
||||
self.get_user_settings()
|
||||
self.process()
|
||||
self._load_or_ask_settings()
|
||||
self._get_user_settings()
|
||||
self._process()
|
||||
print("Done")
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue