X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Facr%2Ffs%2FFsContent.java;h=77c2f7a7585fe778834ec9735635b749905581d1;hb=c0342975a37c70895c2e8f6b341d790700168d7f;hp=d0df8845f308a4fa5befbef1c60ef5ca953e2265;hpb=4c7e1885b8bf3c93fa0919ace122e3f289a925ea;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 d0df8845f..77c2f7a75 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
@@ -8,6 +8,7 @@ import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.FileTime;
 import java.nio.file.attribute.UserDefinedFileAttributeView;
 import java.time.Instant;
@@ -20,6 +21,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 
 import javax.xml.namespace.QName;
 
@@ -43,35 +45,35 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 	private static final Map<QName, String> POSIX_KEYS;
 	static {
 		BASIC_KEYS = new HashMap<>();
-		BASIC_KEYS.put(CrName.CREATION_TIME.get(), "basic:creationTime");
-		BASIC_KEYS.put(CrName.LAST_MODIFIED_TIME.get(), "basic:lastModifiedTime");
-		BASIC_KEYS.put(CrName.SIZE.get(), "basic:size");
-		BASIC_KEYS.put(CrName.FILE_KEY.get(), "basic:fileKey");
+		BASIC_KEYS.put(CrName.creationTime.qName(), "basic:creationTime");
+		BASIC_KEYS.put(CrName.lastModifiedTime.qName(), "basic:lastModifiedTime");
+		BASIC_KEYS.put(CrName.size.qName(), "basic:size");
+		BASIC_KEYS.put(CrName.fileKey.qName(), "basic:fileKey");
 
 		POSIX_KEYS = new HashMap<>(BASIC_KEYS);
-		POSIX_KEYS.put(CrName.OWNER.get(), "owner:owner");
-		POSIX_KEYS.put(CrName.GROUP.get(), "posix:group");
-		POSIX_KEYS.put(CrName.PERMISSIONS.get(), "posix:permissions");
+		POSIX_KEYS.put(CrName.owner.qName(), "owner:owner");
+		POSIX_KEYS.put(CrName.group.qName(), "posix:group");
+		POSIX_KEYS.put(CrName.permissions.qName(), "posix:permissions");
 	}
 
 	private final FsContentProvider provider;
 	private final Path path;
-	private final boolean isRoot;
+	private final boolean isMountBase;
 	private final QName name;
 
 	protected FsContent(ProvidedSession session, FsContentProvider contentProvider, Path path) {
 		super(session);
 		this.provider = contentProvider;
 		this.path = path;
-		this.isRoot = contentProvider.isMountRoot(path);
+		this.isMountBase = contentProvider.isMountBase(path);
 		// TODO check file names with ':' ?
-		if (isRoot) {
+		if (isMountBase) {
 			String mountPath = provider.getMountPath();
 			if (mountPath != null && !mountPath.equals("/")) {
 				Content mountPoint = session.getMountPoint(mountPath);
 				this.name = mountPoint.getName();
 			} else {
-				this.name = CrName.ROOT.get();
+				this.name = CrName.root.qName();
 			}
 		} else {
 
@@ -209,7 +211,7 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 			try {
 				return Files.list(path).map((p) -> {
 					FsContent fsContent = new FsContent(this, p);
-					Optional<String> isMount = fsContent.get(CrName.MOUNT.get(), String.class);
+					Optional<String> isMount = fsContent.get(CrName.mount.qName(), String.class);
 					if (isMount.orElse("false").equals("true")) {
 						QName[] classes = null;
 						ContentProvider contentProvider = getSession().getRepository()
@@ -233,7 +235,7 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 		FsContent fsContent;
 		try {
 			Path newPath = path.resolve(NamespaceUtils.toPrefixedName(provider, name));
-			if (ContentName.contains(classes, CrName.COLLECTION.get()))
+			if (ContentName.contains(classes, CrName.collection.qName()))
 				Files.createDirectory(newPath);
 			else
 				Files.createFile(newPath);
@@ -250,7 +252,7 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 			ContentProvider contentProvider = getSession().getRepository().getMountContentProvider(fsContent, true,
 					classes);
 			Content mountedContent = contentProvider.get(getSession(), "");
-			fsContent.put(CrName.MOUNT.get(), "true");
+			fsContent.put(CrName.mount.qName(), "true");
 			return mountedContent;
 
 		} else {
@@ -265,7 +267,7 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 
 	@Override
 	public Content getParent() {
-		if (isRoot) {
+		if (isMountBase) {
 			String mountPath = provider.getMountPath();
 			if (mountPath == null || mountPath.equals("/"))
 				return null;
@@ -305,10 +307,10 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 	 */
 
 	@Override
-	public List<QName> getTypes() {
+	public List<QName> getContentClasses() {
 		List<QName> res = new ArrayList<>();
 		if (Files.isDirectory(path))
-			res.add(CrName.COLLECTION.get());
+			res.add(CrName.collection.qName());
 		// TODO add other types
 		return res;
 	}
@@ -322,4 +324,24 @@ public class FsContent extends AbstractContent implements ProvidedContent {
 		return provider;
 	}
 
+	/*
+	 * READ / WRITE
+	 */
+	public <A> CompletableFuture<A> write(Class<A> clss) {
+		if (isContentClass(CrName.collection.qName())) {
+			throw new IllegalStateException("Cannot directly write to a collection");
+		}
+		if (InputStream.class.isAssignableFrom(clss)) {
+			CompletableFuture<InputStream> res = new CompletableFuture<>();
+			res.thenAccept((in) -> {
+				try {
+					Files.copy(in, path, StandardCopyOption.REPLACE_EXISTING);
+				} catch (IOException e) {
+					throw new RuntimeException("Cannot write to " + path, e);
+				}
+			});
+			return (CompletableFuture<A>) res;
+		}
+		return super.write(clss);
+	}
 }