dekshell 0.2.2__tar.gz → 0.2.4__tar.gz

{dekshell-0.2.2 → dekshell-0.2.4}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: dekshell
-Version: 0.2.2
+Version: 0.2.4
 Author-Email: sanzenwin <sanzenwin@gmail.com>
 License: MIT
 Requires-Python: >=3.8
 Requires-Dist: packaging<=23.1
 Requires-Dist: extra-platforms<=3.1.0
-Requires-Dist: dektools[date,fetch,ps,tab]<1.0.0
+Requires-Dist: dektools[date,fetch,ignore,ps,tab]<1.0.0
 Requires-Dist: dekmedia[audio]<1.0.0
 Description-Content-Type: text/markdown
 

{dekshell-0.2.2 → dekshell-0.2.4}/dekshell/core/__init__.py

@@ -17,8 +17,12 @@ from ..utils.shell import shell_bin
 from ..utils.cmd import ak2cmd, pack_context_full
 
 
-def shell_file(__not_use_this_var_name__, *args, **kwargs):
-    shell_wrapper(f'{shell_bin} rf {__not_use_this_var_name__} {ak2cmd(args, kwargs)}')
+def shell_file(__placeholder__filepath, *args, **kwargs):
+    shell_wrapper(f'{shell_bin} rf "{__placeholder__filepath}" {ak2cmd(args, kwargs)}')
+
+
+def shell_file_cd(__placeholder__filepath, *args, **kwargs):
+    shell_wrapper(f'{shell_bin} rfc "{__placeholder__filepath}" {ak2cmd(args, kwargs)}')
 
 
 def shell_command_file_cd(filepath, **kwargs):

{dekshell-0.2.2 → dekshell-0.2.4}/dekshell/core/contexts/methods.py

@@ -5,7 +5,7 @@ import tempfile
 import getpass
 from pathlib import Path
 from dektools.file import sure_dir, write_file, read_text, remove_path, sure_parent_dir, normal_path, \
-    format_path_desc, read_file, split_ext, path_ext, clear_dir, \
+    format_path_desc, read_file, split_ext, path_ext, clear_dir, copy_recurse_ignore, \
     split_file, combine_split_files, remove_split_files, meta_split_file, tree, iglob, \
     where, where_list, which, which_list
 from dektools.hash import hash_file
@@ -19,11 +19,12 @@ from dektools.ps.process import process_detail, process_kill, process_list_all
 from dektools.time import now
 from dektools.str import shlex_split, shlex_quote
 from dektools.shell import shell_wrapper, is_user_admin
+from dektools.match import GeneralMatcher, glob2re, glob_compile, glob_match
+from dektools.git import git_clean_dir, git_apply, git_parse_modules, git_fetch_min, git_list_remotes
 from ...utils.beep import sound_notify
 from ..markers.base.core import MarkerBase, get_inner_vars
 from ..markers.invoke import InvokeMarker, GotoMarker
 from ..redirect import search_bin_by_path_tree
-from .properties import current_os
 
 
 def _is_true(x):
@@ -174,6 +175,7 @@ default_methods = {
         'wf': write_file,
         'rt': read_text,
         'rf': read_file,
+        'ci': copy_recurse_ignore,
 
         'sf': split_file,
         'sfr': remove_split_files,
@@ -207,10 +209,17 @@ default_methods = {
     'notequal': lambda x, y: x != y,
     'beep': lambda x=True: sound_notify(x),
 
-    'invoke': lambda __not_use_this_var_name__, *args, **kwargs: InvokeMarker.execute_file(
-        None, __not_use_this_var_name__, args, kwargs),
-    'goto': lambda __not_use_this_var_name__, *args, **kwargs: GotoMarker.execute_file(
-        None, __not_use_this_var_name__, args, kwargs),
+    'invoke': lambda __placeholder__filepath, *args, **kwargs: InvokeMarker.execute_file(
+        None, __placeholder__filepath, args, kwargs),
+    'goto': lambda __placeholder__filepath, *args, **kwargs: GotoMarker.execute_file(
+        None, __placeholder__filepath, args, kwargs),
+
+    'glob': {
+        're': glob2re,
+        'compile': glob_compile,
+        'match': glob_match,
+        'matcher': GeneralMatcher,
+    },
 
     'shlex': {
         'split': shlex_split,
@@ -222,4 +231,12 @@ default_methods = {
         'fetch': download_file,
         'download': download_from_http,
     },
+
+    'git': {
+        'apply': git_apply,
+        'remotes': git_list_remotes,
+        'modules': git_parse_modules,
+        'fetch': git_fetch_min,
+        'clean': git_clean_dir,
+    }
 }

{dekshell-0.2.2 → dekshell-0.2.4}/dekshell/core/contexts/properties.py

@@ -65,10 +65,11 @@ default_properties = {
         'mingw': sysconfig.get_platform() == 'mingw',
         'msys': sys.platform == 'msys',
         'wsl': 'Microsoft' in read_text('/proc/version', default=''),
-        'win': platform.system() == 'Windows',
-        'mac': platform.system() == 'Darwin',
+        'windows': platform.system() == 'Windows',
+        'macos': platform.system() == 'Darwin',
         'linux': platform.system() == 'Linux',
-        'x': current_os,
+        'name': {'Windows': 'windows', 'Darwin': 'macos', 'Linux': 'linux'}.get(platform.system()),
+        'entry': current_os,
     },
     'path': {
         'root': Path(path_root),

{dekshell-0.2.2 → dekshell-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dekshell"
-version = "0.2.2"
+version = "0.2.4"
 description = ""
 authors = [
     { name = "sanzenwin", email = "sanzenwin@gmail.com" },
@@ -8,7 +8,7 @@ authors = [
 dependencies = [
     "packaging<=23.1",
     "extra-platforms<=3.1.0",
-    "dektools[date,fetch,ps,tab]<1.0.0",
+    "dektools[ignore,date,fetch,ps,tab]<1.0.0",
     "dekmedia[audio]<1.0.0",
 ]
 requires-python = ">=3.8"