Make workspace indexer and JCR file system more robust.

[lgpl/argeo-commons.git] / org.argeo.jcr / src / org / argeo / jcr / fs / BinaryChannel.java

diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java b/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
index 94eb70482b6751ba3b7d62b98b138acab37a891f..d6550feeeb1b25509078c010bc817c0295630d9a 100644 (file)
--- a/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
+++ b/org.argeo.jcr/src/org/argeo/jcr/fs/BinaryChannel.java
@@ -12,8 +12,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
-import javax.activation.FileTypeMap;
-import javax.activation.MimetypesFileTypeMap;
 import javax.jcr.Binary;
 import javax.jcr.Node;
 import javax.jcr.Property;
@@ -23,6 +21,7 @@ import javax.jcr.nodetype.NodeType;
 
 import org.argeo.jcr.JcrUtils;
 
+/** A read/write {@link SeekableByteChannel} based on a {@link Binary}. */
 public class BinaryChannel implements SeekableByteChannel {
        private final Node file;
        private Binary binary;
@@ -30,43 +29,37 @@ public class BinaryChannel implements SeekableByteChannel {
 
        private long position = 0;
 
-       // private ByteBuffer toWrite;
        private FileChannel fc = null;
 
-       private static FileTypeMap fileTypeMap;
-
-       static {
-               try {
-                       fileTypeMap = new MimetypesFileTypeMap("/etc/mime.types");
-               } catch (IOException e) {
-                       fileTypeMap = FileTypeMap.getDefaultFileTypeMap();
-               }
-       }
-
-       public BinaryChannel(Node file) throws RepositoryException, IOException {
+       public BinaryChannel(Node file, Path path) throws RepositoryException, IOException {
                this.file = file;
-               // int capacity = 1024 * 1024;
-               // this.toWrite = ByteBuffer.allocate(capacity);
-               if (file.isNodeType(NodeType.NT_FILE)) {
-                       if (file.hasNode(Property.JCR_CONTENT)) {
-                               Node data = file.getNode(Property.JCR_CONTENT);
-                               this.binary = data.getProperty(Property.JCR_DATA).getBinary();
-                       } else {
-                               Node data = file.addNode(Property.JCR_CONTENT, NodeType.NT_RESOURCE);
-                               try (InputStream in = new ByteArrayInputStream(new byte[0])) {
-                                       this.binary = data.getSession().getValueFactory().createBinary(in);
+               Session session = file.getSession();
+               synchronized (session) {
+                       if (file.isNodeType(NodeType.NT_FILE)) {
+                               if (file.hasNode(Node.JCR_CONTENT)) {
+                                       Node data = file.getNode(Property.JCR_CONTENT);
+                                       this.binary = data.getProperty(Property.JCR_DATA).getBinary();
+                               } else {
+                                       Node data = file.addNode(Node.JCR_CONTENT, NodeType.NT_UNSTRUCTURED);
+                                       data.addMixin(NodeType.MIX_LAST_MODIFIED);
+                                       try (InputStream in = new ByteArrayInputStream(new byte[0])) {
+                                               this.binary = data.getSession().getValueFactory().createBinary(in);
+                                       }
+                                       data.setProperty(Property.JCR_DATA, this.binary);
+
+                                       // MIME type
+                                       String mime = Files.probeContentType(path);
+                                       // String mime = fileTypeMap.getContentType(file.getName());
+                                       data.setProperty(Property.JCR_MIMETYPE, mime);
+
+                                       session.refresh(true);
+                                       session.save();
+                                       session.notifyAll();
                                }
-                               data.setProperty(Property.JCR_DATA, this.binary);
-
-                               // MIME type
-                               String mime = fileTypeMap.getContentType(file.getName());
-                               data.setProperty(Property.JCR_MIMETYPE, mime);
-
-                               data.getSession().save();
+                       } else {
+                               throw new IllegalArgumentException(
+                                               "Unsupported file node " + file + " (" + file.getPrimaryNodeType() + ")");
                        }
-               } else {
-                       throw new IllegalArgumentException(
-                                       "Unsupported file node " + file + " (" + file.getPrimaryNodeType() + ")");
                }
        }
 
@@ -81,15 +74,16 @@ public class BinaryChannel implements SeekableByteChannel {
                        Binary newBinary = null;
                        try {
                                Session session = file.getSession();
-                               // byte[] arr = new byte[(int) position];
-                               // toWrite.flip();
-                               // toWrite.get(arr);
-                               fc.position(0);
-                               InputStream in = Channels.newInputStream(fc);
-                               newBinary = session.getValueFactory().createBinary(in);
-                               file.getNode(Property.JCR_CONTENT).setProperty(Property.JCR_DATA, newBinary);
-                               session.save();
-                               open = false;
+                               synchronized (session) {
+                                       fc.position(0);
+                                       InputStream in = Channels.newInputStream(fc);
+                                       newBinary = session.getValueFactory().createBinary(in);
+                                       file.getNode(Property.JCR_CONTENT).setProperty(Property.JCR_DATA, newBinary);
+                                       session.refresh(true);
+                                       session.save();
+                                       open = false;
+                                       session.notifyAll();
+                               }
                        } catch (RepositoryException e) {
                                throw new IOException("Cannot close " + file, e);
                        } finally {
@@ -113,20 +107,9 @@ public class BinaryChannel implements SeekableByteChannel {
 
                        try {
                                int read;
-                               // int capacity = dst.capacity();
                                byte[] arr = dst.array();
                                read = binary.read(arr, position);
-                               // dst.put(arr, 0, read);
-
-                               // try {
-                               // byte[] arr = dst.array();
-                               // read = binary.read(arr, position);
-                               // } catch (UnsupportedOperationException e) {
-                               // int capacity = dst.capacity();
-                               // byte[] arr = new byte[capacity];
-                               // read = binary.read(arr, position);
-                               // dst.put(arr);
-                               // }
+
                                if (read != -1)
                                        position = position + read;
                                return read;
@@ -140,15 +123,6 @@ public class BinaryChannel implements SeekableByteChannel {
        public int write(ByteBuffer src) throws IOException {
                int written = getFileChannel().write(src);
                return written;
-               // int byteCount = src.remaining();
-               // if (toWrite.remaining() < byteCount)
-               // throw new JcrFsException("Write buffer is full");
-               // toWrite.put(src);
-               // if (position < binarySize)
-               // position = binarySize + byteCount;
-               // else
-               // position = position + byteCount;
-               // return byteCount;
        }
 
        @Override
@@ -185,9 +159,6 @@ public class BinaryChannel implements SeekableByteChannel {
        @Override
        public SeekableByteChannel truncate(long size) throws IOException {
                getFileChannel().truncate(size);
-               // if (size != size())
-               // throw new UnsupportedOperationException("Cannot truncate JCR
-               // binary");
                return this;
        }