klemek/meme-otron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip meme part + can skip watermark

Browse Source
This commit is contained in:
klemek
2020-04-29 12:25:21 +02:00
parent 8caa7efb94
commit 01afa3f16d
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meme_otron/meme_otron.py
+18 -5
View File
@@ -29,7 +29,8 @@ simple_text.x_range = [0.01, 0.99]
simple_text.y_range = [0.2, 0.8] simple_text.y_range = [0.2, 0.8]
def compute(*args: str, left_wmark_text: Optional[str] = None, def compute(*args: str, input_data: Optional[bytes] = None,
wmark: bool = True, left_wmark_text: Optional[str] = None,
debug: bool = False) -> Tuple[Optional[Image.Image], List[str]]: debug: bool = False) -> Tuple[Optional[Image.Image], List[str]]:
if len(args) < 1: if len(args) < 1:
return None, ['Not enough arguments'] return None, ['Not enough arguments']
@@ -38,7 +39,7 @@ def compute(*args: str, left_wmark_text: Optional[str] = None,
images = [] images = []
errors = [] errors = []
for part in parts: for part in parts:
img, err = compute_part(*part, debug=debug) img, err = compute_part(*part, input_data=input_data, debug=debug)
if img is not None: if img is not None:
images += [img] images += [img]
else: else:
@@ -49,6 +50,7 @@ def compute(*args: str, left_wmark_text: Optional[str] = None,
output_image = img_factory.compose_image(images) output_image = img_factory.compose_image(images)
if wmark:
watermarks = [right_wmark] watermarks = [right_wmark]
if left_wmark_text is not None: if left_wmark_text is not None:
watermarks += [left_wmark.variant(left_wmark_text)] watermarks += [left_wmark.variant(left_wmark_text)]
@@ -57,16 +59,27 @@ def compute(*args: str, left_wmark_text: Optional[str] = None,
return output_image, errors return output_image, errors
def compute_part(*args: str, debug: bool = False) -> Tuple[Optional[Image.Image], Optional[str]]: def compute_part(*args: str, input_data: Optional[bytes] = None,
debug: bool = False) -> Tuple[Optional[Image.Image], Optional[str]]:
meme_id = utils.sanitize_input(args[0]) meme_id = utils.sanitize_input(args[0])
if meme_id == "text": if meme_id == "text":
if len(args) < 2: if len(args) <= 1:
return None, 'Text: not enough arguments' return None, 'Text: not enough arguments'
texts = [simple_text.variant(arg) for arg in args[1:]] texts = [simple_text.variant(arg) for arg in args[1:]]
return img_factory.build_text_only(texts, debug=debug), None return img_factory.build_text_only(texts, debug=debug), None
elif meme_id == "image": elif meme_id == "image":
return None, 'Image: not yet implemented' if input_data is None or len(input_data) == 0:
if len(args) <= 1:
return None, 'Image: received no input data nor URL'
else:
return None, 'Image: URL mode not yet implemented'
else:
img = img_factory.build_image_only(input_data)
if img is None:
return None, 'Image: invalid image format'
else:
return img, None
else: else:
meme = meme_db.get_meme(meme_id) meme = meme_db.get_meme(meme_id)
if meme is None: if meme is None: