Nikita Kalanakov 2 lat temu
rodzic
commit
682b033f2b
2 zmienionych plików z 2 dodań i 81 usunięć
  1. 0 79
      makeshot.py
  2. 2 2
      makeshot/makeshot.c

+ 0 - 79
makeshot.py

@@ -1,79 +0,0 @@
-from sys import stdin
-from textwrap import fill, shorten
-
-from ujson import loads
-from PIL import Image, ImageDraw, ImageFont, ImageOps
-from emoji import demojize
-
-COLORS = [
-  (0xee, 0x49, 0x28),
-  (0x41, 0xa9, 0x03),
-  (0xe0, 0x96, 0x02),
-  (0x0f, 0x94, 0xed),
-  (0x8f, 0x3b, 0xf7),
-  (0xfc, 0x43, 0x80),
-  (0x00, 0xa1, 0xc4),
-  (0xeb, 0x70, 0x02)
-]
-
-data = loads(stdin.read())
-
-output_path = data['output_path']
-avatar_path = data['avatar_path']
-username = data['username']
-username_color = data['username_color']
-text = data['text']
-
-username = demojize(username)
-text = demojize(text)
-
-if len(username) >= 37:
-  username = username[:40] + '...'
-
-text = fill(text, width=40, replace_whitespace=False)
-
-hpadding = 18
-vpadding = 14
-avatar_padding = 12
-avatar_dim = 64
-
-font = ImageFont.truetype('./resources/fonts/OpenSans-Regular.ttf', 24)
-username_font = ImageFont.truetype('./resources/fonts/OpenSans-Bold.ttf', 22)
-tail = Image.open('./resources/tail.png')
-mask = Image.new('L', (avatar_dim * 3, avatar_dim * 3), 0)
-draw = ImageDraw.Draw(mask)
-draw.ellipse((0, 0, avatar_dim * 3, avatar_dim * 3), fill=255)
-mask = mask.resize((avatar_dim, avatar_dim), Image.ANTIALIAS)
-tail_width, tail_height = tail.size
-
-avatar_width = avatar_dim + avatar_padding
-avatar_height = avatar_dim
-
-avatar = Image.open(avatar_path)
-avatar = avatar.resize((avatar_dim, avatar_dim))
-avatar.putalpha(mask)
-
-username_width, username_height = username_font.getsize(username)
-text_width, text_height = font.getsize_multiline(text)
-
-image_width = avatar_width + max(text_width, username_width) + hpadding*2
-image_height = text_height + username_height + vpadding*2
-
-message = Image.new('RGBA', (image_width, image_height + 8))
-message.paste(avatar, (0, image_height - avatar_height + 5), avatar)
-
-x1 = avatar_dim + avatar_padding
-y1 = 0
-x2 = x1 + max(text_width, username_width) + hpadding*2
-y2 = y1 + text_height + username_height + vpadding*2
-
-draw = ImageDraw.Draw(message)
-draw.rounded_rectangle((x1, y1, x2, y2), fill=(43, 43, 43), radius=7)
-draw.text((avatar_width + hpadding, vpadding/2), username, font=username_font, fill=COLORS[username_color])
-draw.multiline_text((avatar_width + hpadding, username_height + vpadding), text, font=font)
-
-message.paste(tail, (avatar_width - tail_width + 8, image_height - tail_height + 1), tail)
-
-message = ImageOps.contain(message, (512, 512))
-
-message.save(output_path)

+ 2 - 2
makeshot/makeshot.c

@@ -175,7 +175,7 @@ void buffer_append_escaped(buffer_t *buffer, char c) {
       i += k-1;\
       buffer_append_data(buffer, "<", 1);\
       if (*tag == ' ')\
-        BUFFER_APPEND(buffer, 'span');\
+        BUFFER_APPEND(buffer, "span");\
       BUFFER_APPEND(buffer, tag);\
       buffer_append_data(buffer, ">", 1);\
       if (pr)\
@@ -184,7 +184,7 @@ void buffer_append_escaped(buffer_t *buffer, char c) {
         BUFFER_CONCAT(buffer, temp_buffer);\
       buffer_append_data(buffer, "</", 2);\
       if (*tag == ' ')\
-        BUFFER_APPEND(buffer, 'span');\
+        BUFFER_APPEND(buffer, "span");\
       else\
         BUFFER_APPEND(buffer, tag);\
       buffer_append_data(buffer, ">", 1);\