X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.jcr%2Fsrc%2Forg%2Fargeo%2Fjcr%2Ffs%2FJcrFileSystemProvider.java;h=74d9a198e71299e8a08af786494792c74752afb6;hb=46cc2039ac20703c484aa994b830a2da113f2c97;hp=85c2bcfd0c7ad5552a2dadc3a492359267e49e38;hpb=5d7dadc47fe52f2dcfe2cd13a4165ad4e3ffbb57;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
index 85c2bcfd0..74d9a198e 100644
--- a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java
@@ -2,7 +2,6 @@ package org.argeo.jcr.fs;
 
 import java.io.IOException;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.charset.Charset;
 import java.nio.file.AccessMode;
 import java.nio.file.CopyOption;
 import java.nio.file.DirectoryNotEmptyException;
@@ -26,14 +25,15 @@ import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.PropertyIterator;
 import javax.jcr.PropertyType;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.PropertyDefinition;
 
-import org.apache.commons.io.FileExistsException;
 import org.argeo.jcr.JcrUtils;
 
+/** Operations on a {@link JcrFileSystem}. */
 public abstract class JcrFileSystemProvider extends FileSystemProvider {
 
 	@Override
@@ -50,13 +50,14 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 					throw new IOException(path + " parent is a file");
 
 				String fileName = path.getFileName().toString();
+				fileName = Text.escapeIllegalJcrChars(fileName);
 				node = parent.addNode(fileName, NodeType.NT_FILE);
 				node.addMixin(NodeType.MIX_CREATED);
-				node.addMixin(NodeType.MIX_LAST_MODIFIED);
+//				node.addMixin(NodeType.MIX_LAST_MODIFIED);
 			}
 			if (!node.isNodeType(NodeType.NT_FILE))
 				throw new UnsupportedOperationException(node + " must be a file");
-			return new BinaryChannel(node);
+			return new BinaryChannel(node, path);
 		} catch (RepositoryException e) {
 			discardChanges(node);
 			throw new IOException("Cannot read file", e);
@@ -67,7 +68,10 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 	public DirectoryStream<Path> newDirectoryStream(Path dir, Filter<? super Path> filter) throws IOException {
 		try {
 			Node base = toNode(dir);
-			return new NodeDirectoryStream((JcrFileSystem) dir.getFileSystem(), base.getNodes(), filter);
+			if (base == null)
+				throw new IOException(dir + " is not a JCR node");
+			JcrFileSystem fileSystem = (JcrFileSystem) dir.getFileSystem();
+			return new NodeDirectoryStream(fileSystem, base.getNodes(), fileSystem.listDirectMounts(dir), filter);
 		} catch (RepositoryException e) {
 			throw new IOException("Cannot list directory", e);
 		}
@@ -81,17 +85,21 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 				Node parent = toNode(dir.getParent());
 				if (parent == null)
 					throw new IOException("Parent of " + dir + " does not exist");
-				if (parent.getPrimaryNodeType().isNodeType(NodeType.NT_FILE)
-						|| parent.getPrimaryNodeType().isNodeType(NodeType.NT_LINKED_FILE))
-					throw new IOException(dir + " parent is a file");
-				String fileName = dir.getFileName().toString();
-				node = parent.addNode(fileName, NodeType.NT_FOLDER);
-				node.addMixin(NodeType.MIX_CREATED);
-				node.addMixin(NodeType.MIX_LAST_MODIFIED);
-				node.getSession().save();
+				Session session = parent.getSession();
+				synchronized (session) {
+					if (parent.getPrimaryNodeType().isNodeType(NodeType.NT_FILE)
+							|| parent.getPrimaryNodeType().isNodeType(NodeType.NT_LINKED_FILE))
+						throw new IOException(dir + " parent is a file");
+					String fileName = dir.getFileName().toString();
+					fileName = Text.escapeIllegalJcrChars(fileName);
+					node = parent.addNode(fileName, NodeType.NT_FOLDER);
+					node.addMixin(NodeType.MIX_CREATED);
+					node.addMixin(NodeType.MIX_LAST_MODIFIED);
+					save(session);
+				}
 			} else {
-				if (!node.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER))
-					throw new FileExistsException(dir + " exists and is not a directory");
+				// if (!node.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER))
+				// throw new FileExistsException(dir + " exists and is not a directory");
 			}
 		} catch (RepositoryException e) {
 			discardChanges(node);
@@ -106,14 +114,17 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 			if (node == null)
 				throw new NoSuchFileException(path + " does not exist");
 			Session session = node.getSession();
-			if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FILE))
-				node.remove();
-			else if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER)) {
-				if (node.hasNodes())// TODO check only files
-					throw new DirectoryNotEmptyException(path.toString());
-				node.remove();
+			synchronized (session) {
+				session.refresh(false);
+				if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FILE))
+					node.remove();
+				else if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER)) {
+					if (node.hasNodes())// TODO check only files
+						throw new DirectoryNotEmptyException(path.toString());
+					node.remove();
+				}
+				save(session);
 			}
