X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Ffs%2FFsContent.java;h=c6266ee4fc2d8fd489be7171f9dcac104341d3ed;hb=cc1dd97ebcc32e1bd754073ad23def182f460452;hp=a2cc52c42850f54bd2d7e25258b3cab866f10993;hpb=584b2b87593892c6ded7b645425b603a4f554026;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
index a2cc52c42..c6266ee4f 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContent.java
@@ -24,13 +24,13 @@ import javax.xml.namespace.QName;
 import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentName;
 import org.argeo.api.acr.ContentResourceException;
-import org.argeo.api.acr.ContentUtils;
 import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.spi.AbstractContent;
 import org.argeo.api.acr.spi.ContentProvider;
 import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
+import org.argeo.cms.acr.ContentUtils;
 import org.argeo.util.FsUtils;
 
 public class FsContent extends AbstractContent implements ProvidedContent {
@@ -65,7 +65,7 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 		// TODO check file names with ':' ?
 		if (isRoot) {
 			String mountPath = provider.getMountPath();
-			if (mountPath != null) {
+			if (mountPath != null && !mountPath.equals("/")) {
 				Content mountPoint = session.getMountPoint(mountPath);
 				this.name = mountPoint.getName();
 			} else {
@@ -99,7 +99,26 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 		Object value;
 		try {
 			// We need to add user: when accessing via Files#getAttribute
-			value = Files.getAttribute(path, toFsAttributeKey(key));
+
+			if (POSIX_KEYS.containsKey(key)) {
+				value = Files.getAttribute(path, toFsAttributeKey(key));
+			} else {
+				UserDefinedFileAttributeView udfav = Files.getFileAttributeView(path,
+						UserDefinedFileAttributeView.class);
+				String prefixedName = NamespaceUtils.toPrefixedName(provider, key);
+				if (!udfav.list().contains(prefixedName))
+					return Optional.empty();
+				ByteBuffer buf = ByteBuffer.allocate(udfav.size(prefixedName));
+				udfav.read(prefixedName, buf);
+				buf.flip();
+				if (buf.hasArray())
+					value = buf.array();
+				else {
+					byte[] arr = new byte[buf.remaining()];
+					buf.get(arr);
+					value = arr;
+				}
+			}
 		} catch (IOException e) {
 			throw new ContentResourceException("Cannot retrieve attribute " + key + " for " + path, e);
 		}
@@ -239,7 +258,7 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 	public Content getParent() {
 		if (isRoot) {
 			String mountPath = provider.getMountPath();
-			if (mountPath == null)
+			if (mountPath == null || mountPath.equals("/"))
 				return null;
 			String[] parent = ContentUtils.getParentPath(mountPath);
 			return session.get(parent[0]);