beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-25 00:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix owner info NPEs

Browse source
This commit is contained in:
crschnick 2024-08-28 23:10:30 +00:00
parent 2831e8372a
commit 3a700643f0
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -189,10 +189,10 @@ public final class BrowserFileListComp extends SimpleComp {
var m = fileList.getFileSystemModel(); var m = fileList.getFileSystemModel();
var user = unix.getUser() != null var user = unix.getUser() != null
? unix.getUser() ? unix.getUser()
: m.getCache().getUsers().get(unix.getUid()); : m.getCache().getUsers().getOrDefault(unix.getUid(), "?");
var group = unix.getGroup() != null var group = unix.getGroup() != null
? unix.getGroup() ? unix.getGroup()
: m.getCache().getGroups().get(unix.getGid()); : m.getCache().getGroups().getOrDefault(unix.getGid(), "?");
var uid = String.valueOf( var uid = String.valueOf(
unix.getUid() != null ? unix.getUid() : m.getCache().getUidForUser(user)); unix.getUid() != null ? unix.getUid() : m.getCache().getUidForUser(user));
var gid = String.valueOf( var gid = String.valueOf(

8
app/src/main/java/io/xpipe/app/browser/fs/OpenFileSystemCache.java
View file

@ -58,7 +58,9 @@ public class OpenFileSystemCache extends ShellControlCache {
.orElse(""); .orElse("");
lines.lines().forEach(s -> { lines.lines().forEach(s -> {
var split = s.split(":"); var split = s.split(":");
users.putIfAbsent(Integer.parseInt(split[2]), split[0]); try {
users.putIfAbsent(Integer.parseInt(split[2]), split[0]);
} catch (NumberFormatException ignored) {}
}); });
if (users.isEmpty()) { if (users.isEmpty()) {
@ -77,7 +79,9 @@ public class OpenFileSystemCache extends ShellControlCache {
.orElse(""); .orElse("");
lines.lines().forEach(s -> { lines.lines().forEach(s -> {
var split = s.split(":"); var split = s.split(":");
groups.putIfAbsent(Integer.parseInt(split[2]), split[0]); try {
groups.putIfAbsent(Integer.parseInt(split[2]), split[0]);
} catch (NumberFormatException ignored) {}
}); });
if (groups.isEmpty()) { if (groups.isEmpty()) {