dekshell 0.2.28__py3-none-any.whl → 0.2.30__py3-none-any.whl

dekshell/core/__init__.py

@@ -86,16 +86,21 @@ def shell_command_batch_core(
         plugin_kwargs=None,
         source=None
 ):
-    def shell_exec(filepath, c=None):
-        return shell_command_file(
-            filepath,
-            context=c or {},
+    def shell_kwargs():
+        return dict(
             marker=marker,
             ms_names=ms_names,
             marker_set_cls=marker_set_cls,
             plugin_kwargs=plugin_kwargs,
         )
 
+    def shell_exec(filepath, c=None):
+        return shell_command_file(
+            filepath,
+            context=c or {},
+            **shell_kwargs()
+        )
+
     def shell_cmd(cmd, execute=None, env=None):
         if desc_begin_per:
             _shell_desc_begin(cmd)

dekshell/core/contexts/methods.py

@@ -14,6 +14,7 @@ from dektools.file import sure_dir, write_file, read_text, remove_path, sure_par
     format_path_desc, read_file, split_ext, path_ext, clear_dir, copy_recurse_ignore, path_is_empty, \
     read_lines, seek_py_module_path, come_real_path, status_of_dir, diff_of_dir, path_parent, \
     split_file, combine_split_files, remove_split_files, meta_split_file, tree, iglob, \
+    iter_dir_type, iter_dir_type_one, \
     where, where_list, which, which_list
 from dektools.hash import hash_file
 from dektools.zip import compress_files, decompress_files
@@ -30,7 +31,7 @@ from dektools.shell import shell_wrapper, is_user_admin, shell_timeout, shell_re
 from dektools.match import GeneralMatcher, glob2re, glob_compile, glob_match
 from dektools.cmd.git import git_clean_dir, git_apply, git_parse_modules, git_fetch_min, git_list_remotes, git_head
 from ...utils.beep import sound_notify
-from ...utils.cmd import ak2cmd
+from ...utils.cmd import ak2cmd, pack_context_full
 from ..markers.base.core import MarkerBase, get_inner_vars
 from ..markers.invoke import InvokeMarker, GotoMarker
 from ..redirect import search_bin_by_path_tree
@@ -120,6 +121,21 @@ def _eval_lines(expression, default=_eval_default):
             return default
 
 
+def _invoke(__placeholder__filepath, *args, **kwargs):
+    marker_set = get_inner_vars('__inner_marker_set__', full=True)
+    filepath = normal_path(__placeholder__filepath)
+    cwd = os.getcwd()
+    os.chdir(os.path.dirname(filepath))
+    ret_value = marker_set.shell_exec(filepath, pack_context_full(args, kwargs))
+    os.chdir(cwd)
+    return ret_value
+
+
+def _goto(__placeholder__filepath, *args, **kwargs):
+    marker_set = get_inner_vars('__inner_marker_set__', full=True)
+    return marker_set.shell_exec(normal_path(__placeholder__filepath), pack_context_full(args, kwargs))
+
+
 def _defined(name):
     default = object()
     return _eval_mixin(name, default=default) is not default
@@ -233,6 +249,8 @@ default_methods = {
         'run': shell_wrapper,
         'eval': _eval_mixin,
         'exec': _eval_lines,
+        'invoke': _invoke,
+        'goto': _goto,
     },
     'path': {
         **path_common_methods,
@@ -252,8 +270,8 @@ default_methods = {
         'mdt': lambda x=None: tempfile.mkdtemp(prefix=x),
         'mdc': _sure_and_clear,
 
-        'lsa': lambda path='.', file=None: list(_iter_dir(path, file)),
-        'lso': lambda path='.', file=None: _list_dir_one(path, file) or '',
+        'lsa': iter_dir_type,
+        'lso': lambda path='.', file=None: iter_dir_type_one(path, file, ''),
         'ls': lambda x='.': os.listdir(x),
 
         'iglob': iglob,

{dekshell-0.2.28.dist-info → dekshell-0.2.30.dist-info}/METADATA

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

{dekshell-0.2.28.dist-info → dekshell-0.2.30.dist-info}/RECORD

@@ -1,12 +1,12 @@
-dekshell-0.2.28.dist-info/METADATA,sha256=TM4EKPhD61p--WPgJ-nnOTdYLF5dOGjujW-iVFA2fIU,573
-dekshell-0.2.28.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-dekshell-0.2.28.dist-info/entry_points.txt,sha256=d-kbfULiUTZWIBBsrQF3J_-wESncF-4K2rwHT08grlI,75
+dekshell-0.2.30.dist-info/METADATA,sha256=SQKfCIDZhi_4CUb4jUSqT0pP_KsNzRK33k4BjzaJntQ,573
+dekshell-0.2.30.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+dekshell-0.2.30.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=rFzB_exzPQaIcbbms5PdHAU3NGdl2MBaYbq9v7g7BOI,1870
-dekshell/core/__init__.py,sha256=7d3AjVUGIjXIXRYYiJ03rz5ZONTTojmGfgwpjGmKqtU,5448
+dekshell/core/__init__.py,sha256=acq3wTfUlREzc_9R28ocvJBH7E8cnOQPGpy2dC69fIM,5533
 dekshell/core/contexts/__init__.py,sha256=ynsfv37azOKfI2UKd0iPl2M6iBW-k5cb1BqSLOWuJpI,482
-dekshell/core/contexts/methods.py,sha256=ksoOgBHDRM6uiGHw3ubCk4x7ExJKvJ6H3eGhaM-SNDE,9722
+dekshell/core/contexts/methods.py,sha256=A6t58yBoCEfcQ2rRdmwxwznMpOOGFCUrH8u8RoE2Sow,10375
 dekshell/core/contexts/properties.py,sha256=esr51c6wDTDsuFXF2uj7WfyIGSq9H0dzqDqWzeMTNQE,2382
 dekshell/core/markers/__init__.py,sha256=yRQazZ1dxMltFao_RQnDnawSnQcjN_4B930MjJhaZ40,1968
 dekshell/core/markers/base/__init__.py,sha256=mrOgC5glSG60NMpflSi5mb4bXTmDgv2i-ZYUHCef2Nw,13826
@@ -37,4 +37,4 @@ dekshell/utils/cmd.py,sha256=A0lEixQ7Ui0UxmeuymniyqCZXss9qQdX1C0COM7EEkQ,1234
 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.28.dist-info/RECORD,,
+dekshell-0.2.30.dist-info/RECORD,,