accli 2.0.3__tar.gz → 2.0.4__tar.gz

{accli-2.0.3 → accli-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accli
-Version: 2.0.3
+Version: 2.0.4
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)

{accli-2.0.3 → accli-2.0.4}/accli/_version.py

@@ -1,3 +1,3 @@
 # Please strictly put double quote to use this info for git tag 
 # Read a developer guide for git tag command with regex
-VERSION = "v2.0.3"
+VERSION = "v2.0.4"

{accli-2.0.3 → accli-2.0.4}/accli/cli.py

@@ -604,6 +604,76 @@ def find_available_windows_drive(preferred: str = "W") -> str:
     raise RuntimeError("No available Windows drive letters found.")
 
 
+def start_windows_explorer_refresher(mount_point: str, interval: int):
+    """Starts a lightweight background watcher in the user session that notifies Explorer when remote changes occur."""
+    import sys
+    import subprocess
+    from pathlib import Path
+    
+    refresher_script = Path(__file__).parent / "windows_refresher.py"
+    if not refresher_script.is_file():
+        return
+    
+    # Locate Python interpreter (prefer pythonw to run completely windowless if available)
+    py_exec = sys.executable
+    parent_dir = Path(py_exec).parent
+    pythonw = parent_dir / "pythonw.exe"
+    if pythonw.is_file():
+        executable = str(pythonw)
+    else:
+        executable = py_exec
+        
+    try:
+        # DETACHED_PROCESS (0x00000008) | CREATE_NEW_PROCESS_GROUP (0x00000200) | CREATE_NO_WINDOW (0x08000000)
+        creationflags = 0x08000008 | 0x00000200
+        proc = subprocess.Popen(
+            [executable, str(refresher_script), str(mount_point), str(interval)],
+            creationflags=creationflags,
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            close_fds=True
+        )
+        pid_file = Path("C:/ProgramData/accli/refresher.pid")
+        try:
+            pid_file.parent.mkdir(parents=True, exist_ok=True)
+            pid_file.write_text(str(proc.pid), encoding="utf-8")
+        except Exception:
+            pass
+    except Exception:
+        pass
+
+
+def stop_windows_explorer_refresher():
+    """Stops any active background Explorer watcher process."""
+    import subprocess
+    from pathlib import Path
+    
+    pid_file = Path("C:/ProgramData/accli/refresher.pid")
+    if pid_file.is_file():
+        try:
+            pid_str = pid_file.read_text(encoding="utf-8").strip()
+            if pid_str:
+                subprocess.run(["taskkill", "/F", "/PID", pid_str], capture_output=True)
+        except Exception:
+            pass
+        try:
+            pid_file.unlink()
+        except Exception:
+            pass
+            
+    # Also clean up any lingering windows_refresher.py processes
+    try:
+        cleanup_cmd = [
+            "powershell.exe", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass", "-Command",
+            "Get-CimInstance Win32_Process -Filter \"name='python.exe' or name='pythonw.exe'\" | "
+            "Where-Object { $_.CommandLine -like '*windows_refresher.py*' } | "
+            "ForEach-Object { Stop-Process -Id $_.ProcessId -Force -ErrorAction SilentlyContinue }"
+        ]
+        subprocess.run(cleanup_cmd, capture_output=True)
+    except Exception:
+        pass
+
+
 def enable_windows_nfs_features():
     """Automatically check and enable Windows Client for NFS features, registry key, and Task Scheduler gateway if needed."""
     import subprocess
@@ -996,6 +1066,7 @@ def mount_start(
                     ]
                     mount_res = subprocess.run(mount_cmd, capture_output=True, text=True)
                     if mount_res.returncode == 0:
+                        start_windows_explorer_refresher(str(mount_point_abs), interval=30)
                         print(f"[bold green][OK] NFS mount successfully mapped at [white]{mount_point_abs}[/white]![/bold green]")
                         print("[cyan]Use 'umount' or 'accli mount stop' to unmount the drive.[/cyan]")
                         return
