v1.16

- feat: new hook named pic2webp, tks @hiBlunt
- fix: jinja2 PackageLoader ValueError for single module
- hook package persistence(alpha test)

Author: staugur

.github/workflows/ci.yml

@@ -35,4 +35,4 @@ jobs:
   
     - name: Test & upload report to coverage
       run: |
-        cd src && coverage run -m unittest discover -p "test_*.py" && codecov -t ${{ secrets.CODECOV_TOKEN }}
+        cd src && coverage run -m unittest discover -p "test_*.py" && codecov --token ${{ secrets.CODECOV_TOKEN }}

src/app.py

@@ -10,6 +10,8 @@
 """
 
 from flask import Flask, g, request, render_template, jsonify
+from werkzeug.middleware.proxy_fix import ProxyFix
+from sys import path
 from views import front_bp, api_bp
 from utils.tool import (
     Attribute,
@@ -35,7 +37,6 @@
 from libs.hook import HookManager
 from config import GLOBAL
 from version import __version__
-from werkzeug.middleware.proxy_fix import ProxyFix
 
 __author__ = "staugur"
 __email__ = "[email protected]"
@@ -55,6 +56,8 @@
 )
 if GLOBAL["ProxyFix"]:
     app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1, x_host=1)
+if GLOBAL["HookPkgStorageDir"]:
+    path.insert(1, GLOBAL["HookPkgStorageDir"])
 
 hm = HookManager(app)
 app.register_blueprint(front_bp)

src/config.py

@@ -40,6 +40,8 @@
     # 站点设置部分参数额外允许的HTML标签的属性
     "AllowStyles": envs.get("sapic_allowstyles", ""),
     # 站点设置部分参数额外允许的HTML标签的样式
+    "HookPkgStorageDir": "",
+    # 第三方扩展包持久化目录
 }
 
 

src/libs/hook.py

@@ -367,9 +367,14 @@ def add_third_hook(self, third_hook_module_name):
         if third_hook_module_name:
             self.__third_hooks = third_hook_module_name
             if hasattr(self, "app"):
-                self.app.jinja_loader.loaders.append(
-                    PackageLoader(third_hook_module_name)
-                )
+                try:
+                    self.app.jinja_loader.loaders.append(
+                        PackageLoader(third_hook_module_name)
+                    )
+                except ValueError:
+                    self.app.jinja_loader.loaders.append(
+                        PackageLoader(third_hook_module_name, "")
+                    )
             self.reload()
 
     def remove_third_hook(self, third_hook_name):

src/sapicd.py

@@ -13,15 +13,9 @@ def delete_hookloadtime():
     del s["hookloadtime"]
 
 
-IS_RUN = (
-    True
-    if (getenv("sapic_isrun") or getenv("picbed_isrun")) == "true"
-    else False
-)
-
-CPU_COUNT = int(
-    envs.get("sapic_cpucount") or envs.get("picbed_cpucount") or cpu_count()
-)
+IS_RUN = True if getenv("sapic_isrun") == "true" else False
+
+CPU_COUNT = int(envs.get("sapic_cpucount") or cpu_count())
 
 LOGSDIR = join(dirname(abspath(__file__)), "logs")
 if not exists(LOGSDIR):

src/utils/web.py

@@ -13,7 +13,7 @@
 import imghdr
 from posixpath import basename, splitext
 from os import remove
-from os.path import join as pathjoin, getsize
+from os.path import join as pathjoin, getsize, isdir
 from io import BytesIO
 from functools import wraps
 from base64 import urlsafe_b64decode as b64decode, b64decode as pic64decode
@@ -69,6 +69,7 @@
     b64size,
 )
 from ._compat import text_type, urlsplit, parse_qs
+from config import GLOBAL
 from threading import Thread
 from functools import reduce
 
@@ -673,8 +674,11 @@ def get_upload_method(class_name):
 
 
 def _pip_install(pkg, index=None, upgrade=None):
-    """使用pip安装模块到用户目录$HOME/.local"""
+    """使用pip安装模块到指定目标或默认用户目录$HOME/.local"""
+    tgt = GLOBAL["HookPkgStorageDir"]
     cmd = [executable, "-m", "pip", "install", "-q"]
+    if tgt:
+        cmd.extend(("-t", tgt))
     if not is_venv():
         cmd.append("--user")
     if upgrade:
@@ -700,6 +704,10 @@ def _pip_list(fmt=None, no_fresh=True):
     else:
         cmd = [executable, "-m", "pip", "list", "--format", "json"]
         data = json.loads(check_output(cmd))
+        tgt = GLOBAL["HookPkgStorageDir"]
+        if tgt and isdir(tgt):
+            cmd.extend(("--path", tgt))
+            data.extend(json.loads(check_output(cmd)))
         pipe = rc.pipeline()
         pipe.set(key, json.dumps(data))
         pipe.expire(key, 3600)

src/version.py

@@ -1 +1 @@
-__version__ = "1.15.0"
+__version__ = "1.16.0"