feat: address more ruff findings

Author: FredHappyface

convert.py

@@ -4,14 +4,13 @@
 
 import contextlib
 from os import listdir
-from os.path import isfile, join
 from pathlib import Path
 
 import layeredimage.io
 
-THISDIR = str(Path(__file__).resolve().parent)
+THISDIR = Path(__file__).resolve().parent
 
-files = [join(THISDIR, file) for file in listdir(THISDIR) if isfile(join(THISDIR, file))]
+files = [THISDIR / file for file in listdir(THISDIR) if (THISDIR / file).is_file()]
 for file in files:
 	with contextlib.suppress(ValueError):
 		layeredimage.io.saveLayerImage(file + ".ora", layeredimage.io.openLayerImage(file))

layeredimage/io/__init__.py

@@ -1,7 +1,6 @@
 """Do file io."""
 from __future__ import annotations
 
-from os.path import exists, splitext
 from pathlib import Path
 
 from layeredimage.layeredimage import LayeredImage
@@ -61,10 +60,11 @@ def openLayerImage(file: str | Path) -> LayeredImage:
 		".layered": openLayer_LAYERED,
 		".layeredc": openLayer_LAYEREDC,
 	}
-	if not exists(file):
+	fp = Path(file)
+	if not fp.is_file():
 		print(f"ERROR: {file} does not exist")
 		raise FileExistsError
-	fileExt = splitext(file)[1].lower()
+	fileExt = fp.suffix.lower()
 	if fileExt not in functionMap:
 		extNotRecognised(file)
 		raise ValueError
@@ -100,7 +100,7 @@ def saveLayerImage(fileName: str | Path, layeredImage: LayeredImage) -> None:
 		".layered": saveLayer_LAYERED,
 		".layeredc": saveLayer_LAYEREDC,
 	}
-	fileExt = splitext(fileName)[1].lower()
+	fileExt = Path(fileName).suffix.lower()
 	if fileExt not in functionMap:
 		extNotRecognised(fileName)
 		raise ValueError

layeredimage/io/layered.py

@@ -79,7 +79,9 @@ def openLayer_LAYERED(file: str) -> LayeredImage:
 		return LayeredImage(layersAndGroups, stack["dimensions"])
 
 
-def grabLayer_LAYERED(zipFile: ZipFile, layer: dict[str, Any], blendLookup: dict[str, Any]):
+def grabLayer_LAYERED(
+	zipFile: ZipFile, layer: dict[str, Any], blendLookup: dict[str, Any]
+) -> Layer:
 	"""Grab an image from .layered."""
 	with zipFile.open(f'data/{layer["name"]}.png') as layerImage:
 		image = Image.open(layerImage).convert("RGBA")
