bcmd 0.5.3__py3-none-any.whl → 0.5.4__py3-none-any.whl

bcmd/tasks/code.py

@@ -1,96 +1,96 @@
-from pathlib import Path
-from typing import Final
-
-import typer
-from beni import bfile, bpath, btask
-from beni.bcolor import printGreen, printMagenta, printYellow
-from beni.bfunc import syncCall
-
-app: Final = btask.newSubApp('code 工具')
-
-
-@app.command()
-@syncCall
-async def tidy_tasks(
-    tasks_path: Path = typer.Argument(Path.cwd(), help="tasks 路径"),
-):
-    '整理 task 项目中的 tasks/__init__.py'
-
-    initFile = tasks_path / '__init__.py'
-    btask.assertTrue(initFile.is_file(), '文件不存在', initFile)
-    files = bpath.listFile(tasks_path)
-    files = [x for x in files if not x.name.startswith('_')]
-    contents = [f'from . import {x.stem}' for x in files]
-    contents.insert(0, '# type: ignore')
-    contents.append('')
-    content = '\n'.join(contents)
-    oldContent = await bfile.readText(initFile)
-    if oldContent != content:
-        await bfile.writeText(
-            initFile,
-            content,
-        )
-        printYellow(initFile)
-        printMagenta(content)
-    printGreen('OK')
-
-
-@app.command()
-@syncCall
-async def tidy_modules(
-    modules_path: Path = typer.Argument(Path.cwd(), help="modules_path 路径"),
-):
-    '整理 fastapi 项目中的 modules/__init__.py'
-
-    importContents: list[str] = []
-    managerContents: list[str] = []
-
-    xxdict: dict[str, set[Path]] = {}
-    for file in sorted(modules_path.glob('**/*Manager.py')):
-        if file.parent == modules_path:
-            subName = '.'
-        elif file.parent.parent == modules_path:
-            subName = f'.{file.parent.stem}'
-        else:
-            continue
-        xxdict.setdefault(subName, set()).add(file)
-    for subName in sorted(xxdict.keys()):
-        files = sorted(xxdict[subName])
-        importContents.append(f'from {subName} import {", ".join([x.stem for x in files])}')
-    managerContents.extend([f'    {x.stem},' for x in sorted([y for x in xxdict.values() for y in x])])
-
-    managerContents = [x for x in managerContents if x]
-    contents = [
-        '\n'.join(importContents),
-        'managers = [\n' + '\n'.join(managerContents) + '\n]',
-    ]
-    content = '\n\n'.join(contents) + '\n'
-    file = modules_path / '__init__.py'
-    printYellow(str(file))
-    printMagenta(content)
-    await bfile.writeText(file, content)
-    printGreen('OK')
-
-
-@app.command()
-@syncCall
-async def gen_init_py(
-    workspace_path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
-):
-    '递归生成 __init__.py 文件'
-
-    async def makeInitFiles(p: Path):
-        if p.name == '__pycache__':
-            return
-        if p.name.startswith('.'):
-            return
-        if workspace_path != p:
-            initFile = p / '__init__.py'
-            if not initFile.exists():
-                printYellow(initFile)
-                await bfile.writeText(initFile, '')
-        for x in bpath.listDir(p):
-            await makeInitFiles(x)
-
-    await makeInitFiles(workspace_path)
-    printGreen('OK')
+from pathlib import Path
+from typing import Final
+
+import typer
+from beni import bfile, bpath, btask
+from beni.bcolor import printGreen, printMagenta, printYellow
+from beni.bfunc import syncCall
+
+app: Final = btask.newSubApp('code 工具')
+
+
+@app.command()
+@syncCall
+async def tidy_tasks(
+    tasks_path: Path = typer.Argument(Path.cwd(), help="tasks 路径"),
+):
+    '整理 task 项目中的 tasks/__init__.py'
+
+    initFile = tasks_path / '__init__.py'
+    btask.assertTrue(initFile.is_file(), '文件不存在', initFile)
+    files = bpath.listFile(tasks_path)
+    files = [x for x in files if not x.name.startswith('_')]
+    contents = [f'from . import {x.stem}' for x in files]
+    contents.insert(0, '# type: ignore')
+    contents.append('')
+    content = '\n'.join(contents)
+    oldContent = await bfile.readText(initFile)
+    if oldContent != content:
+        await bfile.writeText(
+            initFile,
+            content,
+        )
+        printYellow(initFile)
+        printMagenta(content)
+    printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def tidy_modules(
+    modules_path: Path = typer.Argument(Path.cwd(), help="modules_path 路径"),
+):
+    '整理 fastapi 项目中的 modules/__init__.py'
+
+    importContents: list[str] = []
+    managerContents: list[str] = []
+
+    xxdict: dict[str, set[Path]] = {}
+    for file in sorted(modules_path.glob('**/*Manager.py')):
+        if file.parent == modules_path:
+            subName = '.'
+        elif file.parent.parent == modules_path:
+            subName = f'.{file.parent.stem}'
+        else:
+            continue
+        xxdict.setdefault(subName, set()).add(file)
+    for subName in sorted(xxdict.keys()):
+        files = sorted(xxdict[subName])
+        importContents.append(f'from {subName} import {", ".join([x.stem for x in files])}')
+    managerContents.extend([f'    {x.stem},' for x in sorted([y for x in xxdict.values() for y in x])])
+
+    managerContents = [x for x in managerContents if x]
+    contents = [
+        '\n'.join(importContents),
+        'managers = [\n' + '\n'.join(managerContents) + '\n]',
+    ]
+    content = '\n\n'.join(contents) + '\n'
+    file = modules_path / '__init__.py'
+    printYellow(str(file))
+    printMagenta(content)
+    await bfile.writeText(file, content)
+    printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def gen_init_py(
+    workspace_path: Path = typer.Argument(Path.cwd(), help='workspace 路径'),
+):
+    '递归生成 __init__.py 文件'
+
+    async def makeInitFiles(p: Path):
+        if p.name == '__pycache__':
+            return
+        if p.name.startswith('.'):
+            return
+        if workspace_path != p:
+            initFile = p / '__init__.py'
+            if not initFile.exists():
+                printYellow(initFile)
+                await bfile.writeText(initFile, '')
+        for x in bpath.listDir(p):
+            await makeInitFiles(x)
+
+    await makeInitFiles(workspace_path)
+    printGreen('OK')

