feat: new conf, i18n and something else

- 完善 Altfe 框架
- 完善 前端设置面板
- 新增 全局配置模块
- 新增 i18n 多语言支持模块
- 新增 中文、英文语言
- 新增 前端 R18 过滤选项

Author: txperl

.github/workflows/pkg.yml

@@ -52,9 +52,10 @@ jobs:
           cp -r ./app/ ./.pkg/code/app/
           cp ./main.py ./.pkg/code/
           cp -r ./usr/ ./.pkg/public/usr/
-          cp ./config.yml ./.pkg/public/
+          cp ./app/config/biu_default.yml ./.pkg/public/
           cp ./LICENSE ./.pkg/public/
           cp ./README.md ./.pkg/public/
+          mv ./.pkg/public/biu_default.yml ./.pkg/public/config.yml
 
       - name: Setup Python 3.7
         uses: actions/[email protected]

.pkg/py-pkger.py

@@ -129,6 +129,8 @@ def run_script(self, pathname):
             finder.run_script(x[0])
             for name, mod in finder.modules.items():
                 module = name.split(".")[0] if os.name == "nt" else name
+                if module[0] == "_" and module[1:] in hiddenImport:
+                    continue
                 if module not in hiddenImport:
                     hiddenImport.append(module)
     for x in hiddenImport:
@@ -150,7 +152,7 @@ def run_script(self, pathname):
         deleteDIR(DIST_PATH)
 
     # 复制 PUBLIC 文件
-    copyDIR(PUBLIC_PATH, DIST_PATH, True, ["cache", ".token.json", ".DS_Store"])
+    copyDIR(PUBLIC_PATH, DIST_PATH, True, ["cache", "__pycache__", ".token.json", ".DS_Store"])
 
     # PyInstaller 打包
     os.system("pyinstaller%s %s" % (forarg, os.path.join(CODE_PATH, "main.py")))

README.md

@@ -1,10 +1,12 @@
 # PixivBiu
 
-PixivBiu 是一款不错的 Pixiv 搜索**辅助**工具。
+PixivBiu 是一款不错的 Pixiv **辅助**工具。
+
+English README is [here](./README_EN.md).
 
 ## 基础功能
 
-* Pixiv 搜索，可免会员按收藏数排序
+* Pixiv 搜索，可免会员按收藏数、人气排序
 * 下载原始图片，包括插画、漫画、动图
 * 多种下载模式，单、多线程模式以及 aria2 支持
 * 获取用户的作品、收藏夹、关注列表、相关推荐等
@@ -16,13 +18,13 @@ PixivBiu 是一款不错的 Pixiv 搜索**辅助**工具。
 ### 源码
 
 * 安装依赖，执行 `pip install -r requirements.txt`
