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

bcmd/tasks/proxy.py

@@ -1,54 +1,55 @@
-from __future__ import annotations
-
-from typing import Final
-
-import psutil
-import pyperclip
-import typer
-from beni import bcolor, btask
-from beni.bfunc import syncCall, textToAry
-
-app: Final = btask.app
-
-
-@app.command()
-@syncCall
-async def proxy(
-    port: int = typer.Argument(15236, help="代理服务器端口"),
-):
-    '生成终端设置代理服务器的命令'
-    processNameAry: list[str] = []
-    process = psutil.Process().parent()
-    while process:
-        processNameAry.append(process.name())
-        process = process.parent()
-    template = ''
-
-    # 针对不同的终端使用不同的模板
-    if 'cmd.exe' in processNameAry:
-        template = cmdTemplate
-    elif set(['powershell.exe', 'pwsh.exe']) & set(processNameAry):
-        template = powerShellTemplate
-
-    btask.assertTrue(template, '不支持当前终端（{processNameAry}）')
-    lineAry = textToAry(template.format(port))
-    msg = '\n'.join(lineAry)
-    bcolor.printMagenta('\r\n' + msg)
-    pyperclip.copy(msg)
-    bcolor.printYellow('已复制，可直接粘贴使用')
-
-
-# ------------------------------------------------------------------------------------
-
-
-cmdTemplate = '''
-    set http_proxy=http://localhost:{0}
-    set https_proxy=http://localhost:{0}
-    set all_proxy=http://localhost:{0}
-'''
-
-powerShellTemplate = '''
-    $env:http_proxy="http://localhost:{0}"
-    $env:https_proxy="http://localhost:{0}"
-    $env:all_proxy="http://localhost:{0}"
-'''
+from __future__ import annotations
+
+from typing import Final
+
+import psutil
+import pyperclip
+import typer
+from beni import bcolor, btask
+from beni.bfunc import syncCall, textToAry
+
+app: Final = btask.app
+
+
+@app.command()
+@syncCall
+async def proxy(
+    port: int = typer.Argument(15236, help="代理服务器端口"),
+):
+    '生成终端设置代理服务器的命令'
+    processNameAry: list[str] = []
+    process = psutil.Process().parent()
+    while process:
+        processNameAry.append(process.name())
+        process = process.parent()
+    template = ''
+
+    # 针对不同的终端使用不同的模板
+    if 'cmd.exe' in processNameAry:
+        template = cmdTemplate
+    elif set(['powershell.exe', 'pwsh.exe']) & set(processNameAry):
+        template = powerShellTemplate
+
+    btask.assertTrue(template, '不支持当前终端（{processNameAry}）')
+    lineAry = textToAry(template.format(port))
+    msg = '\n'.join(lineAry)
+    bcolor.printMagenta('\r\n' + msg)
+    msg += '\n' # 多增加一个换行，直接粘贴的时候相当于最后一行也执行完
+    pyperclip.copy(msg)
+    bcolor.printYellow('已复制，可直接粘贴使用')
+
+
+# ------------------------------------------------------------------------------------
+
+
+cmdTemplate = '''
+    set http_proxy=http://localhost:{0}
+    set https_proxy=http://localhost:{0}
+    set all_proxy=http://localhost:{0}
+'''
+
+powerShellTemplate = '''
+    $env:http_proxy="http://localhost:{0}"
+    $env:https_proxy="http://localhost:{0}"
+    $env:all_proxy="http://localhost:{0}"
+'''

bcmd/tasks/time.py