bcmd/tasks/crypto.py

@@ -1,116 +1,116 @@
-import getpass
-import json
-from pathlib import Path
-from typing import Final
-
-import pyperclip
-import typer
-from beni import bcolor, bcrypto, btask
-from beni.bfunc import syncCall
-from rich.console import Console
-
-app: Final = btask.newSubApp('加密（v2）')
-
-
-@app.command()
-@syncCall
-async def encrypt_text():
-    '加密文本（使用剪贴板内容）'
-    content = pyperclip.paste()
-    assert content, '剪贴板内容不能为空'
-    bcolor.printGreen(content)
-    password = _genPassword()
-    result = bcrypto.encryptText(content, password)
-    pyperclip.copy(result)
-    print('密文已复制到剪贴板')
-    bcolor.printYellow(result)
-
-
-@app.command()
-@syncCall
-async def decrypt_text():
-    '解密文本（使用剪贴板内容）'
-    content = pyperclip.paste().strip()
-    bcolor.printYellow(content)
-    while True:
-        try:
-            password = getpass.getpass('输入密码：')
-            result = bcrypto.decryptText(content, password)
-            print('解密成功')
-            bcolor.printGreen(result)
-            return
-        except KeyboardInterrupt:
-            break
-        except BaseException:
-            pass
-
-
-@app.command()
-@syncCall
-async def encrypt_json():
-    '生成JSON密文（使用剪贴板内容）'
-    content = pyperclip.paste()
-    try:
-        data = json.loads(content)
-    except:
-        return btask.abort('错误：剪贴板内容必须是JSON格式', content)
-    Console().print_json(data=data, indent=4, ensure_ascii=False, sort_keys=True)
-    password = _genPassword()
-    result = bcrypto.encryptJson(data, password)
-    pyperclip.copy(result)
-    print('密文已复制到剪贴板')
-    bcolor.printYellow(result)
-
-
-@app.command()
-@syncCall
-async def decrypt_json():
-    '还原JSON密文内容（使用剪贴板内容）'
-    content = pyperclip.paste().strip()
-    bcolor.printYellow(content)
-    while True:
-        try:
-            password = getpass.getpass('输入密码：')
-            data = bcrypto.decryptJson(content, password)
-            Console().print_json(data=data, indent=4, ensure_ascii=False, sort_keys=True)
-            return
-        except KeyboardInterrupt:
-            break
-        except BaseException:
-            pass
-
-
-@app.command()
-@syncCall
-async def encrypt_file(
-    file: Path = typer.Argument(..., help='指定需要加密的文件')
-):
-    '加密文件（文件路径使用剪贴板内容）'
-    assert file.is_file(), '文件不存在'
-    password = _genPassword()
-    await bcrypto.encryptFile(file, password)
-    bcolor.printGreen('OK')
-
-
-@app.command()
-@syncCall
-async def decrypt_file(
-    file: Path = typer.Argument(..., help='指定需要解密的文件')
-):
-    '解密文件（文件路径使用剪贴板内容）'
-    assert file.is_file(), '文件不存在'
-    password = getpass.getpass('输入密码：')
-    await bcrypto.decryptFile(file, password)
-    bcolor.printGreen('OK')
-
-
-# ------------------------------------------------------------------------------------
-
-
-def _genPassword():
-    password = ''
-    while not password:
-        password = getpass.getpass('输入密码：')
-    while password != getpass.getpass('再次密码：'):
-        pass
-    return password
+import getpass
+import json
+from pathlib import Path
+from typing import Final
+
+import pyperclip
+import typer
+from beni import bcolor, bcrypto, btask
+from beni.bfunc import syncCall
+from rich.console import Console
+
+app: Final = btask.newSubApp('加密（v2）')
+
+
+@app.command()
+@syncCall
+async def encrypt_text():
+    '加密文本（使用剪贴板内容）'
+    content = pyperclip.paste()
+    assert content, '剪贴板内容不能为空'
+    bcolor.printGreen(content)
+    password = _genPassword()
+    result = bcrypto.encryptText(content, password)
+    pyperclip.copy(result)
+    print('密文已复制到剪贴板')
+    bcolor.printYellow(result)
+
+
+@app.command()
+@syncCall
+async def decrypt_text():
+    '解密文本（使用剪贴板内容）'
+    content = pyperclip.paste().strip()
+    bcolor.printYellow(content)
+    while True:
+        try:
+            password = getpass.getpass('输入密码：')
+            result = bcrypto.decryptText(content, password)
+            print('解密成功')
+            bcolor.printGreen(result)
+            return
+        except KeyboardInterrupt:
+            break
+        except BaseException:
+            pass
+
+
+@app.command()
+@syncCall
+async def encrypt_json():
+    '生成JSON密文（使用剪贴板内容）'
+    content = pyperclip.paste()
+    try:
+        data = json.loads(content)
+    except:
+        return btask.abort('错误：剪贴板内容必须是JSON格式', content)
+    Console().print_json(data=data, indent=4, ensure_ascii=False, sort_keys=True)
+    password = _genPassword()
+    result = bcrypto.encryptJson(data, password)
+    pyperclip.copy(result)
+    print('密文已复制到剪贴板')
+    bcolor.printYellow(result)
+
+
+@app.command()
+@syncCall
+async def decrypt_json():
+    '还原JSON密文内容（使用剪贴板内容）'
+    content = pyperclip.paste().strip()
+    bcolor.printYellow(content)
+    while True:
+        try:
+            password = getpass.getpass('输入密码：')
+            data = bcrypto.decryptJson(content, password)
+            Console().print_json(data=data, indent=4, ensure_ascii=False, sort_keys=True)
+            return
+        except KeyboardInterrupt:
+            break
+        except BaseException:
+            pass
+
+
+@app.command()
+@syncCall
+async def encrypt_file(
+    file: Path = typer.Argument(..., help='指定需要加密的文件')
+):
+    '加密文件（文件路径使用剪贴板内容）'
+    assert file.is_file(), '文件不存在'
+    password = _genPassword()
+    await bcrypto.encryptFile(file, password)
+    bcolor.printGreen('OK')
+
+
+@app.command()
+@syncCall
+async def decrypt_file(
+    file: Path = typer.Argument(..., help='指定需要解密的文件')
+):
+    '解密文件（文件路径使用剪贴板内容）'
+    assert file.is_file(), '文件不存在'
+    password = getpass.getpass('输入密码：')
+    await bcrypto.decryptFile(file, password)
+    bcolor.printGreen('OK')
+
+
+# ------------------------------------------------------------------------------------
+
+
+def _genPassword():
+    password = ''
+    while not password:
+        password = getpass.getpass('输入密码：')
+    while password != getpass.getpass('再次密码：'):
+        pass
+    return password

