abstract-utilities 0.2.2.488__py3-none-any.whl → 0.2.2.492__py3-none-any.whl

abstract_utilities/read_write_utils.py

@@ -14,10 +14,12 @@ Usage:
 
 import os
 import shlex
+from .string_clean import *
 from .ssh_utils.utils import run_cmd,get_print_sudo_cmd,run_local_cmd,run_remote_cmd
 from .file_utils.file_utils.type_checks import is_file,is_dir,get_user_pass_host_key,is_exists
 from .abstract_classes import run_pruned_func
 from .string_utils import get_from_kwargs
+
 _FILE_PATH_KEYS = ['file', 'filepath', 'file_path', 'path', 'directory', 'f', 'dst', 'dest']
 _CONTENTS_KEYS = ['cont', 'content', 'contents', 'data', 'datas', 'dat', 'src', 'source']
 
@@ -30,15 +32,54 @@ def string_in_keys(strings, kwargs):
             if s.lower() in key.lower():
                 return key
     return None
-
-def make_dirs(path,exist_ok=True,**kwargs):
-    if exist_ok or (not exist_ok and not is_dir(path,**kwargs)):
-        if get_user_pass_host_key(**kwargs):
-            kwargs['cmd']=f"mkdir {path}"
-            run_pruned_func(run_cmd,**kwargs)
-        else:
-            os.makedirs(path,exist_ok=exist_ok)
+def make_dirs(path, exist_ok=True, **kwargs):
+    remote = get_user_pass_host_key(**kwargs)
+    print(remote)
+    if remote:
+        kwargs['cmd'] = f"mkdir -p {path}"
+        print(kwargs)
+        resp = run_pruned_func(run_cmd, **kwargs)
+        print(resp)
+    else:
+        os.makedirs(path, exist_ok=exist_ok)
     return path
+def make_path(path, home_dir=None, file=None, **kwargs):
+    if not path:
+        return None
+
+    basename = os.path.basename(path)
+    parts = [p for p in path.split('/') if p]
+
+    # Detect whether this is a file or a folder
+    is_file = file if file is not None else ('.' in basename)
+    pieces = parts[:-1] if is_file else parts
+    print(pieces)
+    full_dir = home_dir or '/'
+    for piece in pieces:
+        full_dir = os.path.join(full_dir, piece)
+        make_dirs(full_dir, exist_ok=True, **kwargs)
+        print(f"✅ full_dir == {full_dir}")
+    if is_file:
+        full_dir = os.path.join(full_dir, basename)
+
+    print(f"✅ full_dir == {full_dir}")
+    return full_dir
+def get_rel_path(src,src_rel,dst,**kwargs):
+    if src.startswith(src_rel):
+        nu_src = src[len(src_rel):]
+        nu_src= eatAll(nu_src,'/')
+        directory= eatOuter(dst,'/')
+        rel_path = os.path.join(dst,nu_src)
+        return rel_path
+def make_relative_path(src,src_rel,dst,**kwargs):
+    print(f"src == {src}\nsrc_rel == {src_rel}\dst == {dst}")
+    if src.startswith(src_rel):
+        rel_path = get_rel_path(src,src_rel,dst)
+        print(rel_path)
+        path = make_path(rel_path,**kwargs)
+        print(f"path == {path}")
+        return path
+
 def path_join(*args):
     path = None
     for i,arg in enumerate(args):
@@ -48,25 +89,7 @@ def path_join(*args):
             else:
                 path = os.path.join(path,arg)
     return path
-def make_path(path,home_dir=None,file=None,**kwargs):
-    if path:
-        basename = os.path.basename(path)
-        parts = path.split('/')
-        parts = [part for part in parts if part]
-        
-        full_dir = home_dir or ''
-        if file == True or (file == None and ('.' in basename)):
-            pieces = parts[:-1] if len(parts) > 1 else []
-        else:
-            pieces=parts
-            basename=None
-        for piece in pieces:
-            full_dir = os.path.join(full_dir,piece)
-            make_dirs(full_dir,exist_ok=True,**kwargs)
-        if basename:
-            full_dir=path_join(full_dir,basename)
-        print(f"full_dir == {full_dir}")
-        return full_dir
+
 def get_path(paths,**kwargs):
     """Return the first valid path among given paths."""
     for path in paths:
@@ -204,6 +227,8 @@ def write_to_file(*args, **kwargs):
         if not kwargs.get('password') and not kwargs.get('key'):
             kwargs["cmd"]=f'sudo {kwargs["cmd"]}'
         result = run_pruned_func(run_cmd,**kwargs)
+        if 'file_path' in kwargs:
+            del kwargs['file_path']
         if not is_file(file_path,**kwargs) or str(contents) != read_from_file(file_path,**kwargs):
             kwargs["cmd"]=f'sudo {kwargs["cmd"]}'
             result = run_pruned_func(run_cmd,**kwargs)
@@ -224,18 +249,7 @@ def read_from_file(file_path,**kwargs):
     """Read text content from a file."""
     with open(file_path, "r", encoding="utf-8") as f:
         return f.read()
