bcmd 0.6.8__py3-none-any.whl → 0.6.10__py3-none-any.whl

bcmd/common/func.py

@@ -15,5 +15,5 @@ def checkPathOrNotExists(folder: Path):
 
 @contextmanager
 def useResources(name: str):
-    with importlib.resources.path('bcmdx.resources', name) as target:
+    with importlib.resources.path('bcmd.resources', name) as target:
         yield target

bcmd/tasks/__init__.py

@@ -3,6 +3,7 @@ from . import bin
 from . import code
 from . import crypto
 from . import debian
+from . import docs
 from . import download
 from . import image
 from . import json

bcmd/tasks/docs.py

@@ -0,0 +1,185 @@
+import asyncio
+import datetime
+import pickle
+import tkinter as tk
+from contextlib import asynccontextmanager
+from pathlib import Path
+from tkinter import messagebox
+from typing import Any, Final
+from uuid import uuid4
+
+import paramiko
+from beni import bcolor, bcrypto, bfile, bpath, brun, btask, bzip
+from beni.bform import BForm
+from beni.bfunc import syncCall
+from typer import Argument
+
+from bcmd.utils.utils import decryptFileIgnoreError
+
+app: Final = btask.newSubApp('Vitepress 网站相关')
+conf: dict[str, Any] = {}
+isUpload: bool = False
+password: str = ''
+now = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+
+projectPath = bpath.get('')
+docsPath = bpath.get('')
+vitepressDistPath = bpath.get('')
+distPath = bpath.get('')
+deployPath = bpath.get('')
+zipFile = bpath.get('')
+
+
+@app.command()
+@syncCall
+async def build(
+    path: Path = Argument(Path.cwd(), help='workspace 路径'),
+):
+    '发布'
+    with bpath.useTempPath(True) as tempPath:
+        await init(path)
+        await userInput()
+        await vitepressBuild(tempPath / 'site')
+        await makeDeploy(tempPath / 'deploy')
+        for file in bpath.listPath(tempPath):
+            await bzip.sevenZip(zipFile, file)
+        if isUpload:
+            await upload()
+    bcolor.printGreen('OK')
+
+
+async def init(path: Path):
+    global projectPath, docsPath, vitepressDistPath, distPath, deployPath, conf, zipFile
+
+    # 初始化目录路径
+    projectPath = path
+    docsPath = projectPath / 'docs'
+    vitepressDistPath = docsPath / '.vitepress/dist'
+    distPath = projectPath / 'dist'
+    deployPath = projectPath / 'deploy'
+
+    # 清空打包用到的目录
+    bpath.remove(distPath)
+    bpath.make(distPath)
+    bpath.remove(vitepressDistPath)
+
+    # 更新配置
+    infoTomlFile = deployPath / 'info.toml'
+    if not infoTomlFile.exists():
+        btask.abort('部署文件不存在', infoTomlFile)
+    conf.update(await bfile.readToml(infoTomlFile))
+
+    # 整理特殊的字段
+    zipFile = distPath / f'{conf['domain']}_{now}.7z'
+    conf['upload_file_name'] = zipFile.name
+    conf['temp_path'] += f'/{uuid4()}'
+
+
+async def userInput():
+    global isUpload, password
+
+    class BuildForm(BForm):
+        def __init__(self):
+            super().__init__(title='发布网站')
+            self.varIsUpload = tk.BooleanVar(value=True)
+            self.varPassword = tk.StringVar(value='')
+            self.addLabel('网站', conf['domain'])
+            self.addCheckBox('上传服务器', '', self.varIsUpload)
+            self.addEntry('请输入密码', self.varPassword, width=20, command=self.onBtn, password=True, focus=True)
+
+        def onBtn(self):
+            password = self.varPassword.get()
+            try:
+                conf['server_info'] = bcrypto.decryptJson(conf['server_info'], password)
+                self.destroy()
+            except:
+                messagebox.showerror('密码错误', '密码错误，请重新输入')
+
+        def getResult(self):
+            return self.varIsUpload.get(), self.varPassword.get()
+
+    isUpload, password = BuildForm().run()
+
+    # 配置里面每个字段都尝试解密（实际效率较低但不影响使用）
+    for k, v in conf.items():
+        try:
+            conf[k] = bcrypto.decryptText(v, password)
+        except:
+            pass
+
+
+async def vitepressBuild(outputPath: Path):
+    with bpath.changePath(projectPath):
+        await brun.run('pnpm install')
+        await brun.run('pnpm docs:build')
+        bpath.copy(vitepressDistPath, outputPath)
+
+
+async def makeDeploy(outputPath: Path):
+    bpath.copy(projectPath / 'deploy', outputPath)
+    bpath.remove(outputPath / 'info.toml')
+
+    # 删除配置里面加密和删除非字符串的配置，剩下的内容用于替换文件名和文件内容
+    dataDict: dict[str, Any] = pickle.loads(pickle.dumps(conf))
+    for k in list(dataDict.keys()):
+        v = dataDict[k]
+        if not isinstance(v, str):
+            del dataDict[k]
+
+    # 文件名以及内容调整
+    fileList = bpath.listFile(outputPath, True)
+    await asyncio.gather(*[decryptFileIgnoreError(x, password) for x in fileList])
+    for file in fileList:
+
+        # 替换文件名
+        toFile = str(file)
+        for k, v in dataDict.items():
+            toFile = toFile.replace(f'{{{k}}}', str(v))
+        if toFile != str(file):
+            file.rename(toFile)
+            file = bpath.get(toFile)
+
+        # 替换文件内容
+        content = await bfile.readText(file)
+        oldContent = content
+        for k, v in dataDict.items():
+            content = content.replace(f'{{{k}}}', str(v))
+        if oldContent != content:
+            await bfile.writeText(file, content)
+
+    # 将 Scrips 里面的文件都抽离到 dist 目录
+    scriptsPath = outputPath / 'Scripts'
+    for file in bpath.listFile(scriptsPath):
+        bpath.move(file, distPath / f'{conf['domain']}_{now}_{file.stem}{file.suffix}')
+    bpath.remove(scriptsPath)
+
+
+@asynccontextmanager
+async def sshClient():
+    client = paramiko.SSHClient()
+    client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+    with bpath.useTempFile() as tempFile:
+        await bfile.writeText(tempFile, conf['server_key'])
+        client.connect(
+            **conf['server_info'],
+            key_filename=str(tempFile),
+        )
+        yield client
+        client.close()
+
+
+async def upload():
+    async with sshClient() as client:
+
+        def executeCmd(cmd: str):
+            _, stdout, _ = client.exec_command(f"bash -lc '{cmd}'")
+            print(stdout.read().decode())
+
+        sftp = client.open_sftp()
+        for file in bpath.listFile(distPath):
+            executeCmd(f'mkdir -p {conf['temp_path']}')
+            sftp.put(str(file), f'{conf['temp_path']}/{file.name}')
+        shFile = list(distPath.glob('*.sh'))[0]
+        executeCmd(f'sh {conf['temp_path']}/{shFile.name}')
+        executeCmd(f'rm -rf {conf['temp_path']}')
+        sftp.close()