@@ -1,81 +1,81 @@
-import time
-from datetime import datetime as Datetime
-from datetime import timezone
-from typing import Final
-from zoneinfo import ZoneInfo
-
-import typer
-from beni import bcolor, btask
-from beni.bfunc import syncCall, textToAry
-from beni.btype import Null
-
-app: Final = btask.app
-
-
-@app.command('time')
-@syncCall
-async def showtime(
-    args: list[str] = typer.Argument(None),
-):
-    '''
-    格式化时间戳\n
-    beni time\n
-    beni time 1632412740\n
-    beni time 1632412740.1234\n
-    beni time 2021-9-23\n
-    beni time 2021-9-23 09:47:00\n
-    '''
-    args = args or []
-    btask.assertTrue(len(args) <= 2, '参数过多')
-    value1: str | None = args[0] if len(args) >= 1 else None
-    value2: str | None = args[1] if len(args) >= 2 else None
-    timestamp: float = Null
-    if not value1:
-        timestamp = time.time()
-    else:
-        try:
-            timestamp = float(value1)
-        except:
-            try:
-                if value2:
-                    timestamp = Datetime.strptime(f'{value1} {value2}', '%Y-%m-%d %H:%M:%S').timestamp()
-                else:
-                    timestamp = Datetime.strptime(f'{value1}', '%Y-%m-%d').timestamp()
-            except:
-                pass
-    if not timestamp:
-        bcolor.printRed('参数无效\n')
-        bcolor.printRed('使用示例：')
-        msgAry = textToAry(str(showtime.__doc__))[1:]
-        bcolor.printRed('\n'.join(msgAry))
-        return
-    print()
-    bcolor.printMagenta(timestamp)
-    print()
-    # localtime = time.localtime(timestamp)
-    # tzname = time.tzname[(time.daylight and localtime.tm_isdst) and 1 or 0]
-    # bcolor.printx(time.strftime('%Y-%m-%d %H:%M:%S %z', localtime), tzname, colors=[Fore.YELLOW])
-    # print()
-    datetime_utc = Datetime.fromtimestamp(timestamp, tz=timezone.utc)
-    tzname_list = [
-        'Australia/Sydney',
-        'Asia/Tokyo',
-        'Asia/Shanghai',
-        'Asia/Kolkata',
-        'Africa/Cairo',
-        'Europe/London',
-        'America/Sao_Paulo',
-        'America/New_York',
-        'America/Chicago',
-        'America/Los_Angeles',
-    ]
-    for tzname in tzname_list:
-        datetime_tz = datetime_utc.astimezone(ZoneInfo(tzname))
-        dstStr = ''
-        dst = datetime_tz.dst()
-        if dst:
-            dstStr = f'(DST+{dst})'
-        if tzname == 'Asia/Shanghai':
-            bcolor.printYellow(f'{datetime_tz} {tzname} {dstStr}')
-        else:
-            print(f'{datetime_tz} {tzname} {dstStr}')
+import time
+from datetime import datetime as Datetime
+from datetime import timezone
+from typing import Final
+from zoneinfo import ZoneInfo
+
+import typer
+from beni import bcolor, btask
+from beni.bfunc import syncCall, textToAry
+from beni.btype import Null
+
+app: Final = btask.app
+
+
+@app.command('time')
+@syncCall
+async def showtime(
+    args: list[str] = typer.Argument(None),
+):
+    '''
+    格式化时间戳\n
+    beni time\n
+    beni time 1632412740\n
+    beni time 1632412740.1234\n
+    beni time 2021-9-23\n
+    beni time 2021-9-23 09:47:00\n
+    '''
+    args = args or []
+    btask.assertTrue(len(args) <= 2, '参数过多')
+    value1: str | None = args[0] if len(args) >= 1 else None
+    value2: str | None = args[1] if len(args) >= 2 else None
+    timestamp: float = Null
+    if not value1:
+        timestamp = time.time()
+    else:
+        try:
+            timestamp = float(value1)
+        except:
+            try:
+                if value2:
+                    timestamp = Datetime.strptime(f'{value1} {value2}', '%Y-%m-%d %H:%M:%S').timestamp()
+                else:
+                    timestamp = Datetime.strptime(f'{value1}', '%Y-%m-%d').timestamp()
+            except:
+                pass
+    if not timestamp:
+        bcolor.printRed('参数无效\n')
+        bcolor.printRed('使用示例：')
+        msgAry = textToAry(str(showtime.__doc__))[1:]
+        bcolor.printRed('\n'.join(msgAry))
+        return
+    print()
+    bcolor.printMagenta(timestamp)
+    print()
+    # localtime = time.localtime(timestamp)
+    # tzname = time.tzname[(time.daylight and localtime.tm_isdst) and 1 or 0]
+    # bcolor.printx(time.strftime('%Y-%m-%d %H:%M:%S %z', localtime), tzname, colors=[Fore.YELLOW])
+    # print()
+    datetime_utc = Datetime.fromtimestamp(timestamp, tz=timezone.utc)
+    tzname_list = [
+        'Australia/Sydney',
+        'Asia/Tokyo',
+        'Asia/Shanghai',
+        'Asia/Kolkata',
+        'Africa/Cairo',
+        'Europe/London',
+        'America/Sao_Paulo',
+        'America/New_York',
+        'America/Chicago',
+        'America/Los_Angeles',
+    ]
+    for tzname in tzname_list:
+        datetime_tz = datetime_utc.astimezone(ZoneInfo(tzname))
+        dstStr = ''
+        dst = datetime_tz.dst()
+        if dst:
+            dstStr = f'(DST+{dst})'
+        if tzname == 'Asia/Shanghai':
+            bcolor.printYellow(f'{datetime_tz} {tzname} {dstStr}')
+        else:
+            print(f'{datetime_tz} {tzname} {dstStr}')