kkpyutil 1.47.1__tar.gz → 1.49.0__tar.gz

{kkpyutil-1.47.1 → kkpyutil-1.49.0}/PKG-INFO

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

{kkpyutil-1.47.1 → kkpyutil-1.49.0}/kkpyutil.py

@@ -2079,28 +2079,75 @@ 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, logger=glogger):
+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
     """
+    def _run_sudo_command(_cmd, password, _logger):
+        sudo_cmd = ['sudo', '-S'] + _cmd
+        try:
+            process = subprocess.Popen(
+                sudo_cmd,
+                stdin=subprocess.PIPE,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True
+            )
+            stdout, stderr = process.communicate(input=f'{password}\n')
+            if process.returncode == 0:
+                _logger.debug(f"Successfully executed: {' '.join(_cmd)}")
+                return True
+            else:
+                _logger.error(f"Sudo command failed: {stderr}")
+                return False
+        except Exception as e:
+            _logger.error(f"Failed to execute sudo command: {e}")
+            return False
     # Ensure the source directory exists
     if not os.path.exists(src_root):
         logger.error(f"Error: Source directory {src_root} does not exist.")
         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)
-            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}")
+    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
+    pwd = prompt_macos_admin_password()
+    if pwd is None:
+        logger.error('Failed to get admin password')
+        return False
+    # 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 = [
+        '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}'...")
+    if not _run_sudo_command(cmd, pwd, logger):
+        logger.error(f'Sync failed with command: {cmd}; you may have entered wrong password')
+        return False
     return True
 
 
@@ -3163,6 +3210,25 @@ def json_from_text(json_str):
     except json.JSONDecodeError as e:
         return None, e
 
+
+def prompt_macos_admin_password(action="Your operation"):
+    applescript = f'''
+display dialog "{action} requires administrator privileges. Please enter your password:" default answer "" with hidden answer buttons {"Cancel", "OK"} default button "OK"
+text returned of the result
+'''
+    try:
+        result = subprocess.run(
+            ['osascript', '-e', applescript],
+            capture_output=True,
+            text=True,
+            check=True
+        )
+        return result.stdout.strip()
+    except subprocess.CalledProcessError:
+        # User cancelled the dialog
+        return None
+
+
 # endregion
 
 

{kkpyutil-1.47.1 → kkpyutil-1.49.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kkpyutil"
-version = "1.47.1"
+version = "1.49.0"
 description = "Building blocks for sysadmin and DevOps"
 authors = ["Beinan Li <li.beinan@gmail.com>"]
 maintainers = ["Beinan Li <li.beinan@gmail.com>"]