-  + [flask](https://github.com/pallets/flask)
+  + [Flask](https://github.com/pallets/flask)
   + [requests](https://github.com/psf/requests)
   + [PyYAML](https://github.com/yaml/pyyaml)
   + [Pillow](https://github.com/python-pillow/Pillow)
   + [PixivPy](https://github.com/upbit/pixivpy)
   + [PySocks](https://github.com/Anorov/PySocks)
-* 修改 `./config.yml` 相关配置选项，具体参见注释
+* 修改 `./config.yml` 相关配置选项，具体可参考[默认配置文件](./app/config/biu_default.yml)
 * 执行 `python main.py`
 * 访问运行地址，默认为 `http://127.0.0.1:4001/`
 
@@ -32,7 +34,7 @@ PixivBiu 是一款不错的 Pixiv 搜索**辅助**工具。
 
 这里只提供 Windows 和 macOS 的编译版本，如有其他需求请自行编译。
 
-具体可在 [Releases](https://github.com/txperl/PixivBiu/releases) 中下载，或者[在这](https://biu.tls.moe/#/lib/dl)下载。
+具体可在 [releases](https://github.com/txperl/PixivBiu/releases) 中下载，或者[在这](https://biu.tls.moe/#/lib/dl)下载。
 
 ## 文档
 

README_EN.md

@@ -0,0 +1,59 @@
+# PixivBiu
+
+PixivBiu is a nice Pixiv **assistant** tool.
+
+中文的 README 在[这里](./README.md)。
+
+## Features
+
+* Pixiv search, sort by favorites and popularity without membership
+* Download original images, including illustrations, comics and motion pictures
+* Multiple download modes, single and multi-threaded mode and aria2 support
+* Get user's works, favorites, followers, related recommendations, etc.
+* Get rankings, including today's, this week's, and this month's rankings, etc.
+* Favorite works, followers, etc.
+
+## Usage
+
+### Source Code
+
+* Install dependencies, run `pip install -r requirements.txt`
+  + [Flask](https://github.com/pallets/flask)
+  + [requirements](https://github.com/psf/requests)
+  + [PyYAML](https://github.com/yaml/pyyaml)
+  + [Pillow](https://github.com/python-pillow/Pillow)
+  + [PixivPy](https://github.com/upbit/pixivpy)
+  + [PySocks](https://github.com/Anorov/PySocks)
+* Edit `./config.yml` configuration file, refer to the [default configuration file](./app/config/biu_default.yml)
+* Run `python main.py`
+* Open the running address, the default is `http://127.0.0.1:4001/`
+
+### Executable Binary File
+
+This project is developed by `[email protected](+)` and uses `PyInstaller` to build the executable binary file.
+
+There are only Windows and macOS version available here, so please build yourself if needed.
+
+They can be downloaded in [releases](https://github.com/txperl/PixivBiu/releases), or [here](https://biu.tls.moe/#/lib/dl).
+
+## Documentation
+
+Currently, there is **usage, development** type documentation, please visit [PixivBiu](https://biu.tls.moe/) if you need it.
+
+## Contribution
+
+If you want to participate in the development of this project, you are welcome to check [Development Documentation](https://biu.tls.moe/#/develop/quickin).
+
+## Other
+
+### Thanks to
+
+* [pixivpy](https://github.com/upbit/pixivpy) API support
+* [pixiv.cat](https://pixiv.cat/) Anti-generation server support
+* [HTML5 UP](https://html5up.net/) Front-end code support
+
+### Terms
+
+* This program (PixivBiu) is for learning and exchange only, please delete it yourself after the initial purpose is achieved
+* Any unknowable event after use has nothing to do with the original author, and the original author will not bear any consequences.
+* [MIT License](https://choosealicense.com/licenses/mit/)

altfe/bridge.py

@@ -1,5 +1,7 @@
 import importlib.util
 import os
+import random
+import string
 
 from altfe.interface.root import classRoot
 
@@ -12,37 +14,67 @@ class bridgeInit(classRoot):
     def __init__(self):
         self.rootPath = self.getENV("rootPathFrozen")
         self.APP_PATH = {
+            "ins": self.rootPath + "app/lib/ins/",
             "static": self.rootPath + "app/lib/static/",
             "common": self.rootPath + "app/lib/common/",
             "core": self.rootPath + "app/lib/core/",
             "pre": self.rootPath + "app/pre/",
             "plugin": self.rootPath + "app/plugin/"
         }
 
-    def run(self):
-        self.loadAllModules()
-        classRoot.mount(["LIB_STATIC", "LIB_COMMON"])
+    def run(self, hint=False):
+        if hint:
+            print("[Altfe] ;)")
+        bridgeInit.load_all(self.read_all_modules())
+        classRoot.mount(["LIB_STATIC"])
+        classRoot.instantiate(["LIB_INS"])
+        classRoot.mount(["LIB_INS", "LIB_COMMON"])
         classRoot.instantiate(["LIB_CORE", "PRE"])
         classRoot.mount(["LIB_CORE", "PRE", "PLUGIN"])
 
-    def loadAllModules(self):
+    def read_all_modules(self):
+        r = []
         conf = classRoot.loadConfig(self.rootPath + "app/config/switch.yml")["OnOff"]
-        for dirName in self.APP_PATH:
-            rPath = self.APP_PATH[dirName]
-            files = os.listdir(rPath)
-            for file in files:
-                if dirName in conf and conf[dirName] is not None and file in conf[dirName]:
-                    if not conf[dirName][file]:
-                        continue
-                r = rPath + file
-                if os.path.isdir(r):
-                    tmp = os.listdir(r)
+        for moduleType in self.APP_PATH:
+            rootModulePath = self.APP_PATH[moduleType]
+            files = os.listdir(rootModulePath)
+            files.sort()
+            for fileName in files:
+                # skip
+                if not bridgeInit.is_load(conf, moduleType, fileName):
+                    continue
+                # read
+                moduleName = "%s_%s_%s" % (moduleType, "".join(
+                    random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(5)), fileName)
+                filePath = rootModulePath + fileName
+                # dir handle
+                if os.path.isdir(filePath):
+                    filePath += "/"
+                    tmp = os.listdir(filePath)
                     if "main.py" in tmp:
-                        r += "/main.py"
+                        r.append([moduleName, filePath + "main.py"])
                     else:
-                        continue
-                elif file[-3:] != ".py":
-                    continue
-                spec = importlib.util.spec_from_file_location(dirName + "_" + file, r)
-                cls = importlib.util.module_from_spec(spec)
-                spec.loader.exec_module(cls)
+                        for x in tmp:
+                            if x[-3:] == ".py" and bridgeInit.is_load(conf, moduleType, x):
+                                r.append([moduleName, filePath + x])
+                elif fileName[-3:] == ".py":
+                    r.append([moduleName, filePath])
+        return r
+
+    @staticmethod
+    def is_load(conf, moduleType, fileName):
+        if moduleType in conf and conf[moduleType] is not None and fileName in conf[moduleType]:
+            if not conf[moduleType][fileName]:
+                return False
+        return True
+
+    @staticmethod
+    def load_all(modules):
+        for x in modules:
+            bridgeInit.load_single(*x)
+
+    @staticmethod
+    def load_single(name, path):
+        spec = importlib.util.spec_from_file_location(name, path)
+        cls = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(cls)

altfe/interface/root.py

@@ -14,6 +14,7 @@ class classRoot(object):
     """
     __ENV = {}
     __MODULE = {
+        "LIB_INS": {},
         "LIB_STATIC": {},
         "LIB_COMMON": {},
         "LIB_CORE": {},
@@ -80,9 +81,9 @@ def wrapper(module):
         return wrapper
 
     @staticmethod
-    def loadConfig(uri):
+    def loadConfig(uri, default=False):
         if not os.path.exists(uri):
-            return False
+            return default
         with open(uri, "r", encoding="UTF-8") as f:
             sfx = uri.split(".")[-1]
             if sfx == "json":

app/config/biu_default.yml

@@ -0,0 +1,108 @@
+# It is the default configuration file for PixivBiu.
+# There is no English version yet... It will be available soon.
+# You can use the translation tool to read it, for now.
+
+## 系统相关 ##
+sys.host: "127.0.0.1:4001"
+  # 程序运行的地址，如果不是很懂请不要修改
+  # 不可带有 http:// 前缀
+
+sys.isDebug: false
+  # 调试模式
+  # true 为开启；false 为关闭
+
+sys.api: "public"
+  # 默认 api 模式
+  # public: 可以使用全功能，但必须需要代理（翻墙）
+  # byPassSni: 可以使用全功能，但无需代理（无需翻墙）
+
+sys.proxy: ""
+  # 本地代理服务监听地址
+  # 如 http://127.0.0.1:1080/
+  # 留空则程序会自动检测系统代理设置（仅 Windows、macOS）
+  # 填入 no 则不使用任何代理
+
+sys.language: ""
+  # 语言设置，留空为程序自动判断
+  # 可选：cn、en
+
+sys.theme: "multiverse"
+  # 默认主题
+  # 暂无其他，请保持默认为 multiverse
+
+sys.autoOpen: true
+  # 启动后自动打开程序运行网址
+
+
+## 搜索相关 ##
+biu.search.maxThreads: 8
+  # 搜索池最大线程数
+
+biu.search.loadCacheFirst: true
+  # 搜索时优先加载本地缓存
+  # true 为开启；false 为关闭
+
+
+## 下载相关 ##
+biu.download.mode: "dl-single"
+  # 下载模式
+  # dl-single: 程序单线程下载
+  # aria2: 使用 aria2 下载，如果启用此项，还需填写下方的 aria2Host、aria2Secret
+  # dl: [暂不推荐] 程序多线程下载，暂时不稳定
+
+biu.download.aria2Host: "localhost:6800"
+  # aria2 RPC 监听地址，如 localhost:6800
+
+biu.download.aria2Secret: ""
+  # aria2 RPC 密钥，如未设置请留空
+
+biu.download.maxDownloading: 8
+  # 最大同时下载任务数
+
+biu.download.saveURI: "{ROOTPATH}/downloads/{KT}/"
+  # 下载保存路径，以 / 结尾
+  # 不可使用 \ 符号，请将其替换为 / 或 \\
+  # 可选变量
+  # - {ROOTPATH}: 程序根目录
+  # - {HOMEPATH}: 用户主目录，可能为 /Users/user/、C:/Users/user/、/home/user/
+  # - {KT}: 搜索关键词
+  # - {title}: 作品标题
+  # - {work_id}: 作品 ID
+  # - {user_name}: 作者名称
+  # - {user_id}: 作者 ID
+  # - {type}: 作品类型
+  # - {date_image}: 作品的日期
+  # - {date_today}: 今天的日期
+
+biu.download.saveFileName: "{title}_{work_id}"
+  # 下载图片的标题
+  # 不可使用 \ 符号，请将其替换为 \\
+  # 可选变量
+  # - {title}: 作品标题
+  # - {work_id}: 作品 ID
+  # - {user_name}: 作者名称
+  # - {user_id}: 作者 ID
+  # - {type}: 作品类型
+  # - {date_image}: 作品的日期
+  # - {date_today}: 今天的日期
+
+biu.download.autoArchive: true
+  # 自动将拥有多张图片的作品归档（放入一个文件夹中）
+  # true 为开启；false 为关闭
+
+biu.download.autoDeterTheSame: true
+  # 自动判断下载目录中重名图片是否相同
+  # 若相同，则只保留一份；若不同，则自动将新图片重命名
+  # true 为开启；false 为关闭
+
+biu.download.whatsUgoira: "webp"
+  # 将动图转换为指定格式
+  # 可选 webp, gif
+
+biu.download.imageHost: ""
+  # 下载时使用的 Pixiv 图片服务器
+  # 留空则程序自动判断
+  # 参考如下：
+  # https://i.pximg.net 官方图片服务器（需代理）
+  # https://i.pixiv.cat 第三方反代图片服务器（需代理）
+  # https://i.pixiv.re 第三方反代图片服务器（无需代理）