bcmd 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

bcmd/tasks/__init__.py

@@ -12,4 +12,5 @@ from . import mirror
 from . import project
 from . import proxy
 from . import time
+from . import upgrade
 from . import venv

bcmd/tasks/code.py

@@ -1,4 +1,5 @@
 import asyncio
+import os
 from pathlib import Path
 from typing import Final
 
@@ -112,14 +113,18 @@ async def to_lf(
         '.pytest_cache',
         '__pycache__',
     ]
+    path = path or Path(os.getcwd())
     files = bpath.listFile(path, True)
     # 剔除子目录是这些的文件 .git venv ...
     files = [x for x in files if not any([y in x.parts for y in ignoreSubDirs])]
 
     async def convertFile(file: Path):
         try:
-            await bfile.toLf(file)
-            print(file)
+            content = await bfile.readText(file)
+            if '\r\n' in content:
+                content = content.replace('\r\n', '\n')
+                await bfile.writeText(file, content)
+                printYellow(file)
         except:
             pass
 

bcmd/tasks/lib.py

@@ -32,7 +32,7 @@ async def tidy_dependencies(
     ignoreLibAry = sorted(list(set(ignoreLibAry) & set(libAry)))
     libAry = sorted(list(set(libAry) - set(ignoreLibAry)))
     replaceContent = '\n'.join([f"  '{x}'," for x in libAry]) + '\n' + '\n'.join([f"  # '{x}'," for x in ignoreLibAry])
-    newContent = re.sub(r'dependencies = \[(.*?)\]', f"dependencies = [\n{replaceContent}\n]", oldContent, 0, re.DOTALL)
+    newContent = re.sub(r'dependencies = \[(.*?)\n\]', f"dependencies = [\n{replaceContent}\n]", oldContent, 0, re.DOTALL)
     if oldContent != newContent:
         await bfile.writeText(pyprojectTomlFile, newContent)
         bcolor.printYellow(pyprojectTomlFile)
@@ -93,7 +93,7 @@ async def build(
 
 def _getIgnoreLibAry(content: str) -> list[str]:
     '获取pyproject.toml中屏蔽的第三方库'
-    content = re.findall(r'dependencies = \[(.*?)\]', content, re.DOTALL)[0]
+    content = re.findall(r'dependencies = \[(.*?)\n\]', content, re.DOTALL)[0]
     ary = textToAry(content)
     return sorted([x[1:].replace('"', '').replace("'", '').replace(',', '').strip() for x in filter(lambda x: x.startswith('#'), ary)])
 

bcmd/tasks/proxy.py

@@ -30,7 +30,7 @@ async def proxy(
     elif set(['powershell.exe', 'pwsh.exe']) & set(processNameAry):
         template = powerShellTemplate
 
-    btask.assertTrue(template, '不支持当前终端（{processNameAry}）')
+    btask.assertTrue(template, f'不支持当前终端（{processNameAry}）')
     lineAry = textToAry(template.format(port))
     msg = '\n'.join(lineAry)
     bcolor.printMagenta('\r\n' + msg)

bcmd/tasks/upgrade.py

@@ -0,0 +1,18 @@
+from typing import Final
+
+import pyperclip
+from beni import bcolor, btask
+from beni.bfunc import syncCall
+
+app: Final = btask.app
+
+
+@app.command()
+@syncCall
+async def upgrade():
+    '使用 pipx 官方源更新 bcmd 到最新版本'
+    cmd = 'pipx upgrade bcmd -i https://pypi.org/simple'
+    pyperclip.copy(cmd + '\n')
+    bcolor.printGreen(cmd)
+    bcolor.printGreen('已复制到剪贴板（需要手动执行）')
+    bcolor.printGreen('OK')

bcmd/tasks/venv.py

@@ -37,6 +37,7 @@ async def install_benimang(
     path: Path = typer.Option(None, '--path', help='指定路径，默认当前目录'),
 ):
     '更新 benimang 库，强制使用官方源'
+    path = path or Path(os.getcwd())
     pip = getPipFile(path)
     await brun.run(f'{pip} install benimang -U -i https://pypi.org/simple', isPrint=True)
     await _venv(

{bcmd-0.5.5.dist-info → bcmd-0.5.7.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: bcmd
-Version: 0.5.5
+Version: 0.5.7
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>
 Keywords: benimang,beni,bcmd
 Requires-Python: >=3.10
-Requires-Dist: benimang==0.7.5
+Requires-Dist: benimang==0.7.12
 Requires-Dist: build
 Requires-Dist: cryptography
 Requires-Dist: pathspec

{bcmd-0.5.5.dist-info → bcmd-0.5.7.dist-info}/RECORD

@@ -8,23 +8,24 @@ bcmd/resources/project/main.py,sha256=xdskz_sf05fYA1SRMFCIxDjx8SnegxTbCmHpW86ItL
 bcmd/resources/project/.vscode/launch.json,sha256=Wpghb9lW9Y1wtrjqlTbyjeejDuU8BQJmBjwsLyPRh1g,478
 bcmd/resources/project/.vscode/settings.json,sha256=G4rCroWxEHcQfsqIJ6CXRHI6VGr3WYQI3KPPjH_JANs,280
 bcmd/resources/project/.vscode/tasks.json,sha256=gouhpkrqiPz7v65Jw1Rz-BCYU3sSdmphzXIYCzVnoe0,1783
-bcmd/tasks/__init__.py,sha256=XDE4eW0mPkUCSK9tyg1DQRGLA7A9DuTmjq5MyUiPoXs,294
+bcmd/tasks/__init__.py,sha256=siqJwKgsjiIQzarBsQaucjm6VEvDr1pJDuEd7UnDXSQ,316
 bcmd/tasks/bin.py,sha256=B_e-HYOc2Cohk-1PbKHyKn3RhI8TAUfI2EBRoFEHiTM,2961
-bcmd/tasks/code.py,sha256=MaEnCMXiGkubslR7hLYX_8vIioN2CiEht4Nx6PtkVYY,3778
+bcmd/tasks/code.py,sha256=IUs_ClZuSsBk2gavlitC8mkRrQQX9rvNDgR8cFxduBA,3992
 bcmd/tasks/crypto.py,sha256=C2welnYfdI4Tc-W1cwkboGb6bk6NGWO0MRKm4Bzo_9Q,3216
 bcmd/tasks/debian.py,sha256=B9aMIIct3vNqMJr5hTr1GegXVf20H49C27FMvRRGIzI,3004
 bcmd/tasks/download.py,sha256=XdZYKi8zQTNYWEgUxeTNDqPgP7IGYJkMmlDDC9u93Vk,2315
 bcmd/tasks/image.py,sha256=Po8jpEf4e1X68oJc2MYT446o-45RgIrl1TsODvUetBo,7782
 bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
-bcmd/tasks/lib.py,sha256=_hlMzvXKtiHtDOX4nBcWkoqrpQ8A1PdICa01OBFdhVU,4563
+bcmd/tasks/lib.py,sha256=lq-PdHxhK-5Akf7k4QaIT8mBB-sCK5or5OqEFTdphIA,4567
 bcmd/tasks/math.py,sha256=xbl5UdaDMyAjiLodDPleP4Cutrk2S3NOAgurzAgOEAE,2862
 bcmd/tasks/mirror.py,sha256=nAe8NYftMKzht16MFBj7RqXwvVhR6Jh2uuAyJLh87og,1098
 bcmd/tasks/project.py,sha256=yLYL6WNmq0mlY-hQ-SGKZ6uRjwceJxpgbP-QAo0Wk-Y,1948
-bcmd/tasks/proxy.py,sha256=SHYfdxrDt_TW0-7aNSuKX9oqm9CQ9tA87-7SgG794X8,1551
+bcmd/tasks/proxy.py,sha256=xvxN5PClUnc5LQpmq2Wug7_LUVpJboMWLXBvL9lX7EM,1552
 bcmd/tasks/time.py,sha256=ZiqA1jdgl-TBtFSOxxP51nwv4g9iZItmkFKpf9MKelk,2453
-bcmd/tasks/venv.py,sha256=lxA_mzY3_s4bH28e52GqAyxiaqibGYgwkiRH23lflaQ,7636
-bcmd-0.5.5.dist-info/METADATA,sha256=rBe0Nc-iLPHxXXLi2BLj1RmdcTaLryc-CSX9Y1sMMXQ,474
-bcmd-0.5.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-bcmd-0.5.5.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.5.5.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.5.5.dist-info/RECORD,,
+bcmd/tasks/upgrade.py,sha256=ZiyecgVbnnoTU_LAsd78CIKA4ioc9so9pXpAM76b_0M,447
+bcmd/tasks/venv.py,sha256=a7ZDyagUPQvCAXx3cZJIqJt0p1Iy5u5qmmj8iRbDQZE,7673
+bcmd-0.5.7.dist-info/METADATA,sha256=VYojYhON5P2o-Vmd9J-I3tOCdWTVYqR4R6uqplVK8JI,475
+bcmd-0.5.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+bcmd-0.5.7.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.5.7.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.5.7.dist-info/RECORD,,