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=b8bbddb5016d13c2b4136e8e525c9c6858958409;hpb=c615307d7b87bcb260d8a9f402c6e0a880862f38;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 b8bbddb50..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
@@ -1,6 +1,9 @@
 package org.argeo.cms.acr.fs;
 
+import java.io.Closeable;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -24,8 +27,10 @@ import org.argeo.api.acr.ContentResourceException;
 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 {
@@ -58,9 +63,15 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 		this.path = path;
 		this.isRoot = contentProvider.isRoot(path);
 		// TODO check file names with ':' ?
-		if (isRoot)
-			this.name = CrName.ROOT.get();
-		else {
+		if (isRoot) {
+			String mountPath = provider.getMountPath();
+			if (mountPath != null && !mountPath.equals("/")) {
+				Content mountPoint = session.getMountPoint(mountPath);
+				this.name = mountPoint.getName();
+			} else {
+				this.name = CrName.ROOT.get();
+			}
+		} else {
 			QName providerName = NamespaceUtils.parsePrefixedName(provider, path.getFileName().toString());
 			this.name = new ContentName(providerName, session);
 		}
@@ -88,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);
 		}
@@ -169,7 +199,19 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 	public Iterator<Content> iterator() {
 		if (Files.isDirectory(path)) {
 			try {
-				return Files.list(path).map((p) -> (Content) new FsContent(this, p)).iterator();
+				return Files.list(path).map((p) -> {
+					FsContent fsContent = new FsContent(this, p);
+					Optional<String> isMount = fsContent.get(CrName.MOUNT.get(), String.class);
+					if (isMount.orElse("false").equals("true")) {
+						QName[] classes = null;
+						ContentProvider contentProvider = session.getRepository().getMountContentProvider(fsContent,
+								false, classes);
+						Content mountedContent = contentProvider.get(session, fsContent.getPath(), "");
+						return mountedContent;
+					} else {
+						return (Content) fsContent;
+					}
+				}).iterator();
 			} catch (IOException e) {
 				throw new ContentResourceException("Cannot list " + path, e);
 			}
@@ -180,6 +222,7 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 
 	@Override
 	public Content add(QName name, QName... classes) {
+		FsContent fsContent;
 		try {
 			Path newPath = path.resolve(NamespaceUtils.toPrefixedName(provider, name));
 			if (ContentName.contains(classes, CrName.COLLECTION.get()))
@@ -190,10 +233,20 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 //		for(ContentClass clss:classes) {
 //			Files.setAttribute(newPath, name, newPath, null)
 //		}
-			return new FsContent(this, newPath);
+			fsContent = new FsContent(this, newPath);
 		} catch (IOException e) {
 			throw new ContentResourceException("Cannot create new content", e);
 		}
+
+		if (session.getRepository().shouldMount(classes)) {
+			ContentProvider contentProvider = session.getRepository().getMountContentProvider(fsContent, true, classes);
+			Content mountedContent = contentProvider.get(session, fsContent.getPath(), "");
+			fsContent.put(CrName.MOUNT.get(), "true");
+			return mountedContent;
+
+		} else {
+			return fsContent;
+		}
 	}
 
 	@Override
@@ -203,11 +256,40 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 
 	@Override
 	public Content getParent() {
-		if (isRoot)
-			return null;// TODO deal with mounts
+		if (isRoot) {
+			String mountPath = provider.getMountPath();
+			if (mountPath == null || mountPath.equals("/"))
+				return null;
+			String[] parent = ContentUtils.getParentPath(mountPath);
+			return session.get(parent[0]);
+		}
 		return new FsContent(this, path.getParent());
 	}
 
+	@Override
+	public <C extends Closeable> C open(Class<C> clss) throws IOException, IllegalArgumentException {
+		if (InputStream.class.isAssignableFrom(clss)) {
+			if (Files.isDirectory(path))
+				throw new UnsupportedOperationException("Cannot open " + path + " as stream, since it is a directory");
+			return (C) Files.newInputStream(path);
+		} else if (OutputStream.class.isAssignableFrom(clss)) {
+			if (Files.isDirectory(path))
+				throw new UnsupportedOperationException("Cannot open " + path + " as stream, since it is a directory");
+			return (C) Files.newOutputStream(path);
+		}
+		return super.open(clss);
+	}
+
+	/*
+	 * MOUNT MANAGEMENT
+	 */
+	@Override
+	public ProvidedContent getMountPoint(String relativePath) {
+		Path childPath = path.resolve(relativePath);
+		// TODO check that it is a mount
+		return new FsContent(this, childPath);
+	}
+
 	/*
 	 * ACCESSORS
 	 */