bcmd/tasks/image.py

@@ -1,9 +1,6 @@
-from __future__ import annotations
-
 import asyncio
 import os
 import random
-import tkinter as tk
 from enum import StrEnum
 from pathlib import Path
 from typing import Final, List, Tuple
@@ -16,9 +13,6 @@ from beni.bfunc import syncCall
 from beni.btype import Null, XPath
 from PIL import Image, ImageDraw, ImageFont
 
-from bcmd.utils.tkUtil import TkForm, setWidgetEnabled
-from tkinter import messagebox
-
 app: Final = btask.newSubApp('图片工具集')
 
 
@@ -310,67 +304,66 @@ async def merge(
     bcolor.printGreen('OK')
 
 
-@app.command()
-@syncCall
-async def xone():
-    def showGui():
-        app = TkForm()
-        app.title('图片操作')
-        entry = app.addEntry('保存文件', tk.StringVar(value=r'C:\project\docs\source\docs\public\icon.webp'), width=60)
-        app.addEntry('输入密码', tk.StringVar(), password=True, width=60, command=lambda: messagebox.showerror('错误', '密码错误'))
-
-        scrolltextVar = tk.StringVar(value='xxiioo')
-        app.addScrolledText('测试信箱', scrolltextVar)
-
-
-        radioVarScale = app.addRadioBtnList(
-            '缩放操作',
-            [
-                '保持',
-                '缩放比',
-                '指定宽度',
-                '指定高度',
-            ],
-            selectedIndex=0,
-            onChanged=lambda x: onScaleValueChanged(x),
-        )
-
-        scaleValueEntry = app.addEntry('缩放参数', tk.StringVar(), width=10, justify=tk.CENTER)
-
-        app.addChoisePath('选择文件', tk.StringVar(), isDir=True, focus=True)
-
-        radioVarFormat = app.addRadioBtnList(
-            '格式转换',
-            [
-                '保持',
-                'PNG',
-                'JPEG',
-                'WEBP',
-            ],
-            selectedIndex=0,
-        )
-        app.addCheckBox('去除透明', '去除透明', False)
-        app.addCheckBox('TinyPng', 'TinyPng', True)
-        app.addCheckBoxList('其他选项', [
-            ('去除透明', False),
-            ('TinyPng', True),
-        ])
-
-        def onScaleValueChanged(value: str):
-            match value:
-                case '保持':
-                    setWidgetEnabled(scaleValueEntry, False)
-                case _:
-                    setWidgetEnabled(scaleValueEntry, True)
-
-        app.addBtn('确定', lambda: onBtn())
-
-        def onBtn():
-            nonlocal result
-            app.destroy()
-
-        result: str = ''
-        app.run()
-        return result
-
-    showGui()
+# @app.command()
+# @syncCall
+# async def xone():
+#     def showGui():
+#         app = TkForm()
+#         app.title('图片操作')
+#         entry = app.addEntry('保存文件', tk.StringVar(value=r'C:\project\docs\source\docs\public\icon.webp'), width=60)
+#         app.addEntry('输入密码', tk.StringVar(), password=True, width=60, command=lambda: messagebox.showerror('错误', '密码错误'))
+
+#         scrolltextVar = tk.StringVar(value='xxiioo')
+#         app.addScrolledText('测试信箱', scrolltextVar)
+
+#         radioVarScale = app.addRadioBtnList(
+#             '缩放操作',
+#             [
+#                 '保持',
+#                 '缩放比',
+#                 '指定宽度',
+#                 '指定高度',
+#             ],
+#             onChanged=lambda x: onScaleValueChanged(x),
+#             var=tk.StringVar(value='保持'),
+#         )
+
+#         scaleValueEntry = app.addEntry('缩放参数', tk.StringVar(), width=10, justify=tk.CENTER)
+
+#         app.addChoisePath('选择文件', tk.StringVar(), isDir=True)
+
+#         radioVarFormat = app.addRadioBtnList(
+#             '格式转换',
+#             [
+#                 '保持',
+#                 'PNG',
+#                 'JPEG',
+#                 'WEBP',
+#             ],
+#             var=tk.StringVar(value='保持'),
+#         )
+#         app.addCheckBox('去除透明', '去除透明', tk.BooleanVar(value=True))
+#         app.addCheckBox('TinyPng', 'TinyPng', tk.BooleanVar())
+#         app.addCheckBoxList('其他选项', [
+#             ('去除透明', tk.BooleanVar()),
+#             ('TinyPng', tk.BooleanVar(value=True)),
+#         ])
+
+#         def onScaleValueChanged(value: str):
+#             match value:
+#                 case '保持':
+#                     setWidgetEnabled(scaleValueEntry, False)
+#                 case _:
+#                     setWidgetEnabled(scaleValueEntry, True)
+
+#         app.addBtn('确定', lambda: onBtn())
+
+#         def onBtn():
+#             nonlocal result
+#             app.destroy()
+
+#         result: str = ''
+#         app.run()
+#         return result
+
+#     showGui()

bcmd/tasks/lib.py

@@ -1,13 +1,13 @@
 import os
+import tkinter as tk
 from pathlib import Path
 from typing import Final
 
 import typer
 from beni import bcolor, bfile, bpath, brun, btask
+from beni.bform import BForm
 from beni.bfunc import syncCall
 
-from bcmd.utils.tkUtil import TkForm
-
 from ..common import secret
 
 app: Final = btask.newSubApp('lib 工具')
@@ -23,7 +23,7 @@ async def update_version(
     file = path / 'pyproject.toml'
     btask.assertTrue(file.is_file(), '文件不存在', file)
     data = await bfile.readToml(file)
-    latestVersion = data['project']['version']
+    latestVersion: str = data['project']['version']
     vAry = [int(x) for x in latestVersion.split('.')]
     versionList = [
         f'{vAry[0] + 1}.0.0',
@@ -31,27 +31,24 @@ async def update_version(
         f'{vAry[0]}.{vAry[1]}.{vAry[2] + 1}',
     ]
 
-    def showGui():
-        app = TkForm()
-        app.title('bcmd 版本更新')
-        app.addLabel('当前版本号', latestVersion)
-        version_var = app.addRadioBtnList(
-            '请选择新版本',
-            versionList,
-            selectedIndex=-1,
-        )
-        result: str = ''
+    class UpdateVersionForm(BForm):
 
-        def onBtn():
-            nonlocal result
-            result = version_var.get()
-            app.destroy()
+        def __init__(self):
+            super().__init__()
+            self.versionVar = tk.StringVar(value=versionList[-1])
+            self.title('bcmd 版本更新')
+            self.addLabel('当前版本号', latestVersion)
+            self.addRadioBtnList(
+                '请选择新版本',
+                versionList,
+                var=self.versionVar,
+            )
+            self.addBtn('确定', self.destroy, focus=True)
 
-        app.addBtn('确定', onBtn, focus=True)
-        app.run()
-        return result
+        def getResult(self) -> str:
+            return self.versionVar.get()
 
-    newVersion = showGui()
+    newVersion: str = UpdateVersionForm().run()
     if not newVersion:
         btask.abort('用户取消操作')
     content = await bfile.readText(file)

bcmd/tasks/upgrade.py

@@ -11,11 +11,10 @@ app: Final = btask.app
 @app.command()
 @syncCall
 async def upgrade(
-    name: str = typer.Argument('bcmdx', help='要更新的包名'),
+    name: str = typer.Argument('bcmd', help='要更新的包名'),
 ):
-    '使用 pipx 官方源更新指定包到最新版本'
-
-    cmd = f'pipx upgrade {name} -i https://pypi.org/simple'
+    '使用 uv 官方源更新指定包到最新版本'
+    cmd = f'uv tool install -U --index https://pypi.org/simple {name}'
     pyperclip.copy(cmd + '\n')
     bcolor.printGreen(cmd)
     bcolor.printGreen('已复制到剪贴板（需要手动执行）')

bcmd/utils/utils.py

@@ -0,0 +1,9 @@
+from beni import bcrypto
+from beni.btype import XPath
+
+
+async def decryptFileIgnoreError(file: XPath, password: str):
+    try:
+        await bcrypto.decryptFile(file, password)
+    except:
+        pass

{bcmd-0.6.8.dist-info → bcmd-0.6.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bcmd
-Version: 0.6.8
+Version: 0.6.10
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
@@ -8,9 +8,10 @@ Keywords: benimang,beni,bcmd
 Requires-Python: >=3.10
 Requires-Dist: aioconsole==0.8.1
 Requires-Dist: async-lru==2.0.5
-Requires-Dist: benimang==0.8.1
+Requires-Dist: benimang==0.8.6
 Requires-Dist: cryptography==45.0.4
 Requires-Dist: nest-asyncio==1.6.0
+Requires-Dist: paramiko==3.5.1
 Requires-Dist: pillow==11.2.1
 Requires-Dist: prettytable==3.16.0
 Requires-Dist: psutil==7.0.0

{bcmd-0.6.8.dist-info → bcmd-0.6.10.dist-info}/RECORD

@@ -1,33 +1,34 @@
 bcmd/__init__.py,sha256=GP_60-6vImXqdMfC5vc4xlscWajx4OYmnlNXASWn19w,147
 bcmd/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/common/func.py,sha256=MB_ChA4aRzEjhMhyFmZ-h8aOZePzk0poYcTYRJUQxmI,509
+bcmd/common/func.py,sha256=MehbfuWFHTOsihhYxVFj0_U6-hjMTfLh3n-oMrpyyKo,508
 bcmd/common/secret.py,sha256=clemEVTCl3shhRBgjKZfrtTdyODz5U-wOyHfUXPegG4,1692
 bcmd/resources/project/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItLs,11
-bcmd/tasks/__init__.py,sha256=lcVrTgdEph3tKBwwCPVyEOHp-1A3zdFA_6OWLrOo19M,314
+bcmd/tasks/__init__.py,sha256=_G8hO9P0UEKJRreXv8114XeTR8uFG8gRSjvA1WMv8f8,333
 bcmd/tasks/bin.py,sha256=DufZGRX7b2zclSaZM-zUPGwOiycN9RsV8KxF8tfSyqs,3240
 bcmd/tasks/code.py,sha256=IUs_ClZuSsBk2gavlitC8mkRrQQX9rvNDgR8cFxduBA,3992
 bcmd/tasks/crypto.py,sha256=LKvgsMPLvsi1wlt66TinYiN-oV2IPAfaN9y7hWaVpHs,2951
 bcmd/tasks/debian.py,sha256=B9aMIIct3vNqMJr5hTr1GegXVf20H49C27FMvRRGIzI,3004
+bcmd/tasks/docs.py,sha256=pVs9iy9fjo4DrWX-YfrxjnxLOO4VAW7w5NUqIZHxnVQ,5927
 bcmd/tasks/download.py,sha256=XdZYKi8zQTNYWEgUxeTNDqPgP7IGYJkMmlDDC9u93Vk,2315
-bcmd/tasks/image.py,sha256=OQxrtTkPnJ_FZ6uenxdNlynhxwrAVy1P_68QAnSBYB0,14238
+bcmd/tasks/image.py,sha256=_ck-WVfUlyQ2fZTpVPcpcurWSud7AkANKUuFjMW7MwA,14283
 bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
-bcmd/tasks/lib.py,sha256=ODF21sTjQ687X5AXGOvJjjw6dGNSnflwSz4wDlIbYVM,2861
+bcmd/tasks/lib.py,sha256=CmIRUHzNSa6s0Ft2oYZcfEr-5YwvxrVCNM55qq9sBXg,2948
 bcmd/tasks/math.py,sha256=xbl5UdaDMyAjiLodDPleP4Cutrk2S3NOAgurzAgOEAE,2862
 bcmd/tasks/mirror.py,sha256=nAe8NYftMKzht16MFBj7RqXwvVhR6Jh2uuAyJLh87og,1098
 bcmd/tasks/pdf.py,sha256=fkHRgxqzrRxdb4_-9pL9wp2roqAHJPS_dVqAGJvRUsM,1504
 bcmd/tasks/proxy.py,sha256=KDOXtNRoY4n45tBrAgK-UM7GmvCCx3Ho545yxMc8PKQ,1602
 bcmd/tasks/time.py,sha256=ZiqA1jdgl-TBtFSOxxP51nwv4g9iZItmkFKpf9MKelk,2453
-bcmd/tasks/upgrade.py,sha256=z9Ein8U_Co7fsijPxyDFM8tXBFCp4bWATImwwwvC5ho,536
+bcmd/tasks/upgrade.py,sha256=nyhcl5oGAUnOOR8JJZW2jfepcVJ6O9gufK8VgxUeil0,543
 bcmd/tasks/wasabi.py,sha256=xWFAxprSIlBqDDMGaNXZFb-SahnW1d_R9XxSKRYIhnM,3110
 bcmd/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/utils/tkUtil.py,sha256=zhOFQB0SN-ZPSXgJ0-pyHeVldf_u8VNnODz7pQRbLkw,7709
+bcmd/utils/utils.py,sha256=Oyf5ubxaCD_T2GOz3zJkR4AJzfVcfBqtmL8Gk8_gOJs,202
 test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 test/conftest.py,sha256=grlPunlsvrkt_8QPckmF4POiKUPVxIxm2TPAh_ZB-zs,405
 test/test_pdf.py,sha256=7yYlfydyhy2dmVYdTA5Vir2AI8TUdzEi55fL-AqJmio,1533
 test/test_proxy.py,sha256=UMF2hFFGUEbJR1jT2mO_wdo-7Rfp0NDqIdTRnOmwtjY,164
 test/test_wasabi.py,sha256=qqXG1Kb9hKH6t624R173j6LagkgmejN0CFYt7kL0nNs,1066
-bcmd-0.6.8.dist-info/METADATA,sha256=cN10mQH_WWDQ2McdparDnOZkc6KS5a0JOULMxkd8sXs,812
-bcmd-0.6.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bcmd-0.6.8.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
-bcmd-0.6.8.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
-bcmd-0.6.8.dist-info/RECORD,,
+bcmd-0.6.10.dist-info/METADATA,sha256=x2T8YTvQ8vQxS0aiegxZNmPoMgqp76gyfeBpRYd79l4,845
+bcmd-0.6.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bcmd-0.6.10.dist-info/entry_points.txt,sha256=mriCeYh3wksKcqq3-LtzyFkSCIdN1uZc1IJwom-SW1s,34
+bcmd-0.6.10.dist-info/top_level.txt,sha256=fYY6tRrJ_G7tn24RXAG0M5ZKbcuaQznodfX1toFPSKs,10
+bcmd-0.6.10.dist-info/RECORD,,

bcmd/utils/tkUtil.py

@@ -1,243 +0,0 @@
-import tkinter as tk
-from tkinter import filedialog
-from tkinter.scrolledtext import ScrolledText
-from typing import Any, Callable, Literal, TypeVar, Union
-from uuid import uuid4
-
-RADIO_NOTHING = uuid4().hex
-TkVar = TypeVar('TkVar', bound=Union[tk.StringVar, tk.IntVar, tk.DoubleVar, tk.BooleanVar])
-
-
-class TkForm(tk.Tk):
-
-    _rowIndex = -1
-    _initList: list[Callable[..., None]] = []
-    _varList: list[tk.Variable] = []  # 用来存储 var 变量，避免传出去，外面没有接收导致界面异常
-
-    def __init__(self):
-        super().__init__()
-        self.resizable(False, False)
-        self.bind("<Map>", self._onInit)
-
-    def _onInit(self, evt: tk.Event):
-        if evt.widget == self:
-            for callback in self._initList:
-                callback()
-            self._initList.clear()
-
-    def addInitHandler(self, handler: Callable[..., None]):
-        self._initList.append(handler)
-
-    def _initVar(self, var: TkVar) -> TkVar:
-        self._varList.append(var)
-        return var
-
-    def run(self):
-        self.center()
-        self.mainloop()
-
-    def center(self):
-        self.withdraw()  # 先隐藏窗口，避免闪动
-        self.update_idletasks()  # 确保获取正确的窗口尺寸
-        width = self.winfo_width()  # 获取窗口宽度
-        height = self.winfo_height()  # 获取窗口高度
-        screen_width = self.winfo_screenwidth()  # 屏幕宽度
-        screen_height = self.winfo_screenheight()  # 屏幕高度
-        x = (screen_width - width) // 2  # 水平居中
-        y = (screen_height - height) // 2  # 垂直居中
-        self.geometry(f"+{x}+{y}")  # 设置窗口位置
-        self.deiconify()  # 恢复显示窗口
-
-    def addRow(self, desc: str, widget: tk.Widget):
-        self._rowIndex += 1
-        tk.Label(text=desc).grid(row=self._rowIndex, column=0, padx=10, pady=5, sticky='e')
-        widget.grid(row=self._rowIndex, column=1, padx=10, pady=5, sticky='w')
-
-    def addRowFrame(self):
-        self._rowIndex += 1
-        frame = tk.Frame(self)
-        frame.grid(row=self._rowIndex, column=0, columnspan=2, padx=10, pady=5)
-        return frame
-
-    def addRowFrameWithDesc(self, desc: str):
-        self._rowIndex += 1
-        tk.Label(text=desc).grid(row=self._rowIndex, column=0, padx=10, pady=5, sticky='e')
-        frame = tk.Frame(self)
-        frame.grid(row=self._rowIndex, column=1, padx=10, pady=5, sticky='w')
-        return frame
-
-    def addLabel(
-        self,
-        desc: str,
-        text: str
-    ):
-        self.addRow(desc, tk.Label(text=text))
-
-    def addBtn(
-        self,
-        label: str,
-        command: Callable[..., None],
-        *,
-        width: int = 20,
-        focus: bool = False
-    ):
-        frame = self.addRowFrame()
-        btn = tk.Button(frame, text=label, width=width, command=command)
-        btn.pack(side="left", expand=True, padx=15)
-        if focus:
-            self._initFocus(btn)
-
-    def addRadioBtnList(
-        self,
-        desc: str,
-        selectionList: list[str],
-        *,
-        selectedIndex: int | None = None,
-        focusIndex: int | None = None,
-        onChanged: Callable[[str], None] | None = None,
-    ):
-        frame = tk.Frame()
-        self.addRow(desc, frame)
-        var = tk.StringVar(value=selectionList[selectedIndex] if selectedIndex is not None else RADIO_NOTHING)
-        radioBtnList: list[tk.Radiobutton] = []
-        for version in selectionList:
-            radioBtn = tk.Radiobutton(frame, text=version, variable=var, value=version)
-            radioBtn.pack(side="left", padx=(0, 15))
-            setWidgetClickFocus(radioBtn)
-            radioBtnList.append(radioBtn)
-        if focusIndex is not None:
-            self._initFocus(radioBtnList[focusIndex])
-        if onChanged:
-            var.trace_add('write', lambda *args: onChanged(var.get()))  # type: ignore
-            self.addInitHandler(
-                lambda: onChanged(var.get())
-            )
-        return var
-
-    def addEntry(
-        self,
-        desc: str,
-        var: tk.StringVar,
-        *,
-        width: int = 60,
-        focus: bool = False,
-        justify: Literal['left', 'right', 'center'] = tk.LEFT,
-        password: bool = False,
-        command: Callable[..., Any] | None = None,
-    ):
-        self._initVar(var)
-        entry = tk.Entry(self, width=width, justify=justify, textvariable=var)
-        entry.icursor(tk.END)
-        self.addRow(desc, entry)
-        if password:
-            entry.config(show='*')
-        if focus:
-            self._initFocus(entry)
-        if command:
-            entry.bind('<Return>', lambda event: command())
-        return entry
-
-    def addChoisePath(
-        self,
-        desc: str,
-        var: tk.StringVar,
-        *,
-        width: int = 47,
-        focus: bool = False,
-        isDir: bool = False,
-    ):
-        self._initVar(var)
-        frame = self.addRowFrameWithDesc(desc)
-        entry = tk.Entry(frame, width=width, textvariable=var)
-        entry.icursor(tk.END)
-        entry.pack(side="left")
-        btn = tk.Button(frame, text=f'选择{'目录' if isDir else '文件'} ...', width=10, command=lambda: onBtn())
-        btn.pack(side="left", padx=(10, 0))
-        if focus:
-            self._initFocus(btn)
-
-        def onBtn():
-            if isDir:
-                var.set(filedialog.askdirectory())
-            else:
-                var.set(filedialog.askopenfilename())
-
-    def addScrolledText(
-        self,
-        desc: str,
-        var: tk.StringVar,
-        *,
-        width: int = 60,
-        height: int = 3,
-        focus: bool = False,
-    ):
-        self._initVar(var)
-        scrolledText = ScrolledText(self, width=width, height=height)
-        scrolledText.insert(tk.END, var.get())
-        self.addRow(desc, scrolledText)
-
-        def on_text_change(*args: Any):
-            new_value = scrolledText.get("1.0", tk.END)
-            if new_value != var.get():
-                var.set(new_value)
-
-        scrolledText.bind("<KeyRelease>", on_text_change)
-
-        def on_tab(event: tk.Event):
-            widget = event.widget.tk_focusNext()
-            assert widget
-            widget.focus_set()
-            return "break"
-
-        scrolledText.bind("<Tab>", on_tab)
-
-        if focus:
-            self._initFocus(scrolledText)
-        return scrolledText
-
-    def addCheckBox(
-        self,
-        desc: str,
-        text: str,
-        value: bool = False,
-    ):
-        var = tk.BooleanVar(value=value)
-        self._initVar(var)
-        check_btn = tk.Checkbutton(text=text, variable=var)
-        self.addRow(desc, check_btn)
-        self.addInitHandler(
-            lambda: var.set(var.get())
-        )
-        setWidgetClickFocus(check_btn)
-        return var
-
-    def addCheckBoxList(
-        self,
-        desc: str,
-        dataList: list[tuple[str, bool]],
-    ):
-        varDict: dict[str, tk.BooleanVar] = {}
-        frame = tk.Frame(self)
-        self.addRow(desc, frame)
-        for label, value in dataList:
-            varDict[label] = tk.BooleanVar(value=value)
-            checkbox = tk.Checkbutton(frame, text=label, variable=varDict[label])
-            checkbox.pack(side="left", expand=True, padx=(0, 15))
-            setWidgetClickFocus(checkbox)
-            self.addInitHandler(
-                lambda: varDict[label].set(varDict[label].get())
-            )
-        return varDict
-
-    def _initFocus(self, widget: tk.Widget):
-        self.addInitHandler(
-            lambda: widget.focus_set()
-        )
-
-
-def setWidgetEnabled(widget: tk.Widget, value: bool):
-    widget['state'] = tk.NORMAL if value else tk.DISABLED
-
-
-def setWidgetClickFocus(widget: tk.Widget):
-    widget.bind("<Button-1>", lambda args: args.widget.focus_set())