eat 支持自定义远程配置文件加载模版 (#197)

.gitattributes

@@ -0,0 +1,3 @@
+/Users/lowking/PagerMaid_Plugins/keyword_func/forward.py merge=ours
+/Users/lowking/PagerMaid_Plugins/keyword_func/surface.py merge=ours
+/Users/lowking/PagerMaid_Plugins/.gitattributes merge=ours

eat.py

@@ -12,6 +12,8 @@ from struct import error as StructError
 from pagermaid.listener import listener
 from pagermaid.utils import alias_command
 from pagermaid import redis, config
+from collections import defaultdict
+import json
 
 
 try:
@@ -30,9 +32,11 @@ notifyStrArr = {
     "6": "踢人",
 }
 max_number = len(positions)
+configFilePath = 'plugins/eat/config.json'
+configFileRemoteUrlKey = "eat.configFileRemoteUrl"
 
 
-def eat_it(base, mask, photo, number):
+async def eat_it(context, base, mask, photo, number, layer = 0):
     mask_size = mask.size
     photo_size = photo.size
     if mask_size[0] < photo_size[0] and mask_size[1] < photo_size[1]:
@@ -41,22 +45,116 @@ def eat_it(base, mask, photo, number):
     photo = photo.crop((0, 0, mask_size[0], mask_size[1]))
     mask1 = Image.new('RGBA', mask_size)
     mask1.paste(photo, mask=mask)
-    base.paste(mask1, (positions[str(number)][0], positions[str(number)][1]), mask1)
+    numberPosition = positions[str(number)]
+    base.paste(mask1, (numberPosition[0], numberPosition[1]), mask1)
+
+    # 增加判断是否有第二个头像孔
+    isContinue = len(numberPosition) > 2 and layer == 0
+    if isContinue:
+        await context.client.download_profile_photo(
+            from_user.user.id,
+            "plugins/eat/" + str(from_user.user.id) + ".jpg",
+            download_big=True
+        )
+        try:
+            markImg = Image.open("plugins/eat/" + str(from_user.user.id) + ".jpg")
+            maskImg = Image.open("plugins/eat/mask" + str(numberPosition[2]) + ".png")
+        except:
+            await context.edit(f"图片模版加载出错，请检查并更新配置：mask{str(numberPosition[2])}.png")
+            return base
+        base = await eat_it(context, base, maskImg, markImg, numberPosition[2], layer+1)
+
     temp = base.size[0] if base.size[0] > base.size[1] else base.size[1]
     if temp != 512:
         scale = 512 / temp
         base = base.resize((int(base.size[0] * scale), int(base.size[1] * scale)), Image.LANCZOS)
+
     return base
 
 
+async def updateConfig(configFilePath, context):
+    configFileRemoteUrl = redis.get(configFileRemoteUrlKey)
+    if configFileRemoteUrl:
+        if downloadFileFromUrl(configFileRemoteUrl, configFilePath) != 0:
+            redis.set(configFileRemoteUrlKey, configFileRemoteUrl)
+            return -1
+        else:
+            return await loadConfigFile(configFilePath, context, True)
+    return 0
+
+
+def downloadFileFromUrl(url, filepath):
+    try:
+        re = get(url)
+        with open(filepath, 'wb') as ms:
+            ms.write(re.content)
+    except:
+        return -1
+    return 0
+
+
+async def loadConfigFile(configFilePath, context, forceDownload = False):
+    global positions, notifyStrArr
+    try:
+        with open(configFilePath, 'r', encoding='utf8') as cf:
+            # 读取已下载的配置文件
+            remoteConfigJson = json.load(cf)
+            # positionsStr = json.dumps(positions)
+            # positions = json.loads(positionsStr)
+
+            # 读取配置文件中的positions
+            positionsStr = json.dumps(remoteConfigJson["positions"])
+            data = json.loads(positionsStr)
+            # 与预设positions合并
+            positions = mergeDict(positions, data)
+
+            # 读取配置文件中的notifies
+            data = json.loads(json.dumps(remoteConfigJson["notifies"]))
+            # 与预设positions合并
+            notifyStrArr = mergeDict(notifyStrArr, data)
+
+            # 读取配置文件中的needDownloadFileList
+            data = json.loads(json.dumps(remoteConfigJson["needDownloadFileList"]))
+            # 下载列表中的文件
+            for fileurl in data:
+                try:
+                    fsplit = fileurl.split("/")
+                    filePath = f"plugins/eat/{fsplit[len(fsplit)-1]}"
+                    if not exists(filePath) or forceDownload:
+                        downloadFileFromUrl(fileurl, filePath)
+
+                except:
+                    await context.edit(f"下载文件异常，url：{fileurl}")
+                    return -1
+    except:
+        return -1
+    return 0
+
+
+def mergeDict(d1, d2):
+    dd = defaultdict(list)
+
+    for d in (d1, d2):
+        for key, value in d.items():
+            dd[key] = value
+    return dict(dd)
+
+
 @listener(is_plugin=True, outgoing=True, command=alias_command("eat"),
-          description="生成一张 吃头像 图片，（可选：当第二个参数是数字时，读取预存的配置；当第二个参数是r开头时，头像旋转180°，并且判断r后面是数字则读取对应的配置生成）",
+          description="生成一张 吃头像 图片\n"
+                      "可选：当第二个参数是数字时，读取预存的配置；\n\n"
+                      "当第二个参数是.开头时，头像旋转180°，并且判断r后面是数字则读取对应的配置生成\n\n"
+                      "当第二个参数是/开头时，在/后面加url则从url下载配置文件保存到本地，如果就一个/，则直接更新配置文件，删除则是/delete\n\n"
+                      "当第二个参数是-开头时，在d后面加上模版id，即可设置默认模版-eat直接使用该模版，删除默认模版是-eat -",
           parameters="<username/uid> [随意内容]")
 async def eat(context):
     if len(context.parameter) > 2:
         await context.edit("出错了呜呜呜 ~ 无效的参数。")
         return
     diu_round = False
+    user_object = await context.client.get_me()
+    global from_user
+    from_user = await context.client(GetFullUserRequest(user_object.id))
     if context.reply_to_msg_id:
         reply_message = await context.get_reply_message()
         try:
@@ -71,7 +169,6 @@ async def eat(context):
             if user.isnumeric():
                 user = int(user)
         else:
-            user_object = await context.client.get_me()
             user = user_object.id
         if context.message.entities is not None:
             if isinstance(context.message.entities[0], MessageEntityMentionName):
@@ -98,6 +195,7 @@ async def eat(context):
         "plugins/eat/" + str(target_user.user.id) + ".jpg",
         download_big=True
     )