@@ -123,8 +125,9 @@ def writeImage_LAYERED(
 	"""Write an image to the archive."""
 	imgByteArr = io.BytesIO()
 	imageCopy = image.copy()
-	if compressed and len(set(imageCopy.getcolors(maxcolors=256**3))) < 256:
-		imageCopy = imageCopy.quantize(colors=256, method=2, kmeans=1)
+	paletteSize = 256
+	if compressed and len(set(imageCopy.getcolors(maxcolors=paletteSize**3))) < paletteSize:
+		imageCopy = imageCopy.quantize(colors=paletteSize, method=2, kmeans=1)
 	imageCopy.save(imgByteArr, format="PNG", optimize=compressed)
 	imgByteArr.seek(0)
 	zipFile.writestr(path, imgByteArr.read())

layeredimage/io/ora.py

@@ -1,6 +1,8 @@
 """Do file io - ORA."""
 from __future__ import annotations
 
+from typing import Any
+
 from layeredimage.blend import BlendType
 from layeredimage.layeredimage import LayeredImage
 from layeredimage.layergroup import Group, Layer
@@ -123,7 +125,7 @@ def saveLayer_ORA(fileName: str, layeredImage: LayeredImage) -> None:
 	project.save(fileName)
 
 
-def addLayer_ORA(project, layer, blendLookup):
+def addLayer_ORA(project: Any, layer: Any, blendLookup: dict[BlendType, str]) -> Any:
 	"""Update the project with a shiny new layer."""
 	project.add_layer(
 		layer.image,

layeredimage/io/tiff.py

@@ -15,14 +15,14 @@ def openLayer_TIFF(file: str) -> LayeredImage:
 	project = Image.open(file)
 	layers = []
 	dimensions = [0, 0]
-	for index in range(project.n_frames):  # type:ignore
+	for index in range(project.n_frames):
 		# Load the correct image
 		project.seek(index)
 		# Update the project dimensions
 		for indx, dimension in enumerate(dimensions):
 			if project.size[indx] > dimension:
 				dimensions[indx] = project.size[indx]
-		ifd = project.ifd.named()  # type:ignore
+		ifd = project.ifd.named()
 		# Offsets
 		offsetX = 0
 		offsetY = 0

layeredimage/io/webp.py

@@ -15,7 +15,7 @@ def openLayer_WEBP(file: str) -> LayeredImage:
 	project = Image.open(file)
 	projectSize = project.size
 	layers = []
-	for index in range(project.n_frames):  # type:ignore
+	for index in range(project.n_frames):
 		project.seek(index)
 		layers.append(
 			Layer(name=f"Frame {len(layers) + 1}", image=project.copy(), dimensions=projectSize)

layeredimage/layeredimage.py

@@ -4,7 +4,6 @@
 from typing import Any
 
 from blendmodes.imagetools import rasterImageOA, rasterImageOffset, renderWAlphaOffset
-from deprecation import deprecated
 from PIL import Image
 
 from .blend import blendLayers
@@ -28,6 +27,7 @@ def __init__(
 		----
 			layersAndGroups (list[Layer, Group]): List of layers and groups
 			dimensions (tuple[int, int], optional): dimensions of the canvas. Defaults to None.
+			**kwargs (Any): add any keyword args to self.extras
 		"""
 		# Write here
 		self.layersAndGroups = layersAndGroups
@@ -67,7 +67,7 @@ def json(self) -> dict[str, Any]:
 		return {"dimensions": self.dimensions, "layersAndGroups": layersAndGroups}
 
 	# Get, set and remove layers or groups
-	def getLayerOrGroup(self, index: int):
+	def getLayerOrGroup(self, index: int) -> Layer | Group:
 		"""Get a LayerOrGroup."""
 		return self.layersAndGroups[index]
 
@@ -83,24 +83,11 @@ def removeLayerOrGroup(self, index: int) -> None:
 		"""Remove a LayerOrGroup at a specific index."""
 		self.layersAndGroups.pop(index)
 
-	# The user may wish to add an image directly
-	@deprecated(details="use addImageAsLayer", deprecated_in="2021.2.4")
-	def addLayerRaster(
-		self, image: Image.Image, name: str
-	):  # pylint:disable=missing-function-docstring
-		return self.addImageAsLayer(image, name)
-
 	def addImageAsLayer(self, image: Image.Image, name: str) -> None:
 		"""Resize an image to the canvas and add as a layer."""
 		layer = renderWAlphaOffset(image, self.dimensions)
 		self.addLayerOrGroup(Layer(name, layer, self.dimensions))
 
-	@deprecated(details="use insertImageAsLayer", deprecated_in="2021.2.4")
-	def insertLayerRaster(
-		self, image: Image.Image, name: str, index: int
-	):  # pylint:disable=missing-function-docstring
-		return self.insertImageAsLayer(image, name, index)
-
 	def insertImageAsLayer(self, image: Image.Image, name: str, index: int) -> None:
 		"""Resize an image to the canvas  and insert the layer."""
 		layer = renderWAlphaOffset(image, self.dimensions)
@@ -150,7 +137,7 @@ def flattenLayers(self, *, ignoreHidden: bool = True) -> None:
 
 	# The user may hate groups and just want the layers... or just want the
 	# groups
-	def extractLayers(self):
+	def extractLayers(self) -> list[Layer]:
 		"""Extract the layers from the image."""
 		layers = []
 		for layerOrGroup in self.layersAndGroups:
@@ -181,7 +168,7 @@ def updateLayers(self) -> None:
 		"""Update the layers from the image."""
 		self.layers = self.extractLayers()
 
-	def extractGroups(self):
+	def extractGroups(self) -> list[Group]:
 		"""Extract the groups from the image."""
 		return [
 			_layerOrGroup
@@ -200,7 +187,7 @@ def flattenLayerOrGroup(
 	flattenedSoFar: Image.Image | None = None,
 	*,
 	ignoreHidden: bool = True,
-):
+) -> Image.Image:
 	"""Flatten a layer or group on to an image of what has already been flattened.
 
 	Args:
@@ -242,7 +229,7 @@ def flattenAll(
 	imageDimensions: tuple[int, int],
 	*,
 	ignoreHidden: bool = True,
-):
+) -> Image.Image:
 	"""Flatten a list of layers and groups.
 
 	Args:

layeredimage/layergroup.py

@@ -37,6 +37,7 @@ def __init__(
 			is often configured per layer or per group by an 'eye' icon).
 			Defaults to True.
 			blendmode (Blendtype): The blending mode to use. Defaults to BlendType.NORMAL
+			**kwargs (Any): add any keyword args to self.extras
 		"""
 		self.name = name
 		self.offsets = offsets