suyiiyii/nonebot-bison
1
0
Fork 0
mirror of https://github.com/suyiiyii/nonebot-bison.git synced 2025-06-05 19:36:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "add log for merge image"

Browse Source 
This reverts commit 385d47268f9d928a0594fa53f64a01dfe7f2485c.
This commit is contained in:
felinae98 2021-02-19 15:54:56 +08:00
parent 385d47268f
commit 0d35e3390e
No known key found for this signature in database
GPG Key ID: 00C8B010587FF610
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/hk_reporter/post.py
View File

@ -1,9 +1,7 @@
import base64 import base64
import math
from dataclasses import dataclass, field from dataclasses import dataclass, field
from io import BytesIO from io import BytesIO
from typing import NoReturn, Optional from typing import NoReturn, Optional
from nonebot import logger
import httpx import httpx
from PIL import Image from PIL import Image
from .plugin_config import plugin_config from .plugin_config import plugin_config
@ -37,17 +35,15 @@ class Post:
if len(self.pics) < 6: if len(self.pics) < 6:
return return
first_image = await self._pic_url_to_image(self.pics[0]) first_image = await self._pic_url_to_image(self.pics[0])
if abs(first_image.size[0] - first_image.size[1]) / first_image.size[0] > 0.05: if first_image.size[0] != first_image.size[1]:
return return
pic_size = first_image.size[0] pic_size = first_image.size[0]
images = [first_image] images = [first_image]
for pic in self.pics[1:]: for pic in self.pics[1:]:
cur_image = await self._pic_url_to_image(pic) cur_image = await self._pic_url_to_image(pic)
if abs(first_image.size[0] - pic_size) / pic_size > 0.05 or \ if cur_image.size[0] != pic_size or cur_image.size[1] != pic_size:
abs(first_image.size[1] - pic_size) / pic_size > 0.05:
break break
images.append(cur_image) images.append(cur_image)
logger.debug('{} images is same size'.format(len(images)))
if len(images) == 6: if len(images) == 6:
matrix = (3, 2) matrix = (3, 2)
self.pics = self.pics[6:] self.pics = self.pics[6:]
@ -56,7 +52,6 @@ class Post:
self.pics = self.pics[9:] self.pics = self.pics[9:]
else: else:
return return
logger.info('trigger merge image with {} imgs'.format(len(images)))
target = Image.new('RGB', (matrix[0] * pic_size, matrix[1] * pic_size)) target = Image.new('RGB', (matrix[0] * pic_size, matrix[1] * pic_size))
for y in range(matrix[1]): for y in range(matrix[1]):
for x in range(matrix[0]): for x in range(matrix[0]):