Small fixes [stage]

app/src/main/java/io/xpipe/app/browser/file/BrowserFileListComp.java

@@ -136,7 +136,7 @@ public final class BrowserFileListComp extends SimpleComp {
         table.setFixedCellSize(32.0);
         var os = fileList.getFileSystemModel().getFileSystem().getShell().orElseThrow().getOsType();
         table.widthProperty().subscribe((newValue) -> {
-            if (os != OsType.WINDOWS) {
+            if (os != OsType.WINDOWS && os != OsType.MACOS) {
                 ownerCol.setVisible(newValue.doubleValue() > 1000);
             }
             var width = getFilenameWidth(table);
@@ -441,7 +441,7 @@ public final class BrowserFileListComp extends SimpleComp {
 
                 if (fileList.getFileSystemModel().getFileSystem() != null) {
                     var shell = fileList.getFileSystemModel().getFileSystem().getShell().orElseThrow();
-                    if (OsType.WINDOWS.equals(shell.getOsType())) {
+                    if (OsType.WINDOWS.equals(shell.getOsType()) || OsType.MACOS.equals(shell.getOsType())) {
                         modeCol.setVisible(false);
                         ownerCol.setVisible(false);
                     } else {

app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemCache.java

@@ -47,20 +47,20 @@ public class OpenFileSystemCache extends ShellControlCache {
         var lines = sc.command(CommandBuilder.of().add("cat").addFile("/etc/passwd")).readStdoutOrThrow();
         lines.lines().forEach(s -> {
             var split = s.split(":");
-            users.put(Integer.parseInt(split[2]), split[0]);
+            users.putIfAbsent(Integer.parseInt(split[2]), split[0]);
         });
     }
 
     private void loadGroups() throws Exception {
         var sc = model.getFileSystem().getShell().orElseThrow();
-        if (sc.getOsType() == OsType.WINDOWS) {
+        if (sc.getOsType() == OsType.WINDOWS || sc.getOsType() == OsType.MACOS) {
             return;
         }
 
         var lines = sc.command(CommandBuilder.of().add("cat").addFile("/etc/group")).readStdoutOrThrow();
         lines.lines().forEach(s -> {
             var split = s.split(":");
-            groups.put(Integer.parseInt(split[2]), split[0]);
+            groups.putIfAbsent(Integer.parseInt(split[2]), split[0]);
         });
     }
 

dist/changelogs/11.0.md

@@ -42,6 +42,7 @@ Up until now, if you added a connection that always allocated pty, XPipe would c
 - Fix script enabled status being wrong after editing an enabled script
 - Fix download move operation failing when moving a directory that already existed in the downloads folder
 - Fix some scrollbars are necessarily showing
+- There is now support to view and change users/groups in the file browser
 - External git vault data files are now also encrypted by default
 - Rework state information display for proxmox VMs
 - Automatically fill identity file for ssh config wildcard keys as well

ext/base/src/main/java/io/xpipe/ext/base/browser/ChgrpAction.java

@@ -33,13 +33,14 @@ public class ChgrpAction implements BranchAction {
 
     @Override
     public boolean isApplicable(OpenFileSystemModel model, List<BrowserEntry> entries) {
-        return model.getFileSystem().getShell().orElseThrow().getOsType() != OsType.WINDOWS;
+        var os = model.getFileSystem().getShell().orElseThrow().getOsType();
+        return os != OsType.WINDOWS && os != OsType.MACOS;
     }
 
     @Override
     public List<LeafAction> getBranchingActions(OpenFileSystemModel model, List<BrowserEntry> entries) {
         return model.getCache().getGroups().entrySet().stream()
-                .filter(e -> !e.getValue().equals("nogroup") && (e.getKey().equals(0) || e.getKey() >= 1000))
+                .filter(e -> !e.getValue().equals("nohome") && !e.getValue().equals("nogroup") && !e.getValue().equals("nobody") && (e.getKey().equals(0) || e.getKey() >= 1000))
                 .map(e -> e.getValue()).map(s -> (LeafAction) new Chgrp(s)).toList();
     }
 

ext/base/src/main/java/io/xpipe/ext/base/browser/ChownAction.java

@@ -33,13 +33,14 @@ public class ChownAction implements BranchAction {
 
     @Override
     public boolean isApplicable(OpenFileSystemModel model, List<BrowserEntry> entries) {
-        return model.getFileSystem().getShell().orElseThrow().getOsType() != OsType.WINDOWS;
+        var os = model.getFileSystem().getShell().orElseThrow().getOsType();
+        return os != OsType.WINDOWS && os != OsType.MACOS;
     }
 
     @Override
     public List<LeafAction> getBranchingActions(OpenFileSystemModel model, List<BrowserEntry> entries) {
         return model.getCache().getUsers().entrySet().stream()
-                .filter(e -> !e.getValue().equals("nobody") && (e.getKey().equals(0) || e.getKey() >= 1000))
+                .filter(e -> !e.getValue().equals("nohome") && !e.getValue().equals("nobody") && (e.getKey().equals(0) || e.getKey() >= 1000))
                 .map(e -> e.getValue()).map(s -> (LeafAction) new Chown(s)).toList();
     }
 

version

@@ -1 +1 @@
-11.0-11
+11.0-12