py-img-processor 1.0.0__tar.gz → 1.0.2__tar.gz

{py_img_processor-1.0.0/py_img_processor.egg-info → py_img_processor-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-img-processor
-Version: 1.0.0
+Version: 1.0.2
 Summary: Image editor using Python and Pillow.
 Home-page: https://github.com/SkylerHu/py-img-processor.git
 Author: SkylerHu
@@ -23,6 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: py-enum>=1.1.1
 Requires-Dist: Pillow>=8
+Requires-Dist: typing_extensions
 
 # py-img-processor
 
@@ -75,6 +76,12 @@ Image editor using Python and Pillow.
 > `注意`：`PROCESSOR_TEXT_FONT` 字体的设置是文字水印必要参数，需保证系统已安装该字体。默认值 `Arial Unicode.ttf` 是MacOS系统存在的字体，建议设置字体文件路径。
 
 ## 2.2 图像处理
+
+测试图片 `lenna-400x225.jpg` (像素400x225)
+
+![](https://github.com/SkylerHu/py-img-processor/blob/master/docs/imgs/lenna-400x225.jpg)
+
+
 ### 处理函数
 `process_image_by_path(input_path, out_path, params)`
 
@@ -97,13 +104,17 @@ from imgprocessor.utils import base64url_encode
 from imgprocessor.processor import process_image_by_path
 
 process_image_by_path(
-    "tests/imgs/lenna-400x225.jpg",
+    "docs/imgs/lenna-400x225.jpg",
     "/tmp/output.png",
     # 对图片缩放、裁剪、生成圆角、并转成png存储
-    "resize,s_1080/crop,w_700,h_700//watermark,text_{base64url_encode('Hello 世界')}/circle,r_10/format,png",
+    f"resize,s_200/crop,w_200,h_200,g_center/watermark,text_{base64url_encode('Hello 世界')},color_FFF,size_20/circle,r_10/format,png",
 )
 ```
 
+输出图像 (像素200x200)：
+
+![](https://github.com/SkylerHu/py-img-processor/blob/master/docs/imgs/lenna-edit.png)
+
 ### 图像处理参数为JSON
 - 只是形式不同，参数和字符串形式无本质区别；
 - `format`、`quality`、`interlace`三个值在JSON第一层，直接按照`key: value`的形式设置；
@@ -111,14 +122,14 @@ process_image_by_path(
 
 ```python
 process_image_by_path(
-    "tests/imgs/lenna-400x225.jpg",
+    "docs/imgs/lenna-400x225.jpg",
     "/tmp/output.png",
     {
         "actions": [
-            {"key": "resize", "s": 1080},
-            {"key": "crop", "w": 700, "h": 700},
+            {"key": "resize", "s": 200},
+            {"key": "crop", "w": 200, "h": 200, "g": "center"},
             # JSON形式参数, text无需encode
-            {"key": "watermark", "text": "Hello 世界"},
+            {"key": "watermark", "text": "Hello 世界", "color": "FFF", "size": 20},
             {"key": "circle", "r": 10},
         ],
         "format": "png",
@@ -149,16 +160,26 @@ optional arguments:
 示例：
 ```shell
 # 对单个图像进行多个操作，actions有2个参数，会输出2个图像文件
-img-processor -P tests/imgs/lenna-400x225.jpg -O /tmp/ --action resize,s_300 circle,r_100 --overwrite
+img-processor -P docs/imgs/lenna-400x225.jpg -O /tmp/ --action resize,s_200/format,webp resize,s_225/crop,w_225,h_225,g_center/circle/format,png --overwrite
 ```
 
 > 注意：action参数仅支持字符串表达形式。
 
+会输出2个图像文件：
+
+`/tmp/lenna-400x225-0.webp` (像素355x200)
+
+![](https://github.com/SkylerHu/py-img-processor/blob/master/docs/imgs/lenna-400x225-0.webp)
+
+`/tmp/lenna-400x225-1.png` (像素225x225)
+
+![](https://github.com/SkylerHu/py-img-processor/blob/master/docs/imgs/lenna-400x225-1.png)
+
 
 ## 提取图像主色调
 ```python
 from imgprocessor.processor import extract_main_color
 
-extract_main_color("tests/imgs/lenna-400x225.jpg")
+extract_main_color("docs/imgs/lenna-400x225.jpg")
 # 输出： "905C4C"
 ```

{py_img_processor-1.0.0 → py_img_processor-1.0.2}/README.md

@@ -49,6 +49,12 @@ Image editor using Python and Pillow.
 > `注意`：`PROCESSOR_TEXT_FONT` 字体的设置是文字水印必要参数，需保证系统已安装该字体。默认值 `Arial Unicode.ttf` 是MacOS系统存在的字体，建议设置字体文件路径。
 
 ## 2.2 图像处理
+
+测试图片 `lenna-400x225.jpg` (像素400x225)
+
+![](./docs/imgs/lenna-400x225.jpg)
+
+
 ### 处理函数
 `process_image_by_path(input_path, out_path, params)`
 
@@ -71,13 +77,17 @@ from imgprocessor.utils import base64url_encode
 from imgprocessor.processor import process_image_by_path
 
 process_image_by_path(
-    "tests/imgs/lenna-400x225.jpg",
+    "docs/imgs/lenna-400x225.jpg",
     "/tmp/output.png",
     # 对图片缩放、裁剪、生成圆角、并转成png存储
-    "resize,s_1080/crop,w_700,h_700//watermark,text_{base64url_encode('Hello 世界')}/circle,r_10/format,png",
+    f"resize,s_200/crop,w_200,h_200,g_center/watermark,text_{base64url_encode('Hello 世界')},color_FFF,size_20/circle,r_10/format,png",
 )
 ```
 
+输出图像 (像素200x200)：
+
+![](./docs/imgs/lenna-edit.png)
+
 ### 图像处理参数为JSON
 - 只是形式不同，参数和字符串形式无本质区别；
 - `format`、`quality`、`interlace`三个值在JSON第一层，直接按照`key: value`的形式设置；
@@ -85,14 +95,14 @@ process_image_by_path(
 
 ```python
 process_image_by_path(
-    "tests/imgs/lenna-400x225.jpg",
+    "docs/imgs/lenna-400x225.jpg",
     "/tmp/output.png",
     {
         "actions": [
-            {"key": "resize", "s": 1080},
-            {"key": "crop", "w": 700, "h": 700},
+            {"key": "resize", "s": 200},
+            {"key": "crop", "w": 200, "h": 200, "g": "center"},
             # JSON形式参数, text无需encode
-            {"key": "watermark", "text": "Hello 世界"},
+            {"key": "watermark", "text": "Hello 世界", "color": "FFF", "size": 20},
             {"key": "circle", "r": 10},
         ],
         "format": "png",
@@ -123,16 +133,26 @@ optional arguments:
 示例：
 ```shell
 # 对单个图像进行多个操作，actions有2个参数，会输出2个图像文件
-img-processor -P tests/imgs/lenna-400x225.jpg -O /tmp/ --action resize,s_300 circle,r_100 --overwrite
+img-processor -P docs/imgs/lenna-400x225.jpg -O /tmp/ --action resize,s_200/format,webp resize,s_225/crop,w_225,h_225,g_center/circle/format,png --overwrite
 ```
 
 > 注意：action参数仅支持字符串表达形式。
 
+会输出2个图像文件：
+
+`/tmp/lenna-400x225-0.webp` (像素355x200)
+
+![](./docs/imgs/lenna-400x225-0.webp)
+
+`/tmp/lenna-400x225-1.png` (像素225x225)
+
+![](./docs/imgs/lenna-400x225-1.png)
+
 
 ## 提取图像主色调
 ```python
 from imgprocessor.processor import extract_main_color
 
-extract_main_color("tests/imgs/lenna-400x225.jpg")
+extract_main_color("docs/imgs/lenna-400x225.jpg")
 # 输出： "905C4C"
 ```

{py_img_processor-1.0.0 → py_img_processor-1.0.2}/imgprocessor/__init__.py

@@ -5,7 +5,7 @@ import importlib
 
 
 __all__ = ["settings", "VERSION"]
-__version__ = "1.0.0"
+__version__ = "1.0.2"
 
 
 VERSION = __version__

{py_img_processor-1.0.0 → py_img_processor-1.0.2}/imgprocessor/main.py

@@ -7,7 +7,7 @@ import argparse
 import traceback
 
 from imgprocessor import VERSION
-from imgprocessor.processor import process_image_by_path
+from imgprocessor.processor import ProcessParams, process_image_by_path
 
 
 def main(argv: typing.Optional[list[str]] = None) -> int:
@@ -59,21 +59,24 @@ def main(argv: typing.Optional[list[str]] = None) -> int:
         print(f_tag, flush=True, end="\r")
         # 相对path的相对路径
         if not base_dir or base_dir in [".", "./"]:
-            relative_path = file_path
+            input_file_name = file_path
         else:
-            relative_path = file_path.split(base_dir, 1)[-1]
-        relative_path = relative_path.strip("/")
+            input_file_name = file_path.split(base_dir, 1)[-1]
+        input_file_name = input_file_name.strip("/")
 
-        prefix, ext = os.path.splitext(relative_path)
+        prefix, ext = os.path.splitext(input_file_name)
         for idx, param_str in enumerate(args.action):
+            params = ProcessParams.parse_str(param_str)
             # 初始化目标文件路径
             if total == 1 and ac_num == 1 and os.path.splitext(output)[-1]:
                 out_path = output
             else:
+                if params.save_parser.format:
+                    ext = f".{params.save_parser.format}"
                 if ac_num == 1:
-                    target_name = relative_path
+                    target_name = f"{prefix}{ext}"
                 else:
-                    target_name = f"{prefix}-{idx}.{ext}"
+                    target_name = f"{prefix}-{idx}{ext}"
                 out_path = os.path.join(output, target_name)
 
             tag = f"{f_tag}\t action={idx + 1}\t 保存于 {out_path}"

{py_img_processor-1.0.0 → py_img_processor-1.0.2/py_img_processor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-img-processor
-Version: 1.0.0
+Version: 1.0.2
 Summary: Image editor using Python and Pillow.
 Home-page: https://github.com/SkylerHu/py-img-processor.git
 Author: SkylerHu
@@ -23,6 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: py-enum>=1.1.1
 Requires-Dist: Pillow>=8
+Requires-Dist: typing_extensions
 
 # py-img-processor
 
@@ -75,6 +76,12 @@ Image editor using Python and Pillow.
 > `注意`：`PROCESSOR_TEXT_FONT` 字体的设置是文字水印必要参数，需保证系统已安装该字体。默认值 `Arial Unicode.ttf` 是MacOS系统存在的字体，建议设置字体文件路径。
 
 ## 2.2 图像处理
+
+测试图片 `lenna-400x225.jpg` (像素400x225)
+
+![](https://github.com/SkylerHu/py-img-processor/blob/master/docs/imgs/lenna-400x225.jpg)
+
+
 ### 处理函数
 `process_image_by_path(input_path, out_path, params)`
 
@@ -97,13 +104,17 @@ from imgprocessor.utils import base64url_encode
 from imgprocessor.processor import process_image_by_path
 
 process_image_by_path(
-    "tests/imgs/lenna-400x225.jpg",
+    "docs/imgs/lenna-400x225.jpg",
     "/tmp/output.png",
     # 对图片缩放、裁剪、生成圆角、并转成png存储
-    "resize,s_1080/crop,w_700,h_700//watermark,text_{base64url_encode('Hello 世界')}/circle,r_10/format,png",
+    f"resize,s_200/crop,w_200,h_200,g_center/watermark,text_{base64url_encode('Hello 世界')},color_FFF,size_20/circle,r_10/format,png",
 )
 ```
 
+输出图像 (像素200x200)：
+
+![](https://github.com/SkylerHu/py-img-processor/blob/master/docs/imgs/lenna-edit.png)
+
 ### 图像处理参数为JSON
 - 只是形式不同，参数和字符串形式无本质区别；
 - `format`、`quality`、`interlace`三个值在JSON第一层，直接按照`key: value`的形式设置；
@@ -111,14 +122,14 @@ process_image_by_path(
 
 ```python
 process_image_by_path(
-    "tests/imgs/lenna-400x225.jpg",
+    "docs/imgs/lenna-400x225.jpg",
     "/tmp/output.png",
     {
         "actions": [
-            {"key": "resize", "s": 1080},
-            {"key": "crop", "w": 700, "h": 700},
+            {"key": "resize", "s": 200},
+            {"key": "crop", "w": 200, "h": 200, "g": "center"},
             # JSON形式参数, text无需encode
-            {"key": "watermark", "text": "Hello 世界"},
+            {"key": "watermark", "text": "Hello 世界", "color": "FFF", "size": 20},
             {"key": "circle", "r": 10},
         ],
         "format": "png",
@@ -149,16 +160,26 @@ optional arguments:
 示例：
 ```shell
 # 对单个图像进行多个操作，actions有2个参数，会输出2个图像文件
-img-processor -P tests/imgs/lenna-400x225.jpg -O /tmp/ --action resize,s_300 circle,r_100 --overwrite
+img-processor -P docs/imgs/lenna-400x225.jpg -O /tmp/ --action resize,s_200/format,webp resize,s_225/crop,w_225,h_225,g_center/circle/format,png --overwrite
 ```
 
 > 注意：action参数仅支持字符串表达形式。
 
+会输出2个图像文件：
+
+`/tmp/lenna-400x225-0.webp` (像素355x200)
+
+![](https://github.com/SkylerHu/py-img-processor/blob/master/docs/imgs/lenna-400x225-0.webp)
+
+`/tmp/lenna-400x225-1.png` (像素225x225)
+
+![](https://github.com/SkylerHu/py-img-processor/blob/master/docs/imgs/lenna-400x225-1.png)
+
 
 ## 提取图像主色调
 ```python
 from imgprocessor.processor import extract_main_color
 
-extract_main_color("tests/imgs/lenna-400x225.jpg")
+extract_main_color("docs/imgs/lenna-400x225.jpg")
 # 输出： "905C4C"
 ```

{py_img_processor-1.0.0 → py_img_processor-1.0.2}/py_img_processor.egg-info/requires.txt

@@ -1,2 +1,3 @@
 py-enum>=1.1.1
 Pillow>=8
+typing_extensions

{py_img_processor-1.0.0 → py_img_processor-1.0.2}/setup.py

@@ -41,6 +41,7 @@ setup(
     install_requires=[
         "py-enum>=1.1.1",
         "Pillow>=8",
+        "typing_extensions",
     ],
     python_requires=">=3.9",
     classifiers=[