v2.1.0

huideyeren · huideyeren · commit 16cea1496d86 · 2025-06-16T19:04:23.000+09:00
diff --git a/poetry.toml b/poetry.toml
@@ -0,0 +1,2 @@
+[virtualenvs]
+in-project = true
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anshitsu"
-version = "2.0.2"  # using poetry-dynamic-versioning
+version = "2.1.0"  # using poetry-dynamic-versioning
 description = "A tiny digital photographic utility."
 readme = "README.md"
 authors = ["Iosif Takakura <iosif@huideyeren.info>"]
diff --git a/src/anshitsu/cli.py b/src/anshitsu/cli.py
@@ -14,24 +14,25 @@
 
 
 def cli(
-        path: Optional[str] = None,
-        colorautoadjust: bool = False,
-        colorstretch: bool = False,
-        grayscale: bool = False,
-        invert: bool = False,
-        color: Optional[float] = None,
-        brightness: Optional[float] = None,
-        sharpness: Optional[float] = None,
-        contrast: Optional[float] = None,
-        tosaka: Optional[float] = None,
-        outputrgb: bool = False,
-        sepia: bool = False,
-        cyanotype: bool = False,
-        noise: Optional[float] = None,
-        overwrite: bool = False,
-        version: bool = False,
-        line_drawing: bool = False,
-        posterize: Optional[int] = None,
+    path: Optional[str] = None,
+    keep_alpha: bool = False,
+    colorautoadjust: bool = False,
+    colorstretch: bool = False,
+    grayscale: bool = False,
+    invert: bool = False,
+    color: Optional[float] = None,
+    brightness: Optional[float] = None,
+    sharpness: Optional[float] = None,
+    contrast: Optional[float] = None,
+    tosaka: Optional[float] = None,
+    outputrgb: bool = False,
+    sepia: bool = False,
+    cyanotype: bool = False,
+    noise: Optional[float] = None,
+    overwrite: bool = False,
+    version: bool = False,
+    line_drawing: bool = False,
+    posterize: Optional[int] = None,
 ) -> str:
     """
     Process Runnner for Command Line Interface
@@ -87,7 +88,7 @@ def cli(
     original_dir = "anshitsu_orig"
     if os.path.isdir(path):
         for type in types:
-            files_glob.extend(glob.glob(os.path.join(path, '**', type), recursive=True))
+            files_glob.extend(glob.glob(os.path.join(path, "**", type), recursive=True))
         files_glob = [file for file in files_glob if not file.__contains__(output_dir)]
         return_path = path
 
@@ -113,15 +114,15 @@ def cli(
         timestamp = now_s.strftime("%Y-%m-%d_%H-%M-%S")
         if overwrite is True:
             backup_filename = original_filename
-            image.save(os.path.join(
-                return_path,
-                original_dir,
-                backup_filename
-            ))
-            filename = os.path.join(return_path, re.sub(r"\.[^.]+$", "", original_filename) + ".png")
+            image.save(os.path.join(return_path, original_dir, backup_filename))
+            filename = os.path.join(
+                return_path, re.sub(r"\.[^.]+$", "", original_filename) + ".png"
+            )
             remove_file_list = [".jpg", ".JPG", ".jpeg", ".JPEG", ".PNG"]
             for remove_file in remove_file_list:
-                remove_file_name = re.sub(r"\.[^.]+$", "", original_filename) + remove_file
+                remove_file_name = (
+                    re.sub(r"\.[^.]+$", "", original_filename) + remove_file
+                )
                 remove_file_path = os.path.join(return_path, remove_file_name)
                 if os.path.isfile(remove_file_path):
                     os.remove(remove_file_path)
@@ -130,9 +131,11 @@ def cli(
                 return_path,
                 output_dir,
                 re.sub(r"\.[^.]+$", "_", original_filename)
-                + "_{0}_converted_at_{1}.png".format(extension, timestamp))
+                + "_{0}_converted_at_{1}.png".format(extension, timestamp),
+            )
         psr = Processor(
             image=image,
+            keep_alpha=keep_alpha,
             colorautoadjust=colorautoadjust,
             colorstretch=colorstretch,
             grayscale=grayscale,
diff --git a/src/anshitsu/process/create_alpha_mask.py b/src/anshitsu/process/create_alpha_mask.py
@@ -0,0 +1,30 @@
+from typing import Union
+
+from PIL import Image
+
+
+def create_alpha_mask(image: Image) -> Union[Image, None]:
+    """
+    create_alpha_mask
+
+    If image has alpha layer, create alpha mask.
+
+    Parameters:
+        image: Image
+
+    Returns:
+        Image: cutout alpha mask.
+        None: Image has not alpha mask.
+    """
+    if image.mode == "RGBA":
+        _, _, _, alpha = image.split()
+        alpha_channel = 255
+        alpha.paste(Image.new("L", image.size, alpha_channel), mask=alpha)
+        return alpha
+    elif image.mode == "LA":
+        _, alpha = image.split()
+        alpha_channel = 255
+        alpha.paste(Image.new("L", image.size, alpha_channel), mask=alpha)
+        return alpha
+    else:
+        return None
diff --git a/src/anshitsu/process/line_drawing.py b/src/anshitsu/process/line_drawing.py
@@ -2,6 +2,19 @@
 
 
 def line_drawing(image: Image, invert: bool) -> Image:
+    """
+    line_drawing
+
+    Paint like line drawing on an image.
+    If invert is True, the image will be inverted.
+
+    Parameters:
+        image: Image
+        invert: bool
+
+    Returns:
+        Image: processed image.
+    """
     image = image.convert("L")
     img_filter = image.filter(ImageFilter.MaxFilter(5))
     line_draw = ImageChops.difference(image, img_filter)
diff --git a/src/anshitsu/process/noise.py b/src/anshitsu/process/noise.py
@@ -18,13 +18,11 @@ def noise(image: Image, noise: float) -> Image:
     """
     table = [x * 2 for x in range(256)] * len(image.getbands())
     if image.mode == "RGB":