-def get_rel_path(src,src_rel,directory):
-    if src.startswith(src_rel):
-        src = src[len(src_rel):]
-        rel_path = os.path.join(directory,src)
-        return rel_path
-def make_relative_path(src,src_rel,dst,**kwargs):
-    print(f"src == {src}\nsrc_rel == {src_rel}\dst == {dst}")
-    if src.startswith(src_rel):
-        rel_path = get_rel_path(src,src_rel,dst)
-        path = make_path(src,home_dir=rel_path,**kwargs)
-        print(f"path == {path}")
-        return path
+
 def copy_dirs(dirs,dst,src_rel=None,**kwargs):
     for src in dirs:
         if rel_path:
@@ -243,13 +257,16 @@ def copy_dirs(dirs,dst,src_rel=None,**kwargs):
         make_path(dst,**kwargs)
         
 def copy_file(src,dst,rel_path=None,**kwargs):
+
     if rel_path:
         dst = make_relative_path(src,rel_path,dst,**kwargs)
+        print(dst)
     if get_user_pass_host_key(**kwargs):
         contents=read_from_file(src,**kwargs)
         write_to_file(contents=contents,file_path=dst,**kwargs)
     else:
         shutil.copy(src,dst)
+    print(dst)
     return dst
 def copy_files(files,dst,rel_path=None,**kwargs):
     for file in files:

{abstract_utilities-0.2.2.488.dist-info → abstract_utilities-0.2.2.492.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_utilities
-Version: 0.2.2.488
+Version: 0.2.2.492
 Summary: abstract_utilities is a collection of utility modules providing a variety of functions to aid in tasks such as data comparison, list manipulation, JSON handling, string manipulation, mathematical computations, and time operations.
 Home-page: https://github.com/AbstractEndeavors/abstract_utilities
 Author: putkoff

{abstract_utilities-0.2.2.488.dist-info → abstract_utilities-0.2.2.492.dist-info}/RECORD

@@ -14,7 +14,7 @@ abstract_utilities/log_utils.py,sha256=W74Y-CmdQP4Kj88HmAgejVxWgyWlvgCKMwLvOfyFf
 abstract_utilities/math_utils.py,sha256=0o1ls1En03UAkYmxTBildCCJDfHygmNuvVnrNrLYtK0,6578
 abstract_utilities/parse_utils.py,sha256=Z5OGRwHuzCzY91fz0JJojk1BPAo1XF2quNNLuBF4_Vk,18602
 abstract_utilities/path_utils.py,sha256=X_U9cPBbNu5Wi0F3hQE0gXQX1gfhzxhxALbairTEOZU,19252
-abstract_utilities/read_write_utils.py,sha256=9jW-eQojjXGAtyeCQp2m_1Rx6KgDGp3GHN0jwdqZlcA,9941
+abstract_utilities/read_write_utils.py,sha256=pNDmrAJe1OlS3lmG52bcR1rMKwCd2Yffg_bvuLKP-Uk,10168
 abstract_utilities/safe_utils.py,sha256=_uoZny6dJjopVakOiaf0UIZcvRRXMh51FpfDUooe0xY,3733
 abstract_utilities/string_clean.py,sha256=oQv85J-mA4sP2NJwbTI-1k0RXw7V0AmqZolYaAZvex4,6916
 abstract_utilities/string_utils.py,sha256=PnII0wFQBchVzFjhvEHP9ej1zxLehsRKodtc8Qol4-8,1645
@@ -86,7 +86,7 @@ abstract_utilities/ssh_utils/classes.py,sha256=3Q9BfLpyagNFYyiF4bt-5UCezeUJv9NK9
 abstract_utilities/ssh_utils/imports.py,sha256=oX8WAv-pkhizzko_h3fIUp9Vhsse4nR7RN2vwONxIx0,317
 abstract_utilities/ssh_utils/pexpect_utils.py,sha256=JBdOIXBTXAqE5TrsFjmPWJgwSaWyRJN8rbJ6y3_zKPY,10556
 abstract_utilities/ssh_utils/utils.py,sha256=smUWAx3nW1h0etTndJ_te9bkUX5YzQ8kYd9_gD1TXLk,4882
-abstract_utilities-0.2.2.488.dist-info/METADATA,sha256=rta42TF8pwLWyBz2dR-dx085mU_Sd-HOpzQLVpeLYro,28108
-abstract_utilities-0.2.2.488.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-abstract_utilities-0.2.2.488.dist-info/top_level.txt,sha256=BF0GZ0xVFfN1K-hFIWPO3viNsOs1sSF86n1vHBg39FM,19
-abstract_utilities-0.2.2.488.dist-info/RECORD,,
+abstract_utilities-0.2.2.492.dist-info/METADATA,sha256=2Ys2KmfYJBDHWBKXOek_sMRZ3wt1Hz70iGVYwOi8ZrE,28108
+abstract_utilities-0.2.2.492.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+abstract_utilities-0.2.2.492.dist-info/top_level.txt,sha256=BF0GZ0xVFfN1K-hFIWPO3viNsOs1sSF86n1vHBg39FM,19
+abstract_utilities-0.2.2.492.dist-info/RECORD,,