-			session.save();
 		} catch (RepositoryException e) {
 			discardChanges(node);
 			throw new IOException("Cannot delete " + path, e);
@@ -126,8 +137,11 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 		Node sourceNode = toNode(source);
 		Node targetNode = toNode(target);
 		try {
-			JcrUtils.copy(sourceNode, targetNode);
-			sourceNode.getSession().save();
+			Session targetSession = targetNode.getSession();
+			synchronized (targetSession) {
+				JcrUtils.copy(sourceNode, targetNode);
+				save(targetSession);
+			}
 		} catch (RepositoryException e) {
 			discardChanges(sourceNode);
 			discardChanges(targetNode);
@@ -137,15 +151,32 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 
 	@Override
 	public void move(Path source, Path target, CopyOption... options) throws IOException {
-		Node sourceNode = toNode(source);
+		JcrFileSystem sourceFileSystem = (JcrFileSystem) source.getFileSystem();
+		WorkspaceFileStore sourceStore = sourceFileSystem.getFileStore(source.toString());
+		WorkspaceFileStore targetStore = sourceFileSystem.getFileStore(target.toString());
 		try {
-			Session session = sourceNode.getSession();
-			session.move(sourceNode.getPath(), target.toString());
-			session.save();
+			if (sourceStore.equals(targetStore)) {
+				sourceStore.getWorkspace().move(sourceStore.toJcrPath(source.toString()),
+						targetStore.toJcrPath(target.toString()));
+			} else {
+				// TODO implement it
+				throw new UnsupportedOperationException("Can only move paths within the same workspace.");
+			}
 		} catch (RepositoryException e) {
-			discardChanges(sourceNode);
 			throw new IOException("Cannot move from " + source + " to " + target, e);
 		}
+
+//		Node sourceNode = toNode(source);
+//		try {
+//			Session session = sourceNode.getSession();
+//			synchronized (session) {
+//				session.move(sourceNode.getPath(), target.toString());
+//				save(session);
+//			}
+//		} catch (RepositoryException e) {
+//			discardChanges(sourceNode);
+//			throw new IOException("Cannot move from " + source + " to " + target, e);
+//		}
 	}
 
 	@Override
@@ -169,25 +200,21 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 
 	@Override
 	public boolean isHidden(Path path) throws IOException {
-		return false;
+		return path.getFileName().toString().charAt(0) == '.';
 	}
 
 	@Override
 	public FileStore getFileStore(Path path) throws IOException {
-		Session session = ((JcrFileSystem) path.getFileSystem()).getSession();
-		return new WorkSpaceFileStore(session.getWorkspace());
+		JcrFileSystem fileSystem = (JcrFileSystem) path.getFileSystem();
+		return fileSystem.getFileStore(path.toString());
 	}
 
 	@Override
 	public void checkAccess(Path path, AccessMode... modes) throws IOException {
-		try {
-			Session session = ((JcrFileSystem) path.getFileSystem()).getSession();
-			if (!session.itemExists(path.toString()))
-				throw new NoSuchFileException(path + " does not exist");
-			// TODO check access via JCR api
-		} catch (RepositoryException e) {
-			throw new IOException("Cannot delete " + path, e);
-		}
+		Node node = toNode(path);
+		if (node == null)
+			throw new NoSuchFileException(path + " does not exist");
+		// TODO check access via JCR api
 	}
 
 	@Override
@@ -251,14 +278,17 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 	public void setAttribute(Path path, String attribute, Object value, LinkOption... options) throws IOException {
 		Node node = toNode(path);
 		try {
-			if (value instanceof byte[]) {
-				JcrUtils.setBinaryAsBytes(node, attribute, (byte[]) value);
-			} else if (value instanceof Calendar) {
-				node.setProperty(attribute, (Calendar) value);
-			} else {
-				node.setProperty(attribute, value.toString());
+			Session session = node.getSession();
+			synchronized (session) {
+				if (value instanceof byte[]) {
+					JcrUtils.setBinaryAsBytes(node, attribute, (byte[]) value);
+				} else if (value instanceof Calendar) {
+					node.setProperty(attribute, (Calendar) value);
+				} else {
+					node.setProperty(attribute, value.toString());
+				}
+				save(session);
 			}
-			node.getSession().save();
 		} catch (RepositoryException e) {
 			discardChanges(node);
 			throw new IOException("Cannot set attribute " + attribute + " on " + path, e);
@@ -287,13 +317,21 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
 		}
 	}
 
+	/** Make sure save is robust. */
+	protected void save(Session session) throws RepositoryException {
+		session.refresh(true);
+		session.save();
+		session.notifyAll();
+	}
+
 	/**
 	 * To be overriden in order to support the ~ path, with an implementation
 	 * specific concept of user home.
 	 * 
 	 * @return null by default
 	 */
-	public Node getUserHome(Session session) {
+	public Node getUserHome(Repository session) {
 		return null;
 	}
+
 }