-        noise_image = Image.effect_noise(
-            (image.width, image.height), noise
-        ).convert("RGB")
+        noise_image = Image.effect_noise((image.width, image.height), noise).convert(
+            "RGB"
+        )
         image = ImageChops.multiply(image, noise_image).point(table)
     if image.mode == "L":
-        noise_image = Image.effect_noise(
-            (image.width, image.height), noise
-        )
+        noise_image = Image.effect_noise((image.width, image.height), noise)
         image = ImageChops.multiply(image, noise_image).point(table)
     return image
diff --git a/src/anshitsu/process/processor.py b/src/anshitsu/process/processor.py
@@ -17,6 +17,7 @@
 from anshitsu.process.remove_alpha import remove_alpha
 from anshitsu.process.sepia import sepia
 from anshitsu.process.sharpness import sharpness
+from anshitsu.process.create_alpha_mask import create_alpha_mask
 
 
 class Processor:
@@ -36,23 +37,24 @@ class Processor:
     )
 
     def __init__(
-            self,
-            image: Image,
-            colorautoadjust: bool = False,
-            colorstretch: bool = False,
-            grayscale: bool = False,
-            line_drawing: bool = False,
-            invert: bool = False,
-            tosaka: Optional[float] = None,
-            outputrgb: bool = False,
-            noise: Optional[float] = None,
-            color: Optional[float] = None,
-            brightness: Optional[float] = None,
-            sharpness: Optional[float] = None,
-            contrast: Optional[float] = None,
-            sepia: bool = False,
-            cyanotype: bool = False,
-            posterize: Optional[int] = None,
+        self,
+        image: Image,
+        colorautoadjust: bool = False,
+        colorstretch: bool = False,
+        grayscale: bool = False,
+        line_drawing: bool = False,
+        invert: bool = False,
+        tosaka: Optional[float] = None,
+        outputrgb: bool = False,
+        noise: Optional[float] = None,
+        color: Optional[float] = None,
+        brightness: Optional[float] = None,
+        sharpness: Optional[float] = None,
+        contrast: Optional[float] = None,
+        sepia: bool = False,
+        cyanotype: bool = False,
+        posterize: Optional[int] = None,
+        keep_alpha: bool = False,
     ) -> None:
         """
         __init__ constructor.
@@ -63,11 +65,21 @@ def __init__(
             colorstretch (bool, optional): Use colorstretch algorithm. Defaults to False.
             grayscale (bool, optional): Convert to grayscale. Defaults to False.
             invert (bool, optional): Invert color. Defaults to False.
+            color (Optional[float], optional): Fix color balance. Defaults to None.
+            brightness (Optional[float], optional): Fix brightness. Defaults to None.
+            sharpness (Optional[float], optional): Fix sharpness. Defaults to None.
+            contrast (Optional[float], optional): Fix contrast. Defaults to None.
             tosaka (Optional[float], optional): Use Tosaka mode. Defaults to None.
             outputrgb (bool, optional): Outputs a monochrome image in RGB. Defaults to False.
             noise (Optional[float], optional): Add Gaussian noise. Defaults to None.
+            cyanotype (bool, optional): Convert to RGB like cyanotype. Defaults to False.
+            sepia (bool, optional): Convert to RGB colored by sepia. Defaults to False.
+            noise (Optional[float], optional): Add Gaussian noise. Defaults to None.
+            line_drawing (bool, optional): Convert to like line drawing. Defaults to False.
+            keep_alpha (bool, optional): Keep alpha mask. Defaults to False.
         """
         self.image = image
