From 91c7349e742e16c8346b9ff2ed2c2227eb77ffb6 Mon Sep 17 00:00:00 2001 From: meetwq Date: Thu, 20 Jul 2023 12:37:47 +0800 Subject: [PATCH] format code --- meme_generator/memes/guichu/__init__.py | 33 +++++++++++-------- .../memes/maimai_awaken/__init__.py | 9 +++-- meme_generator/memes/maimai_join/__init__.py | 7 ++-- meme_generator/memes/taunt/__init__.py | 7 ++-- .../memes/what_I_want_to_do/__init__.py | 13 ++++++-- 5 files changed, 47 insertions(+), 22 deletions(-) diff --git a/meme_generator/memes/guichu/__init__.py b/meme_generator/memes/guichu/__init__.py index 8a61fb59..d4270e5f 100644 --- a/meme_generator/memes/guichu/__init__.py +++ b/meme_generator/memes/guichu/__init__.py @@ -30,18 +30,18 @@ "--bottom", "/下", action="store_const", const="bottom", dest="direction" ) + class Model(MemeArgsModel): direction: Literal["left", "right", "top", "bottom"] = Field( "left", description=help ) -def guichu(images: List[BuildImage], texts, args): + +def guichu(images: List[BuildImage], texts, args: Model): img = images[0].convert("RGBA") img_w, img_h = img.size - Mode = namedtuple( - "Mode", ["method", "size1", "pos1", "size2", "pos2"] - ) + Mode = namedtuple("Mode", ["method", "size1", "pos1", "size2", "pos2"]) modes: Dict[str, Mode] = { "left": Mode( Image.FLIP_LEFT_RIGHT, @@ -79,20 +79,25 @@ def guichu(images: List[BuildImage], texts, args): img_symmetric.paste(img.crop(mode.size1), mode.pos1, alpha=True) img_symmetric.paste(img_flip.crop(mode.size2), mode.pos2, alpha=True) img_symmetric_big = BuildImage.new("RGBA", img.size) - img_symmetric_big.paste(img_symmetric.copy().resize_width(img_w*2), (-img_w // 2, -img_h // 2)) + img_symmetric_big.paste( + img_symmetric.copy().resize_width(img_w * 2), (-img_w // 2, -img_h // 2) + ) frames: List[IMG] = [] - frames += ([img.image] * 3 + [img_flip.image] * 3) * 3 + \ - [img.image, img_flip.image] * 3 + \ - ([img_symmetric.image] * 2 + [img_symmetric_big.image] * 2) * 2 - + frames += ( + ([img.image] * 3 + [img_flip.image] * 3) * 3 + + [img.image, img_flip.image] * 3 + + ([img_symmetric.image] * 2 + [img_symmetric_big.image] * 2) * 2 + ) + return save_gif(frames, 0.20) + add_meme( - "guichu", - guichu, - min_images=1, - max_images=1, + "guichu", + guichu, + min_images=1, + max_images=1, args_type=MemeArgsType( parser, Model, @@ -104,4 +109,4 @@ def guichu(images: List[BuildImage], texts, args): ], ), keywords=["鬼畜"], -) \ No newline at end of file +) diff --git a/meme_generator/memes/maimai_awaken/__init__.py b/meme_generator/memes/maimai_awaken/__init__.py index 9839466a..ec62ba20 100644 --- a/meme_generator/memes/maimai_awaken/__init__.py +++ b/meme_generator/memes/maimai_awaken/__init__.py @@ -1,12 +1,14 @@ from pathlib import Path from typing import List -from meme_generator import add_meme from pil_utils import BuildImage + +from meme_generator import add_meme from meme_generator.utils import make_jpg_or_gif img_dir = Path(__file__).parent / "images" + def maimai_awaken(images: List[BuildImage], texts, args): frame = BuildImage.open(img_dir / "0.png") @@ -16,4 +18,7 @@ def make(img: BuildImage) -> BuildImage: return make_jpg_or_gif(images[0], make) -add_meme("maimai_awaken", maimai_awaken, min_images=1, max_images=1, keywords=["旅行伙伴觉醒"]) \ No newline at end of file + +add_meme( + "maimai_awaken", maimai_awaken, min_images=1, max_images=1, keywords=["旅行伙伴觉醒"] +) diff --git a/meme_generator/memes/maimai_join/__init__.py b/meme_generator/memes/maimai_join/__init__.py index 3ae7272e..b923e7fb 100644 --- a/meme_generator/memes/maimai_join/__init__.py +++ b/meme_generator/memes/maimai_join/__init__.py @@ -1,12 +1,14 @@ from pathlib import Path from typing import List -from meme_generator import add_meme from pil_utils import BuildImage + +from meme_generator import add_meme from meme_generator.utils import make_jpg_or_gif img_dir = Path(__file__).parent / "images" + def maimai_join(images: List[BuildImage], texts, args): frame = BuildImage.open(img_dir / "0.png") @@ -16,4 +18,5 @@ def make(img: BuildImage) -> BuildImage: return make_jpg_or_gif(images[0], make) -add_meme("maimai_join", maimai_join, min_images=1, max_images=1, keywords=["旅行伙伴加入"]) \ No newline at end of file + +add_meme("maimai_join", maimai_join, min_images=1, max_images=1, keywords=["旅行伙伴加入"]) diff --git a/meme_generator/memes/taunt/__init__.py b/meme_generator/memes/taunt/__init__.py index 0920a4f3..15710bc3 100644 --- a/meme_generator/memes/taunt/__init__.py +++ b/meme_generator/memes/taunt/__init__.py @@ -1,12 +1,14 @@ from pathlib import Path from typing import List -from meme_generator import add_meme from pil_utils import BuildImage + +from meme_generator import add_meme from meme_generator.utils import make_jpg_or_gif img_dir = Path(__file__).parent / "images" + def taunt(images: List[BuildImage], texts, args): frame = BuildImage.open(img_dir / "0.png") @@ -16,4 +18,5 @@ def make(img: BuildImage) -> BuildImage: return make_jpg_or_gif(images[0], make) -add_meme("taunt", taunt, min_images=1, max_images=1, keywords=["嘲讽"]) \ No newline at end of file + +add_meme("taunt", taunt, min_images=1, max_images=1, keywords=["嘲讽"]) diff --git a/meme_generator/memes/what_I_want_to_do/__init__.py b/meme_generator/memes/what_I_want_to_do/__init__.py index fbbddc08..e27ee2ad 100644 --- a/meme_generator/memes/what_I_want_to_do/__init__.py +++ b/meme_generator/memes/what_I_want_to_do/__init__.py @@ -1,12 +1,14 @@ from pathlib import Path from typing import List -from meme_generator import add_meme from pil_utils import BuildImage + +from meme_generator import add_meme from meme_generator.utils import make_jpg_or_gif img_dir = Path(__file__).parent / "images" + def what_I_want_to_do(images: List[BuildImage], texts, args): frame = BuildImage.open(img_dir / "0.png") @@ -16,4 +18,11 @@ def make(img: BuildImage) -> BuildImage: return make_jpg_or_gif(images[0], make) -add_meme("what_I_want_to_do", what_I_want_to_do, min_images=1, max_images=1, keywords=["我想上的"]) \ No newline at end of file + +add_meme( + "what_I_want_to_do", + what_I_want_to_do, + min_images=1, + max_images=1, + keywords=["我想上的"], +)