bcmd/tasks/debian.py

@@ -1,78 +1,78 @@
-import os
-from typing import Final
-
-from beni import bcolor, bfile, bpath, btask, binput
-from beni.bfunc import syncCall
-
-app: Final = btask.newSubApp('Debian 系统管理')
-
-
-@app.command()
-@syncCall
-async def install_python():
-    '安装python脚本'
-    pythonZipFile = ''
-    pythonName = ''
-    pythonVersion = ''
-    bcolor.printYellow(f'官网地址：https://www.python.org/downloads/source/')
-    bcolor.printYellow(f'先从官网上下载 python 源码压缩包（.tar.xz）')
-    while True:
-        pythonZipFile = input('输入python压缩文件名（如：Python-3.12.1.tar.xz）：').strip()
-        if pythonZipFile.endswith('.tar.xz'):
-            pythonName = pythonZipFile.replace('.tar.xz', '')
-            pythonVersion = '.'.join(pythonName.split('-')[-1].split('.')[:-1])
-            break
-        else:
-            print('输入有误，请重新输入')
-    cmdList: list[str] = [
-        f'apt update',
-        f'apt install build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev libbz2-dev -y',
-        f'tar -xf {pythonZipFile}',
-        f'cd {pythonName}',
-        f'./configure --enable-optimizations',  # 配置编译选项
-        f'make -j `nproc`',                     # 编译源代码，`nproc` 会利用所有可用的 CPU 核心加快编译速度
-        f'make altinstall',                     # 安装 Python，altinstall 避免替换默认的 python 命令
-        f'cd ..',
-        f'rm -rf {pythonName}',
-        f'rm -rf /usr/local/bin/python',
-        f'ln -s /usr/local/bin/python{pythonVersion} /usr/local/bin/python',
-        f'rm -rf /usr/local/bin/pip',
-        f'ln -s /usr/local/bin/pip{pythonVersion} /usr/local/bin/pip',
-        f'python --version',
-        f'pip --version',
-        f'pip install pipx',
-        f'pipx install bcmd',
-    ]
-    shFile = bpath.desktop(f'install-python-{pythonName}.sh')
-    await bfile.writeText(shFile, '\n'.join(cmdList))
-    bcolor.printGreen(f'将以下两个文件拷贝到服务器上，然后执行 sh {shFile.name} 即可安装 python')
-    print(pythonZipFile)
-    print(shFile)
-
-
-@app.command()
-@syncCall
-async def install_software():
-    '安装常用软件'
-    await binput.confirm('即将安装这些软件（7z nginx mariadb），是否确认？')
-    cmdList: list[str] = [
-        f'echo 更新软件包列表',
-        f'apt update',
-        f'echo 安装 7z',
-        f'apt install p7zip-full -y',
-        f'echo 安装 nginx',
-        f'apt install nginx -y',
-        f'systemctl start nginx',
-        f'systemctl enable nginx',
-        f'systemctl status nginx',
-        f'echo 安装 MariaDB',
-        f'apt install mariadb-server -y',
-        f'systemctl start mariadb',
-        f'systemctl enable mariadb',
-        f"sed -i 's/bind-address/# bind-address/' /etc/mysql/mariadb.conf.d/50-server.cnf"
-        f'systemctl restart mariadb',
-        f'systemctl status mariadb',
-
-    ]
-    for cmd in cmdList:
-        os.system(cmd)
+import os
+from typing import Final
+
+from beni import bcolor, bfile, bpath, btask, binput
+from beni.bfunc import syncCall
+
+app: Final = btask.newSubApp('Debian 系统管理')
+
+
+@app.command()
+@syncCall
+async def install_python():
+    '安装python脚本'
+    pythonZipFile = ''
+    pythonName = ''
+    pythonVersion = ''
+    bcolor.printYellow(f'官网地址：https://www.python.org/downloads/source/')
+    bcolor.printYellow(f'先从官网上下载 python 源码压缩包（.tar.xz）')
+    while True:
+        pythonZipFile = input('输入python压缩文件名（如：Python-3.12.1.tar.xz）：').strip()
+        if pythonZipFile.endswith('.tar.xz'):
+            pythonName = pythonZipFile.replace('.tar.xz', '')
+            pythonVersion = '.'.join(pythonName.split('-')[-1].split('.')[:-1])
+            break
+        else:
+            print('输入有误，请重新输入')
+    cmdList: list[str] = [
+        f'apt update',
+        f'apt install build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libsqlite3-dev libreadline-dev libffi-dev libbz2-dev -y',
+        f'tar -xf {pythonZipFile}',
+        f'cd {pythonName}',
+        f'./configure --enable-optimizations',  # 配置编译选项
+        f'make -j `nproc`',                     # 编译源代码，`nproc` 会利用所有可用的 CPU 核心加快编译速度
+        f'make altinstall',                     # 安装 Python，altinstall 避免替换默认的 python 命令
+        f'cd ..',
+        f'rm -rf {pythonName}',
+        f'rm -rf /usr/local/bin/python',
+        f'ln -s /usr/local/bin/python{pythonVersion} /usr/local/bin/python',
+        f'rm -rf /usr/local/bin/pip',
+        f'ln -s /usr/local/bin/pip{pythonVersion} /usr/local/bin/pip',
+        f'python --version',
+        f'pip --version',
+        f'pip install pipx',
+        f'pipx install bcmd',
+    ]
+    shFile = bpath.desktop(f'install-python-{pythonName}.sh')
+    await bfile.writeText(shFile, '\n'.join(cmdList))
+    bcolor.printGreen(f'将以下两个文件拷贝到服务器上，然后执行 sh {shFile.name} 即可安装 python')
+    print(pythonZipFile)
+    print(shFile)
+
+
+@app.command()
+@syncCall
+async def install_software():
+    '安装常用软件'
+    await binput.confirm('即将安装这些软件（7z nginx mariadb），是否确认？')
+    cmdList: list[str] = [
+        f'echo 更新软件包列表',
+        f'apt update',
+        f'echo 安装 7z',
+        f'apt install p7zip-full -y',
+        f'echo 安装 nginx',
+        f'apt install nginx -y',
+        f'systemctl start nginx',
+        f'systemctl enable nginx',
+        f'systemctl status nginx',
+        f'echo 安装 MariaDB',
+        f'apt install mariadb-server -y',
+        f'systemctl start mariadb',
+        f'systemctl enable mariadb',
+        f"sed -i 's/bind-address/# bind-address/' /etc/mysql/mariadb.conf.d/50-server.cnf"
+        f'systemctl restart mariadb',
+        f'systemctl status mariadb',
+
+    ]
+    for cmd in cmdList:
+        os.system(cmd)