+
     reply_to = context.message.reply_to_msg_id
     if exists("plugins/eat/" + str(target_user.user.id) + ".jpg"):
         for num in range(1, max_number + 1):
@@ -116,14 +214,21 @@ async def eat(context):
             p2 = 0
             if len(context.parameter) == 1:
                 p1 = context.parameter[0]
-                if p1[0] == "r":
+                if p1[0] == ".":
                     diu_round = True
                     if len(p1) > 1:
+                        try:
                             p2 = int("".join(p1[1:]))
-                        number = p2
+                        except:
-                elif p1[0] == "d":
+                            # 可能也有字母的参数
+                            p2 = "".join(p1[1:])
+                elif p1[0] == "-":
                     if len(p1) > 1:
+                        try:
                             p2 = int("".join(p1[1:]))
+                        except:
+                            # 可能也有字母的参数
+                            p2 = "".join(p1[1:])
                     if p2:
                         redis.set("eat.default-config", p2)
                         await context.edit(f"已经设置默认配置为：{p2}")
@@ -131,32 +236,87 @@ async def eat(context):
                         redis.delete("eat.default-config")
                         await context.edit(f"已经清空默认配置")
                     return
+                elif p1[0] == "/":
+                    await context.edit(f"正在更新远程配置文件")
+                    if len(p1) > 1:
+                        # 获取参数中的url
+                        p2 = "".join(p1[1:])
+                        if p2 == "delete":
+                            redis.delete(configFileRemoteUrlKey)
+                            await context.edit(f"已清空远程配置文件url")
+                            return
+                        # 下载文件
+                        if downloadFileFromUrl(p2, configFilePath) != 0:
+                            await context.edit(f"下载配置文件异常，请确认url是否正确")
+                            return
+                        else:
+                            # 下载成功，加载配置文件
+                            redis.set(configFileRemoteUrlKey, p2)
+                            if await loadConfigFile(configFilePath, context, True) != 0:
+                                await context.edit(f"加载配置文件异常，请确认从远程下载的配置文件格式是否正确")
+                                return
+                            else:
+                                await context.edit(f"下载并加载配置文件成功")
+                    else:
+                        # 没传url直接更新
+                        if await updateConfig(configFilePath, context) != 0:
+                            await context.edit(f"更新配置文件异常，请确认从远程下载的配置文件格式是否正确")
+                            return
+                        else:
+                            await context.edit(f"从远程更新配置文件成功")
+                    return
             defaultConfig = redis.get("eat.default-config")
