X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Ffs%2FFsContentProvider.java;h=9d696b07f1cbcf6609f50c29017576250af228f0;hb=da9d144b6b241e1526a3bd255dff905a7969a5bc;hp=3445733e18a13ff1727c20fb139ed82c9ba49c5f;hpb=e3db2eba9a7f8380a6f76d7b0e6cd4825e91893e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
index 3445733e1..9d696b07f 100644
--- a/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
+++ b/org.argeo.cms/src/org/argeo/cms/acr/fs/FsContentProvider.java
@@ -9,14 +9,15 @@ import java.nio.file.attribute.UserDefinedFileAttributeView;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NavigableMap;
+import java.util.Objects;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
 
-import org.argeo.api.acr.Content;
 import org.argeo.api.acr.ContentResourceException;
 import org.argeo.api.acr.CrName;
 import org.argeo.api.acr.NamespaceUtils;
 import org.argeo.api.acr.spi.ContentProvider;
+import org.argeo.api.acr.spi.ProvidedContent;
 import org.argeo.api.acr.spi.ProvidedSession;
 
 /** Access a file system as a {@link ContentProvider}. */
@@ -25,21 +26,34 @@ public class FsContentProvider implements ContentProvider {
 
 	private final String mountPath;
 	private final Path rootPath;
-	private final boolean isRoot;
+//	private final boolean isRoot;
 
 	private NavigableMap<String, String> prefixes = new TreeMap<>();
 
-	public FsContentProvider(String mountPath, Path rootPath, boolean isRoot) {
+	public FsContentProvider(String mountPath, Path rootPath) {
+		Objects.requireNonNull(mountPath);
+		Objects.requireNonNull(rootPath);
+
 		this.mountPath = mountPath;
 		this.rootPath = rootPath;
-		this.isRoot = isRoot;
+		// FIXME make it more robust
 		initNamespaces();
 	}
 
-	protected void initNamespaces() {
+//	@Deprecated
+//	public FsContentProvider(String mountPath, Path rootPath, boolean isRoot) {
+//		this.mountPath = mountPath;
+//		this.rootPath = rootPath;
+////		this.isRoot = isRoot;
+////		initNamespaces();
+//	}
+
+	private void initNamespaces() {
 		try {
 			UserDefinedFileAttributeView udfav = Files.getFileAttributeView(rootPath,
 					UserDefinedFileAttributeView.class);
+			if (udfav == null)
+				return;
 			for (String name : udfav.list()) {
 				if (name.startsWith(XMLNS_)) {
 					ByteBuffer buf = ByteBuffer.allocate(udfav.size(name));
@@ -83,23 +97,22 @@ public class FsContentProvider implements ContentProvider {
 		}
 
 	}
-	
-	
-@Override
+
+	@Override
 	public String getMountPath() {
 		return mountPath;
 	}
 
-	boolean isRoot(Path path) {
+	boolean isMountRoot(Path path) {
 		try {
-			return isRoot && Files.isSameFile(rootPath, path);
+			return Files.isSameFile(rootPath, path);
 		} catch (IOException e) {
 			throw new ContentResourceException(e);
 		}
 	}
 
 	@Override
-	public Content get(ProvidedSession session, String mountPath, String relativePath) {
+	public ProvidedContent get(ProvidedSession session, String relativePath) {
 		return new FsContent(session, this, rootPath.resolve(relativePath));
 	}
 
@@ -107,6 +120,11 @@ public class FsContentProvider implements ContentProvider {
 	 * NAMESPACE CONTEXT
 	 */
 
+	@Override
+	public boolean exists(ProvidedSession session, String relativePath) {
+		return Files.exists(rootPath.resolve(relativePath));
+	}
+
 	@Override
 	public String getNamespaceURI(String prefix) {
 		return NamespaceUtils.getNamespaceURI((p) -> prefixes.get(p), prefix);