bcmd 0.5.6__py3-none-any.whl → 0.5.8__py3-none-any.whl

bcmd/main.py

@@ -6,5 +6,5 @@ from .tasks import *
 
 
 def run():
-    btask.options.lock = 0
+    btask.options.lock = 0  # 允许多开
     asyncio.run(btask.main())

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/image.py

@@ -65,7 +65,7 @@ async def convert(
 @syncCall
 async def tiny(
     path: Path = typer.Option(None, '--path', help='指定目录或具体图片文件，默认当前目录'),
-    compression: int = typer.Option(75, '--compression', help='如果压缩小于指定数值则使用原来的图片，单位：%，默认75'),
+    optimization: int = typer.Option(25, '--optimization', help='指定优化大小，如果没有达到优化效果就不处理，单位：%，默认25'),
     isKeepOriginal: bool = typer.Option(False, '--keep-original', help='保留原始图片'),
 ):
 
@@ -75,6 +75,9 @@ async def tiny(
         'q8YLcvrXVW2NYcr5mMyzQhsSHF4j7gny',
     ]
     random.shuffle(keyList)
+
+    btask.assertTrue(0 < optimization < 100, '优化大小必须在0-100之间')
+    compression = 100 - optimization
     await block.setLimit(_TinyFile.runTiny, len(keyList))
 
     # 整理文件列表
@@ -103,7 +106,11 @@ async def tiny(
             pass
         else:
             # 要忽略掉的文件
-            bcolor.printYellow(f'{file.file}（{file.compression - 100:.2f}% / 已压缩 / {file.getSizeDisplay()}）')
+            if file.isTiny:
+                bcolor.printYellow(f'{file.file}（{file.compression - 100:.2f}% / 已压缩 / {file.getSizeDisplay()}）')
+            else:
+                bcolor.printMagenta(f'{file.file}（{file.compression - 100:.2f}% / 不处理 / {file.getSizeDisplay()}）')
+
             fileList[i] = Null
     fileList = [x for x in fileList if x]
 

{bcmd-0.5.6.dist-info → bcmd-0.5.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: bcmd
-Version: 0.5.6
+Version: 0.5.8
 Summary: Commands for Beni
 Author-email: Beni Mang <benimang@126.com>
 Maintainer-email: Beni Mang <benimang@126.com>

{bcmd-0.5.6.dist-info → bcmd-0.5.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 bcmd/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bcmd/main.py,sha256=1HRCHLt_jeF6ImgjG_MX9N2x9H1f6FyqTX7UADzedfA,131
+bcmd/main.py,sha256=GP_60-6vImXqdMfC5vc4xlscWajx4OYmnlNXASWn19w,147
 bcmd/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bcmd/common/func.py,sha256=MehbfuWFHTOsihhYxVFj0_U6-hjMTfLh3n-oMrpyyKo,508
 bcmd/common/password.py,sha256=25fA1h9ttZuUobnZ_nA0Ouhmk43etBfGeM40dgxJnFY,1347
@@ -10,11 +10,11 @@ bcmd/resources/project/.vscode/settings.json,sha256=G4rCroWxEHcQfsqIJ6CXRHI6VGr3
 bcmd/resources/project/.vscode/tasks.json,sha256=gouhpkrqiPz7v65Jw1Rz-BCYU3sSdmphzXIYCzVnoe0,1783
 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/image.py,sha256=fxCiP9Xs4mxj6PhnZY2nRc0pvYg0DAbEIOFHhj-BkXA,8088
 bcmd/tasks/json.py,sha256=WWOyvcZPYaqQgp-Tkm-uIJschNMBKPKtZN3yXz_SC5s,635
 bcmd/tasks/lib.py,sha256=lq-PdHxhK-5Akf7k4QaIT8mBB-sCK5or5OqEFTdphIA,4567
 bcmd/tasks/math.py,sha256=xbl5UdaDMyAjiLodDPleP4Cutrk2S3NOAgurzAgOEAE,2862
@@ -24,8 +24,8 @@ bcmd/tasks/proxy.py,sha256=xvxN5PClUnc5LQpmq2Wug7_LUVpJboMWLXBvL9lX7EM,1552
 bcmd/tasks/time.py,sha256=ZiqA1jdgl-TBtFSOxxP51nwv4g9iZItmkFKpf9MKelk,2453
 bcmd/tasks/upgrade.py,sha256=ZiyecgVbnnoTU_LAsd78CIKA4ioc9so9pXpAM76b_0M,447
 bcmd/tasks/venv.py,sha256=a7ZDyagUPQvCAXx3cZJIqJt0p1Iy5u5qmmj8iRbDQZE,7673
-bcmd-0.5.6.dist-info/METADATA,sha256=xf6IbZCdIQKGRmxWo0Ttyz5xV5sQBuTL7rAU_CMOdGc,475
-bcmd-0.5.6.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-bcmd-0.5.6.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
-bcmd-0.5.6.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
-bcmd-0.5.6.dist-info/RECORD,,
+bcmd-0.5.8.dist-info/METADATA,sha256=dxjitrNJe9aAj4AoZWfaXZQPfFbagkj4MzvGjFsgp9E,475
+bcmd-0.5.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+bcmd-0.5.8.dist-info/entry_points.txt,sha256=rHJrP6KEQpB-YaQqDFzEL2v88r03rxSfnzAayRvAqHU,39
+bcmd-0.5.8.dist-info/top_level.txt,sha256=-KrvhhtBcYsm4XhcjQvEcFbBB3VXeep7d3NIfDTrXKQ,5
+bcmd-0.5.8.dist-info/RECORD,,