-            if p2 > 0:
+            if isinstance(p2, str):
                 number = p2
-            elif not diu_round and int(p1) > 0:
+            elif isinstance(p2, int) and p2 > 0:
+                number = int(p2)
+            elif not diu_round and ((isinstance(p1, int) and int(p1) > 0) or isinstance(p1, str)):
+                try:
                     number = int(p1)
+                except:
+                    number = p1
             elif defaultConfig:
+                try:
+                    defaultConfig = defaultConfig.decode()
                     number = int(defaultConfig)
+                except:
+                    number = str(defaultConfig)
         except:
             number = randint(1, max_number)
+
+        # 加载配置
+        if exists(configFilePath):
+            if await loadConfigFile(configFilePath, context) != 0:
+                await context.edit(f"加载配置文件异常，请确认从远程下载的配置文件格式是否正确")
+                return
+
         try:
             notifyStr = notifyStrArr[str(number)]
         except:
             notifyStr = "吃头像"
         await context.edit(f"正在生成 {notifyStr} 图片中 . . .")
         markImg = Image.open("plugins/eat/" + str(target_user.user.id) + ".jpg")
+        try:
             eatImg = Image.open("plugins/eat/eat" + str(number) + ".png")
             maskImg = Image.open("plugins/eat/mask" + str(number) + ".png")
+        except:
+            await context.edit(f"图片模版加载出错，请检查并更新配置：{str(number)}")
+            return
 
         if diu_round:
             markImg = markImg.rotate(180)  # 对图片进行旋转
-        result = eat_it(eatImg, maskImg, markImg, number)
+        try:
+            number = str(number)
+        except:
+            pass
+        result = await eat_it(context, eatImg, maskImg, markImg, number)
         result.save('plugins/eat/eat.webp')
         target_file = await context.client.upload_file("plugins/eat/eat.webp")
         try:
             remove("plugins/eat/" + str(target_user.user.id) + ".jpg")
             remove("plugins/eat/" + str(target_user.user.id) + ".png")
+            remove("plugins/eat/" + str(from_user.user.id) + ".jpg")
+            remove("plugins/eat/" + str(from_user.user.id) + ".png")
             remove("plugins/eat/eat.webp")
             remove(photo)
         except:

eat/config.json

@@ -0,0 +1,24 @@
+{
+  "positions": {
+    "ri": [64, 87],
+    "zou": [171, 328, "zou1"],
+    "zou1": [444, 339],
+    "ada": [223, 314, "ada1"],
+    "ada1": [283, 146]
+  },
+  "notifies": {
+    "ri": "日一下",
+    "zou": "揍你哦",
+    "ada": "给爷死"
+  },
+  "needDownloadFileList": [
+    "https://raw.githubusercontent.com/lowking/PagerMaid_Plugins/modify/eat/eatada.png",
+    "https://raw.githubusercontent.com/lowking/PagerMaid_Plugins/modify/eat/maskada.png",
+    "https://raw.githubusercontent.com/lowking/PagerMaid_Plugins/modify/eat/maskada1.png",
+    "https://raw.githubusercontent.com/lowking/PagerMaid_Plugins/modify/eat/eatzou.png",
+    "https://raw.githubusercontent.com/lowking/PagerMaid_Plugins/modify/eat/maskzou.png",
+    "https://raw.githubusercontent.com/lowking/PagerMaid_Plugins/modify/eat/maskzou1.png",
+    "https://raw.githubusercontent.com/lowking/PagerMaid_Plugins/modify/eat/eatri.png",
+    "https://raw.githubusercontent.com/lowking/PagerMaid_Plugins/modify/eat/maskri.png"
+  ]
+}

list.json

@@ -202,7 +202,7 @@
         },
         {
             "name": "eat",
-            "version": "1.032",
+            "version": "1.033",
             "section": "profile",
             "maintainer": "SF_PICK",
             "size": "6.4 kb",