+        self.keep_alpha = keep_alpha
         self.line_drawing = line_drawing
         self.colorautoadjust = colorautoadjust
         self.colorstretch = colorstretch
@@ -87,6 +99,11 @@ def __init__(
         self.posterize = posterize
 
     def process(self) -> Image:
+        if self.keep_alpha:
+            alpha = create_alpha_mask(self.image)
+        else:
+            alpha = None
+
         self.image = remove_alpha(self.image)
 
         if self.invert:
@@ -131,17 +148,7 @@ def process(self) -> Image:
         if self.cyanotype:
             self.image = cyanotype(self.image)
 
-        return self.image
+        if alpha is not None:
+            self.image.putalpha(alpha)
 
-    def __output_rgb(self) -> Image:
-        """
-        __output_rgb
-
-        Outputs a monochrome image in RGB.
-
-        Returns:
-            Image: processed image.
-        """
-        if self.image.mode == "L":
-            self.image = self.image.convert("RGB")
         return self.image
diff --git a/src/anshitsu/process/put_alpha_mask.py b/src/anshitsu/process/put_alpha_mask.py
@@ -0,0 +1,17 @@
+from PIL import Image
+
+
+def put_alpha_mask(image: Image, alpha: Image) -> Image:
+    """
+    put_alpha_mask
+
+    Adds or replaces the alpha layer in this image.
+
+    Parameters:
+        image: Image
+        alpha: Image
+
+    Returns:
+        Image: Image having alpha layer.
+    """
+    return image.putalpha(alpha)
diff --git a/src/anshitsu/process/sepia.py b/src/anshitsu/process/sepia.py
@@ -11,11 +11,12 @@ def sepia(image: Image) -> Image:
         Image: processed image.
     """
     if image.mode == "L":
-        image = Image.merge("RGB",
-                            (
-                                image.point(lambda x: x * 247 / 255),
-                                image.point(lambda x: x * 225 / 255),
-                                image.point(lambda x: x * 194 / 255)
-                            )
-                            )
+        image = Image.merge(
+            "RGB",
+            (
+                image.point(lambda x: x * 247 / 255),
+                image.point(lambda x: x * 225 / 255),
+                image.point(lambda x: x * 194 / 255),
+            ),
+        )
     return image
diff --git a/tests/test_alpha.py b/tests/test_alpha.py
@@ -0,0 +1,52 @@
+import os
+
+from PIL import Image
+
+from anshitsu.process.create_alpha_mask import create_alpha_mask
+from anshitsu.process.put_alpha_mask import put_alpha_mask
+
+def test_alpha_mask_by_rgba(setup):
+    image = Image.open(
+        os.path.join(".", "tests", "pic", "nullpo.png"),
+    )
+    alpha = create_alpha_mask(image)
+    assert alpha.mode == "L"
+
+
+def test_alpha_mask_by_grayscale_with_alpha(setup):
+    image = Image.open(
+        os.path.join(".", "tests", "pic", "test.png"),
+    )
+    alpha = create_alpha_mask(image)
+    assert alpha.mode == "L"
+
+def test_alpha_by_rgb(setup):
+    image = Image.open(
+        os.path.join(".", "tests", "pic", "dog.jpg"),
+    )
+    alpha = create_alpha_mask(image)
+    assert alpha is None
+
+def test_alpha_by_grayscale(setup):
+    image = Image.open(
+        os.path.join(".", "tests", "pic", "tokyo_station.jpg"),
+    )
+    alpha = create_alpha_mask(image)
+    assert alpha is None
+
+def test_alpha_by_rgba(setup):
+    image = Image.open(
+        os.path.join(".", "tests", "pic", "nullpo.png"),
+    )
+    alpha = create_alpha_mask(image)
+    image.putalpha(alpha)
+    assert image.mode == "RGBA"
+
+
+def test_alpha_by_grayscale_with_alpha(setup):
+    image = Image.open(
+        os.path.join(".", "tests", "pic", "test.png"),
+    )
+    alpha = create_alpha_mask(image)
+    image.putalpha(alpha)
+    assert image.mode == "LA"
diff --git a/tests/test_process_alpha.py b/tests/test_process_alpha.py
