kkpyutil 1.47.0__py3-none-any.whl → 1.48.0__py3-none-any.whl

{kkpyutil-1.47.0.dist-info → kkpyutil-1.48.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kkpyutil
-Version: 1.47.0
+Version: 1.48.0
 Summary: Building blocks for sysadmin and DevOps
 Home-page: https://github.com/kakyoism/kkpyutil/
 License: MIT

kkpyutil-1.48.0.dist-info/RECORD

@@ -0,0 +1,7 @@
+kkpyutil.py,sha256=NmOen-YeJ8oYHswc2Bt596nd5MslbVco1kc8ZhLpFHo,120012
+kkpyutil_helper/windows/kkttssave.ps1,sha256=xa3-WzqNh2rGYlOx_I4ewOuCE94gkTO5cEwYH0M67_0,446
+kkpyutil_helper/windows/kkttsspeak.ps1,sha256=7WUUHMmjTQroUWA2Mvdt4JtSt475nZUHQx-qP-7rS6o,305
+kkpyutil-1.48.0.dist-info/LICENSE,sha256=uISevGnCxB5QOU0ftbofN75_yUtd6E2h_MWE1zqagC8,1065
+kkpyutil-1.48.0.dist-info/METADATA,sha256=EDa23UXz9R6402nMWL2bwFBpixNxG_7fxzS5DivfP2E,1136
+kkpyutil-1.48.0.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
+kkpyutil-1.48.0.dist-info/RECORD,,

kkpyutil.py

@@ -2079,24 +2079,53 @@ def move_file(src, dst, isdstdir=False):
     return dst if not isdstdir else osp.join(dst, osp.basename(src))
 
 
-def sync_dirs(src_root, dst_root):
+def sync_dirs(src_root, dst_root, logger=glogger, sudo=False):
+    """
+    - assume src and dst folders are the same level of folder tree
+    - the result will be dst_root mirrors src_root
+    """
     # Ensure the source directory exists
     if not os.path.exists(src_root):
-        glogger.error(f"Error: Source directory {src_root} does not exist.")
+        logger.error(f"Error: Source directory {src_root} does not exist.")
+        return False
+    if not sudo:
+        # Iterate through the items inside the source directory
+        for item in os.listdir(src_root):
+            src_path = os.path.join(src_root, item)
+            dst_path = os.path.join(dst_root, item)
+            if os.path.isdir(src_path):
+                # copytree with dirs_exist_ok=True will overwrite existing files
+                # and merge directories without warning.
+                shutil.copytree(src_path, dst_path, dirs_exist_ok=True)
+                logger.info(f"Copied directory: {item}")
+            else:
+                # For individual files at the root of my_src_dir
+                shutil.copy2(src_path, dst_path)
+                logger.info(f"Copied file: {item}")
+        return True
+    # on macOS, merge to system folders
+    # Identify the original user (the one who called sudo)
+    # Default to current effective user if SUDO_USER isn't set
+    user = os.environ.get('SUDO_USER') or os.environ.get('USER')
+    if not user:
+        logger.error("Could not determine the current user.")
+        return False
+    try:
+        # rsync flags:
+        # -a: Archive mode (preserves links, etc.)
+        # --chown: Forces the owner:group of all copied files
+        # Note: 'staff' is the default group for users on macOS
+        cmd = [
+            "sudo", "rsync", "-av", "--inplace",
+            f"--chown={user}:staff",
+            osp.join(src_root, ""),  # Trailing slash copies contents
+            dst_root
+        ]
+        logger.info(f"Syncing to {dst_root} and setting owner to '{user}'...")
+        subprocess.check_call(cmd)
+    except subprocess.CalledProcessError as e:
+        logger.error(f"Sync failed with error code: {e.returncode}")
         return False
-    # Iterate through the items inside the source directory
-    for item in os.listdir(src_root):
-        src_path = os.path.join(src_root, item)
-        dst_path = os.path.join(dst_root, item)
-        if os.path.isdir(src_path):
-            # copytree with dirs_exist_ok=True will overwrite existing files
-            # and merge directories without warning.
-            shutil.copytree(src_path, dst_path, dirs_exist_ok=True)
-            glogger.info(f"Copied directory: {item}")
-        else:
-            # For individual files at the root of my_src_dir
-            shutil.copy2(src_path, dst_path)
-            glogger.info(f"Copied file: {item}")
     return True
 
 

kkpyutil-1.47.0.dist-info/RECORD

@@ -1,7 +0,0 @@
-kkpyutil.py,sha256=pCKGYZYsZqeEL24S72XlbMMgUxd4CC2oU8D4OHfUIOU,118774
-kkpyutil_helper/windows/kkttssave.ps1,sha256=xa3-WzqNh2rGYlOx_I4ewOuCE94gkTO5cEwYH0M67_0,446
-kkpyutil_helper/windows/kkttsspeak.ps1,sha256=7WUUHMmjTQroUWA2Mvdt4JtSt475nZUHQx-qP-7rS6o,305
-kkpyutil-1.47.0.dist-info/LICENSE,sha256=uISevGnCxB5QOU0ftbofN75_yUtd6E2h_MWE1zqagC8,1065
-kkpyutil-1.47.0.dist-info/METADATA,sha256=P0VzS19-22ZtTx20Om97sT9y7OW7H873F3R-Qfm83VQ,1136
-kkpyutil-1.47.0.dist-info/WHEEL,sha256=kLuE8m1WYU0Ig0_YEGrXyTtiJvKPpLpDEiChiNyei5Y,88
-kkpyutil-1.47.0.dist-info/RECORD,,