@@ -1049,6 +1120,7 @@ def mount_start(
                     print(f"[yellow]Please check the log file at {log_file_path} for more details.[/yellow]")
                     raise typer.Exit(1)
                     
+                start_windows_explorer_refresher(str(mount_point_abs), interval=30)
                 print(f"[bold green][OK] NFS mount process spawned successfully (PID: {process.pid}).[/bold green]")
                 print(f"[cyan]Use 'umount' or 'accli mount stop' to unmount the drive.[/cyan]")
             else:
@@ -1096,6 +1168,7 @@ def mount_start(
                 ]
                 mount_res = subprocess.run(mount_cmd, capture_output=True, text=True)
                 if mount_res.returncode == 0:
+                    start_windows_explorer_refresher(str(mount_point_abs), interval=30)
                     print(f"[bold green][OK] NFS mount successfully mapped at [white]{mount_point_abs}[/white]![/bold green]")
                     print("[cyan]Use 'umount' or 'accli mount stop' to unmount the drive.[/cyan]")
                 else:
@@ -1233,6 +1306,9 @@ def mount_stop(
         except Exception:
             is_admin = False
 
+        # 0. Stop Explorer background refresher
+        stop_windows_explorer_refresher()
+
         # 1. Unmap the network drive in the user session
         res = subprocess.run(["C:\\Windows\\System32\\umount.exe", "-f", str(mount_point_abs)], capture_output=True, text=True)
         if res.returncode != 0:

accli-2.0.4/accli/refresh_explorer.ps1

@@ -0,0 +1,12 @@
+$ErrorActionPreference = "SilentlyContinue"
+$mountPoint = $args[0]
+if (-not $mountPoint) { $mountPoint = "W:" }
+$mountClean = $mountPoint.TrimEnd("\/")
+
+$shell = New-Object -ComObject Shell.Application
+foreach ($win in $shell.Windows()) {
+    $url = $win.LocationURL
+    if ($url -and ($url -like "*$mountClean*" -or $win.Path -like "*$mountClean*")) {
+        $win.Refresh()
+    }
+}

accli-2.0.4/accli/windows_refresher.py

@@ -0,0 +1,159 @@
+import os
+import sys
+import time
+import ctypes
+import subprocess
+from pathlib import Path
+from datetime import datetime
+
+# Windows Shell Notification constants
+SHCNE_UPDATEDIR = 0x00001000
+SHCNF_PATHW = 0x0005
+
+
+def log(msg: str):
+    timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+    print(f"[{timestamp}] [Watcher] {msg}", flush=True)
+
+
+def notify_explorer(path_str: str):
+    """Notifies Windows Shell / Explorer to refresh views for path_str."""
+    log(f"Broadcasting SHChangeNotify on '{path_str}'...")
+    try:
+        ctypes.windll.shell32.SHChangeNotify(
+            SHCNE_UPDATEDIR,
+            SHCNF_PATHW,
+            path_str,
+            None
+        )
+    except Exception as e:
+        log(f"SHChangeNotify error: {e}")
+
+    try:
+        script_path = Path(__file__).parent / "refresh_explorer.ps1"
+        if script_path.is_file():
+            log(f"Executing COM window refresh for '{path_str}'...")
+            res = subprocess.run(
+                [
+                    "powershell.exe", "-NoProfile", "-NonInteractive", "-ExecutionPolicy", "Bypass",
+                    "-File", str(script_path), path_str
+                ],
+                capture_output=True,
+                text=True,
+                creationflags=0x08000000  # CREATE_NO_WINDOW
+            )
+            if res.stdout and res.stdout.strip():
+                log(f"COM output: {res.stdout.strip()}")
+            if res.stderr and res.stderr.strip():
+                log(f"COM error: {res.stderr.strip()}")
+            log("Explorer windows refreshed.")
+    except Exception as e:
+        log(f"COM refresh error: {e}")
+
+
+def scan_directory_state(root_path: Path):
+    """
+    Fast snapshot of directory state: mapping of relative_path -> (size, mtime_ns).
+    Returns None if root_path is not accessible or unmounted.
+    """
+    state = {}
+    try:
+        if not root_path.exists():
+            return None
+        
+        for root, dirs, files in os.walk(root_path):
+            for name in files:
+                full_path = os.path.join(root, name)
+                try:
+                    st = os.stat(full_path)
+                    rel = os.path.relpath(full_path, root_path)
+                    state[rel] = (st.st_size, st.st_mtime_ns)
+                except (OSError, PermissionError):
+                    continue
+            for name in dirs:
+                full_path = os.path.join(root, name)
+                try:
+                    st = os.stat(full_path)
+                    rel = os.path.relpath(full_path, root_path)
+                    state[rel] = (-1, st.st_mtime_ns)
+                except (OSError, PermissionError):
+                    continue
+        return state
+    except Exception:
+        return None
+
+
+def describe_changes(old_state, new_state):
+    old_keys = set(old_state.keys())
+    new_keys = set(new_state.keys())
+    added = new_keys - old_keys
+    removed = old_keys - new_keys
+    modified = {k for k in (old_keys & new_keys) if old_state[k] != new_state[k]}
+    
+    parts = []
+    if added:
+        parts.append(f"Added: {list(added)[:5]}")
+    if removed:
+        parts.append(f"Removed: {list(removed)[:5]}")
+    if modified:
+        parts.append(f"Modified: {list(modified)[:5]}")
+    return "; ".join(parts)
+
+
+def run_watcher(mount_point: str, interval: float):
+    """
+    Periodically inspects mount_point for remote additions/deletions/modifications.
+    Triggers Windows Shell & open Explorer window refreshes whenever changes are detected.
+    """
+    drive_root = mount_point.rstrip("\\/") + "\\"
+    root_path = Path(drive_root)
+    
+    log(f"Starting watcher on '{drive_root}' (poll interval: {interval}s)...")
+    
+    # Baseline snapshot
+    try:
+        last_state = scan_directory_state(root_path)
+    except Exception as e:
+        last_state = None
+        log(f"Initial scan error: {e}")
+
+    if last_state is not None:
+        log(f"Initial baseline snapshot indexed {len(last_state)} items on '{drive_root}'.")
+    else:
+        log(f"Warning: Could not read '{drive_root}'. Waiting for drive to become available...")
+    
+    while True:
+        try:
+            time.sleep(interval)
+        except (KeyboardInterrupt, SystemExit):
+            log("Watcher stopped.")
+            break
+        except Exception as e:
+            log(f"Sleep interrupted: {e}")
+            continue
+            
+        try:
+            current_state = scan_directory_state(root_path)
+            if current_state is None:
+                continue
+                
+            if last_state is not None:
+                if current_state != last_state:
+                    diff_summary = describe_changes(last_state, current_state)
+                    log(f"Change detected on '{drive_root}' -> {diff_summary}")
+                    notify_explorer(drive_root)
+                    last_state = current_state
+            else:
+                last_state = current_state
+                log(f"Baseline established: {len(last_state)} items found.")
+        except Exception as e:
+            log(f"Loop error: {e}")
+
+
+if __name__ == "__main__":
+    if len(sys.argv) < 3:
+        print("Usage: python windows_refresher.py <mount_point> <interval_seconds>")
+        sys.exit(1)
+    mp = sys.argv[1]
+    poll_int = float(sys.argv[2])
+    run_watcher(mp, poll_int)

{accli-2.0.3 → accli-2.0.4}/accli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accli
-Version: 2.0.3
+Version: 2.0.4
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)

{accli-2.0.3 → accli-2.0.4}/accli.egg-info/SOURCES.txt

@@ -13,8 +13,10 @@ accli/cli.py
 accli/common.py
 accli/gui.py
 accli/mount_downloader.py
+accli/refresh_explorer.ps1
 accli/setup-nfs.ps1
 accli/token.py
+accli/windows_refresher.py
 accli.egg-info/PKG-INFO
 accli.egg-info/SOURCES.txt
 accli.egg-info/dependency_links.txt