add dominant colour support and refine datamodels + fix bugs

Author: FredHappyface

nxtheme_creator/datamodels.py

@@ -17,6 +17,7 @@ class ResizeMethod(Enum):
 
 class ImageMode(Enum):
 	BLUR = "blur"
+	COLOR = "color"
 
 
 class LayoutConfig(BaseModel):

nxtheme_creator/process_image.py

@@ -7,6 +7,20 @@
 SIZE = (1280, 720)
 
 
+def _resize_max(image: Image.Image, max_size: tuple[int, int]) -> Image.Image:
+    image_ratio = image.width / image.height
+    target_ratio = max_size[0] / max_size[1]
+
+    if image_ratio > target_ratio:
+        new_width = max_size[0]
+        new_height = round(new_width / image_ratio)
+    else:
+        new_height = max_size[1]
+        new_width = round(new_height * image_ratio)
+
+    return image.resize((new_width, new_height), Image.Resampling.LANCZOS)
+
+
 def resize_stretch(image: Image.Image) -> Image.Image:
 	"""Resize the image by stretching it to the target SIZE."""
 	return image.resize(SIZE, Image.Resampling.LANCZOS)
@@ -33,16 +47,43 @@ def resize_center_crop(image: Image.Image) -> Image.Image:
 
 
 def resize_outer_crop_letterbox(image: Image.Image) -> Image.Image:
-	"""Resize the image using outer crop (letterbox) method."""
-	# Add padding if necessary ,,letterbox,,
-	image.thumbnail(SIZE, Image.Resampling.LANCZOS)
-	letterbox_image = ImageOps.pad(image, SIZE, color=(0, 0, 0))
-	return letterbox_image
+	"""Resize the image using outer crop with blurred background."""
+	# Resize image to fit in target size, preserving aspect ratio
+	fg = _resize_max(image, SIZE)
+
+	# Create a blurred background from the original image
+	bg = image.resize(SIZE, Image.Resampling.LANCZOS)
+	bg = bg.filter(ImageFilter.GaussianBlur(radius=20))
+
+	# Paste the resized image onto the center of the blurred background
+	offset = (
+		(SIZE[0] - fg.width) // 2,
+		(SIZE[1] - fg.height) // 2
+	)
+	bg.paste(fg, offset)
+	return bg
+
 
 
 def mode_blur(image: Image.Image) -> Image.Image:
 	return image.filter(ImageFilter.GaussianBlur(radius=20))
 
+def mode_dominant_color(image: Image.Image, colors:int=8):
+	quantized = image.convert("RGB").quantize(colors=colors)
+	palette = quantized.getpalette()
+	color_counts = quantized.getcolors()
+
+	# Extract RGB tuples
+	rgb_palette = [
+		((palette[i * 3], palette[i * 3 + 1], palette[i * 3 + 2]), count)
+		for count, i in color_counts
+	]
+
+	# Return the color with the highest count
+	dominant=max(rgb_palette, key=lambda x: x[1])[0]
+	return Image.new("RGB", SIZE, dominant)
+
+
 
 def resize_image(
 	input_path: str,
@@ -63,6 +104,8 @@ def resize_image(
 	# Apply effects here
 	if image_mode == ImageMode.BLUR:
 		transformed_image = mode_blur(transformed_image)
+	if image_mode == ImageMode.COLOR:
+		transformed_image = mode_dominant_color(transformed_image)
 
 	transformed_image.save(output_path, progressive=False)
 	return output_path

nxtheme_creator/process_themes.py

@@ -111,6 +111,7 @@ def resolveConf(nxthemebin: str | None, conf: Config) -> Config:
 		layouts_dir = Path(nxthemebin).parent / "Layouts"
 	else:
 		layouts_dir = THISDIR / "layouts"
+	_conf = {"author_name": conf.author_name, "resize_method": conf.resize_method}
 
 	for screen_type in SCREEN_TYPES:
 		layout_config: LayoutConfig = getattr(conf, screen_type, None)
@@ -137,7 +138,6 @@ def resolveConf(nxthemebin: str | None, conf: Config) -> Config:
 			msg = f"{conf[screen_type]} or {layout} does not exist :("
 			raise RuntimeError(msg)
 
-		_conf = {"author_name": conf.author_name, "resize_method": conf.resize_method}
 
 		_conf[screen_type] = LayoutConfig(layout=str(layout), mode=layout_config.mode)
 	return Config.model_validate(_conf)
@@ -215,3 +215,5 @@ def processImages(nxthemebin: str | None, inputdir: str, outputdir: str, config:
 					author_name=author_name,
 					out=out,
 				)
+
+	return config.model_dump()

tests/data/center_crop/example.jpg

@@ -50,29 +50,57 @@
 SWITCH_THEMES_EXE = r"C:\Users\Dell\Downloads\Release4.8.1\SwitchThemes.exe"
 
 
-def test_me():
-	input_dir = str(THISDIR / "data/input")
-	output_dir = str(THISDIR / "data/output")
-
-	home_layout_name = random.choice([p.name for p in (nxdir / "layouts/home").iterdir()])
-	lock_layout_name = random.choice([p.name for p in (nxdir / "layouts/lock").iterdir()])
-	apps_layout_name = random.choice([p.name for p in (nxdir / "layouts/apps").iterdir()])
-	psl_layout_name = random.choice([p.name for p in (nxdir / "layouts/psl").iterdir()])
-
-	config = Config.model_validate(
-		{
-			"home": home_layout_name,
-			"lock": lock_layout_name,
-			"apps": apps_layout_name,
-			"psl": psl_layout_name,
-			"author_name": "JohnDoe",
-			"resize_method": "stretch",
-		}
-	)
+def test_centerCrop():
+	conf = {
+		"home": aux_rand_layout("home"),
+		# "lock": aux_rand_layout("lock"),
+		"apps": aux_rand_layout("apps"),
+		"psl": aux_rand_layout("psl"),
+		"author_name": "JohnDoe",
+		"resize_method": "centerCrop",
+	}
+	aux_testcase("center_crop", conf)
+
+
+def test_stretch():
+	conf = {
+		"home": {"layout": aux_rand_layout("home"), "mode": "color"},
+		# "lock": aux_rand_layout("lock"),
+		"apps": aux_rand_layout("apps"),
+		"psl": aux_rand_layout("psl"),
+		"author_name": "JohnDoe",
+		"resize_method": "stretch",
+	}
+	aux_testcase("stretch", conf)
+
+
+def test_outerCrop():
+	conf = {
+		"home": {"layout": aux_rand_layout("home"), "mode": "blur"},
+		# "lock": aux_rand_layout("lock"),
+		"apps": aux_rand_layout("apps"),
+		"psl": aux_rand_layout("psl"),
+		"author_name": "JohnDoe",
+		"resize_method": "outerCrop",
+	}
+	aux_testcase("outer_crop", conf)
+
+
+def aux_rand_layout(layout: str) -> str:
+	return random.choice([p.name for p in (nxdir / "layouts" / layout).iterdir()])
+
+
+def aux_testcase(_input_dir: str, config: dict):
+	input_dir = str(THISDIR / "data" / _input_dir)
+	output_dir = str(THISDIR / "data/output" / _input_dir)
+
+	config = Config.model_validate(config)
 
 	# 'Native" with nxtheme-creator
-	processImages(
-		nxthemebin=None, inputdir=input_dir, outputdir=output_dir + "_native", config=config
+	print(
+		processImages(
+			nxthemebin=None, inputdir=input_dir, outputdir=output_dir + "_native", config=config
+		)
 	)
 
 	# # With SWITCH_THEMES_EXE