dekshell 0.2.47__py3-none-any.whl → 0.2.49__py3-none-any.whl

dekshell/core/contexts/methods.py

@@ -22,7 +22,7 @@ from dektools.hash import hash_file
 from dektools.web.js.polyfill import atob, btoa
 from dektools.zip import compress_files, decompress_files
 from dektools.output import pprint, obj2str
-from dektools.net import get_available_port
+from dektools.net import get_available_port, get_local_ip_list, get_interface_ip
 from dektools.func import FuncAnyArgs
 from dektools.fetch import download_file, download_content
 from dektools.download import download_from_http
@@ -239,7 +239,7 @@ path_common_methods = {
     'where': where,
     'which': lambda *x, **y: which(*x, **y) or '',
     'those': those,
-    'pybin': lambda x, p=None: search_bin_by_path_tree(p or os.getcwd(), x, False),
+    'pybin': lambda x=None, p=None: search_bin_by_path_tree(p or os.getcwd(), x, False),
     'pym': _pym,
     'pymd': _pymd,
     'pyms': _pyms,
@@ -394,6 +394,8 @@ default_methods = {
     },
 
     'net': {
+        'ip': get_interface_ip,
+        'ips': get_local_ip_list,
         'port': get_available_port,
         'fetch': download_file,
         'download': download_from_http,

dekshell/core/redirect.py

@@ -1,12 +1,13 @@
 import os
 import sys
-import shutil
 from dektools.sys import sys_paths_relative
-from dektools.file import normal_path
+from dektools.file import normal_path, which
 from ..utils.shell import shell_name
 
 
-def search_bin_by_path_tree(filepath, bin_name, skip_self=True):
+def search_bin_by_path_tree(filepath, bin_name=None, skip_self=True):
+    if not bin_name:
+        bin_name = os.path.basename(sys.executable)
     filepath = normal_path(filepath)
     cursor = os.path.dirname(filepath) if os.path.isfile(filepath) else filepath
     while True:
@@ -17,7 +18,7 @@ def search_bin_by_path_tree(filepath, bin_name, skip_self=True):
                     return
                 else:
                     path_scripts = sys_paths_relative(path_venv)['scripts']
-                    path_exe = shutil.which(bin_name, path=path_scripts)
+                    path_exe = which(bin_name, path_scripts)
                     if path_exe:
                         return path_exe
         dir_cursor = os.path.dirname(cursor)

{dekshell-0.2.47.dist-info → dekshell-0.2.49.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dekshell
-Version: 0.2.47
+Version: 0.2.49
 Author-Email: sanzenwin <sanzenwin@gmail.com>
 License: MIT
 Requires-Python: >=3.8

{dekshell-0.2.47.dist-info → dekshell-0.2.49.dist-info}/RECORD

@@ -1,12 +1,12 @@
-dekshell-0.2.47.dist-info/METADATA,sha256=EDMO6Fw8z-kgnnIGwEYm3zw9FnnTlvyNW78DYhzi1Bw,573
-dekshell-0.2.47.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.47.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.49.dist-info/METADATA,sha256=B57a2ZJyDlUu9H5Bd3LO7oy-NnrPQawYhl7uNBznU8A,573
+dekshell-0.2.49.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.49.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
 dekshell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/click/__entry__.py,sha256=CMuxUzXoEe4TcHFZwv-MNFwHnu1HSZCDpXFpqQ814uM,42
 dekshell/click/__init__.py,sha256=r-AHdO9CEEVvTN20-8Jozr6Zh8XSv_BnktYRwrlhtrE,2046
 dekshell/core/__init__.py,sha256=isDEKwk1odLdvTQNCILCtVNBuXp1uFVPz_uTDNihkVU,5547
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=3Bzfv_t8At5MqR0xD7qT8zye6KQySeXr0HpwuendrdE,11789
+dekshell/core/contexts/methods.py,sha256=t95CU8pjivYq5DtyjH__V7SH3HVj9iSJVI0Oy-esoUQ,11897
 dekshell/core/contexts/properties.py,sha256=TQonN3T_K2cB2uakq_DVVB13B-IFwoM6t2ZkL_OMekw,3365
 dekshell/core/markers/__init__.py,sha256=mK6OiZMWmUTrkAL0Bc1XqRTSb-NNhBgpHb7GLivLAlk,2235
 dekshell/core/markers/base/__init__.py,sha256=0LYnOVNXPBHfRQII00ZGkESTFX82TgHdSaTcHJoebXc,18051
@@ -30,11 +30,11 @@ dekshell/core/markers/shell.py,sha256=43BDAAzMdmgZmemkW5buh_w4LL1GDGw-s9fNZo6vha
 dekshell/core/markers/var.py,sha256=I1GQqDRDmWKV38Exfn_5MtRDz58FKo_6x8NIVHqPAPU,6901
 dekshell/core/markers/while_.py,sha256=Q0SaElyXSrxg-wS_rfCcxMsmw9jf-0SgN1ICn860T4A,1201
 dekshell/core/plugin/__init__.py,sha256=jAB_KnnHJsyJR_zIfBU_HNLngyhcyyqVv05PdlNZtF8,428
-dekshell/core/redirect.py,sha256=6YCJpG0TkQ4WMt7LBtDD_W1T-C-QkLtGRQw0S60qe54,1058
+dekshell/core/redirect.py,sha256=jgLdcPtc4RKs63Lf2I0LXJRr9jRfNu03aDB_tIWvcrU,1117
 dekshell/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dekshell/utils/beep.py,sha256=teuQgHbWDr8BD1xCJ4Pt79X6N1-eq1tTlyGunK6wBIM,120
 dekshell/utils/cmd.py,sha256=K9FbXgHcGFchHA58xI0_t4YK4yb8XkWbxsNoztYRx3Y,518
 dekshell/utils/pkg.py,sha256=TgYqRqawoJfjkxt6UAHnp9ttmpjuHiWRFbqxADOS1VE,1337
 dekshell/utils/serializer.py,sha256=aIdF2Wzo-qHmIshv46jn1XD0X66vQ1JFdU-g3ZFbH2w,386
 dekshell/utils/shell.py,sha256=0NoA2-SOOMinbmZZipwzL-npBbzPOdWEfdPVYqq5G5g,92
-dekshell-0.2.47.dist-info/RECORD,,
+dekshell-0.2.49.dist-info/RECORD,,