Merge pull request #42 from huideyeren/v2

v2

Author: huideyeren

.flake8

@@ -7,4 +7,4 @@ exclude =
     old,
     build,
     dist
-ignore = E501
+ignore = E501, W503, F841

.github/workflows/testing.yml

@@ -11,8 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
-        poetry-version: [1.2.2]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        poetry-version: [1.8.2]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -27,9 +27,9 @@ jobs:
       - name: Install Dependencies
         run: poetry install --no-interaction
       - name: Format Check
-        run: poetry run flake8 src/ --ignore=E501,E203,W503,W504
-      - name: Type Check
-        run: poetry run mypy src/
+        run: poetry run flake8 src/ --ignore=E501,E203,W503,W504,F841
+#      - name: Type Check
+#        run: poetry run mypy src/
       - name: Run Tests
         run: poetry run pytest -v tests/ --cov-config=.coveragerc --cov=src/ --cov-branch --cov-report=xml
       - name: Upload coverage to Codecov

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "anshitsu"
-version = "1.5.1"  # using poetry-dynamic-versioning
+version = "2.0.2"  # using poetry-dynamic-versioning
 description = "A tiny digital photographic utility."
 readme = "README.md"
 authors = ["Iosif Takakura <[email protected]>"]
@@ -14,30 +14,30 @@ enable = true
 style = "pep440"
 
 [tool.poetry.dependencies]
-python = "<3.13,>=3.10"
-numpy = "^1.26.0"
-Pillow = "^10.1.0"
-colorcorrect = "^0.9.1"
-fire = "^0.5.0"
+python = "<4.0,>=3.10"
+numpy = "*"
+Pillow = "*"
+colorcorrect = "*"
+fire = "*"
 
 [tool.poetry.dev-dependencies]
-pytest = "^6.2"
-flake8 = "^6.1.0"
-mypy = "^0.981"
-black = "^23.10"
-isort = "^5.12.0"
-pyproject-flake8 = "^0.0.1a4"
-pytest-randomly = "^3.15.0"
-tox = "^4.11.3"
-pytest-cov = "^4.1.0"
+pytest = "*"
+flake8 = "*"
+mypy = "*"
+black = "*"
+isort = "*"
+pyproject-flake8 = "*"
+pytest-randomly = "*"
+tox = "*"
+pytest-cov = "*"
 
 [tool.poetry.scripts]
-anshitsu = "anshitsu.cli:main"
+anshitsu = "anshitsu.main:main"
 
 [tool.poetry.group.dev.dependencies]
-importlib-metadata = "^6.8.0"
-poetry-dynamic-versioning = "^1.1.1"
-setuptools = "^68.2.2"
+importlib-metadata = "*"
+poetry-dynamic-versioning = "*"
+setuptools = "*"
 
 [build-system]
 requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]

src/anshitsu/__version__.py

@@ -1 +1 @@
-version: str = "v1.5.1"
+version: str = "v2.0.2"

src/anshitsu/cli.py

@@ -1,14 +1,162 @@
+import datetime
+import glob
+import os
+import os.path
+import re
+from typing import Optional
+
 import fire
+import fire.core
+from PIL import Image, UnidentifiedImageError
 
-from anshitsu.process import process
+from anshitsu.__version__ import version as __version__
+from anshitsu.process.processor import Processor
 
 
-def main():
+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,
+) -> str:
     """
-    main [summary]
+    Process Runnner for Command Line Interface
+
+    This utility converts the colors of images such as photos.
+
+    If you specify a directory path, it will convert
+    the image files in the specified directory.
+    If you specify a file path, it will convert the specified file.
+    If you specify an option, the specified conversion will be performed.
+
+    Tosaka mode is a mode that expresses the preference of
+    Tosaka-senpai, a character in "Kyūkyoku Chōjin R",
+    for "photos taken with Tri-X that look like they were
+    burned onto No. 4 or No. 5 photographic paper".
+    Only use floating-point numbers when using this mode;
+    numbers around 2.4 will make it look right.
+
+    Args:
+        path (Optional[str], optional): Directory or File Path. Defaults to None.
+        overwrite (bool, optional): Overwrite original files. Defaults to False.
+        colorautoadjust (bool, optional): Use colorautoadjust algorithm. Defaults to False.
+        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): Convert to grayscale with fix contrast. Defaults to None.
+        outputrgb (bool, optional): Outputs a monochrome image in RGB. Defaults to False.
+        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.
+        version (bool, optional): Show version. Defaults to False.
+
+    Raises:
+        fire.core.FireError: Error that occurs when the specified string is not a path.
+
+    Returns:
+        str: Message.
     """
-    fire.Fire(process)
+    if version:
+        return "Anshitsu version {}".format(__version__)
+    if path is None:
+        raise fire.core.FireError("No path specified!")
+    types = ("*.jpg", "*.JPG", "*.jpeg", "*.JPEG", "*.png", "*.PNG")
+    files_glob = []
+    return_path = ""
+    now_s = datetime.datetime.now()
+    output_dir = "anshitsu_out"
+    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 = [file for file in files_glob if not file.__contains__(output_dir)]
+        return_path = path
 
+        if len(files_glob) == 0:
+            raise fire.core.FireError(
+                "There are no JPEG or PNG files in this directory."
+            )
+    elif os.path.isfile(path):
+        files_glob.extend(glob.glob(path))
+        return_path = os.path.abspath(os.path.join(path, os.pardir))
+    else:
+        raise fire.core.FireError("A non-path string was passed.")
+    if overwrite is True:
+        os.makedirs(os.path.join(return_path, original_dir))
+    for i, file in enumerate(files_glob):
+        try:
+            image = Image.open(file)
+        except UnidentifiedImageError as e:
+            raise fire.core.FireError(e)
+        exif = image.getexif()
+        original_filename: str = os.path.split(file)[1]
+        extension = original_filename.split(".")[-1]
+        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")
+            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_path = os.path.join(return_path, remove_file_name)
+                if os.path.isfile(remove_file_path):
+                    os.remove(remove_file_path)
+        else:
+            filename = os.path.join(
+                return_path,
+                output_dir,
+                re.sub(r"\.[^.]+$", "_", original_filename)
+                + "_{0}_converted_at_{1}.png".format(extension, timestamp))
+        psr = Processor(
+            image=image,
+            colorautoadjust=colorautoadjust,
+            colorstretch=colorstretch,
+            grayscale=grayscale,
+            color=color,
+            contrast=contrast,
+            brightness=brightness,
+            sharpness=sharpness,
+            invert=invert,
+            tosaka=tosaka,
+            outputrgb=outputrgb,
+            cyanotype=cyanotype,
+            sepia=sepia,
+            noise=noise,
+            line_drawing=line_drawing,
+            posterize=posterize,
+        )
+        saved_image = psr.process()
+        os.makedirs(os.path.join(return_path, output_dir), exist_ok=True)
+        saved_image.save(
+            filename,
+            quality=100,  # Specify 100 as the highest image quality
+            subsampling=0,
+            exif=exif,
+        )
+        print("{0}/{1} done!".format((i + 1), str(len(files_glob))))
 
-if __name__ == "__main__":
-    main()
+    return "The cli was completed successfully."

src/anshitsu/main.py

@@ -0,0 +1,14 @@
+import fire
+
+from anshitsu.cli import cli
+
+
+def main():
+    """
+    main [summary]
+    """
+    fire.Fire(cli)
+
+
+if __name__ == "__main__":
+    main()