- * If no modes are provided to check for, this simply checks for the
- * existence of the path.
- *
- *
- * @param path the path to check
- * @param modes the modes to check for, if any
- * @throws IOException filesystem level error, or a plain I/O error
- * if you use this with javafs (jnr-fuse), you should throw {@link NoSuchFileException} when the file not found.
- * @see FileSystemProvider#checkAccess(Path, AccessMode...)
- */
- @Override
- protected void checkAccessImpl(final Path path, final AccessMode... modes) throws IOException {
- final OneItem entry = cache.getEntry(path);
-
- if (!entry.isFile()) {
- return;
- }
-
- // TODO: assumed; not a file == directory
- for (final AccessMode mode : modes) {
- if (mode == AccessMode.EXECUTE) {
- throw new AccessDeniedException(path.toString());
- }
- }
+ protected OneItem copyEntry(OneItem sourceEntry, OneItem targetParentEntry, Path source, Path target, Set options) throws IOException {
+ OneFile newEntry = asFile(sourceEntry).copy(asFolder(targetParentEntry), toFilenameString(target));
+Debug.println(newEntry.getParentFolder().getName() + "/" + newEntry.getName());
+ return OneItem.class.cast(newEntry);
}
@Override
- public void close() throws IOException {
- // TODO: what to do here? OneDriveClient does not implement Closeable :(
+ protected OneItem moveEntry(OneItem sourceEntry, OneItem targetParentEntry, Path source, Path target, boolean targetIsParent) throws IOException {
+ return asFile(sourceEntry).move(asFolder(targetParentEntry));
}
- /**
- * @throws IOException if you use this with javafs (jnr-fuse), you should throw {@link NoSuchFileException} when the file not found.
- */
- @Nonnull
@Override
- protected Object getPathMetadataImpl(final Path path) throws IOException {
- return cache.getEntry(path);
- }
-
- /** */
- private List getDirectoryEntries(Path dir) throws IOException, OneDriveException {
- final OneItem entry = cache.getEntry(dir);
-
- if (!entry.isFolder()) {
- throw new NotDirectoryException(dir.toString());
- }
-
- List list = null;
- if (cache.containsFolder(dir)) {
- list = cache.getFolder(dir);
- } else {
- final List children = OneFolder.class.cast(entry).getChildren();
- list = new ArrayList<>(children.size());
-
- for (final OneItem child : children) {
- Path childPath = dir.resolve(child.getName());
- list.add(childPath);
-//System.err.println("child: " + childPath.toRealPath().toString());
-
- cache.putFile(childPath, child);
- }
-
- cache.putFolder(dir, list);
- }
-
- return list;
- }
-
- /** */
- private void removeEntry(Path path) throws IOException, OneDriveException {
- OneItem entry = cache.getEntry(path);
- if (entry.isFolder()) {
- // TODO use cache ???
- final List children = client.getFolderByPath(toPathString(path)).getChildren();
-
- if (children.size() > 0) {
- throw new DirectoryNotEmptyException(path.toString());
- }
- }
-
- // TODO: unknown what happens when a move operation is performed
- // and the target already exists
- entry.delete();
-
- cache.removeEntry(path);
+ protected OneItem moveFolderEntry(OneItem sourceEntry, OneItem targetParentEntry, Path source, Path target, boolean targetIsParent) throws IOException {
+ OneItem newEntry = asFolder(sourceEntry).move(asFolder(targetParentEntry));
+Debug.println(newEntry.getParentFolder().getName() + "/" + newEntry.getName());
+ return newEntry;
}
- /** */
- private void copyEntry(final Path source, final Path target) throws IOException, OneDriveException {
- try {
- OneItem sourceEntry = cache.getEntry(source);
- OneItem targetParentEntry = cache.getEntry(target.getParent());
- if (sourceEntry.isFile()) {
- OneFile newEntry = OneFile.class.cast(sourceEntry).copy(OneFolder.class.cast(targetParentEntry), toFilenameString(target));
-Debug.println(newEntry.getParentFolder().getName() + "/" + newEntry.getName());
- cache.addEntry(target, OneItem.class.cast(newEntry));
- } else if (sourceEntry.isFolder()) {
- throw new IsDirectoryException("source can not be a folder: " + source);
- }
- } catch (ParseException | InterruptedException e) {
- throw new IOException(e);
- }
+ @Override
+ protected OneItem renameEntry(OneItem sourceEntry, OneItem targetParentEntry, Path source, Path target) throws IOException {
+ return sourceEntry.rename(asFolder(targetParentEntry), toFilenameString(target));
}
- /**
- * @param targetIsParent if the target is folder
- */
- private void moveEntry(final Path source, final Path target, boolean targetIsParent) throws IOException, OneDriveException {
- try {
- OneItem sourceEntry = cache.getEntry(source);
- OneItem targetParentEntry = cache.getEntry(targetIsParent ? target : target.getParent());
- if (sourceEntry.isFile()) {
- OneItem newEntry = OneFile.class.cast(sourceEntry).move(OneFolder.class.cast(targetParentEntry));
- cache.removeEntry(source);
- if (targetIsParent) {
- cache.addEntry(target.resolve(source.getFileName()), newEntry);
- } else {
- cache.addEntry(target, newEntry);
- }
- } else if (sourceEntry.isFolder()) {
- OneItem newEntry = OneFolder.class.cast(sourceEntry).move(OneFolder.class.cast(targetParentEntry));
-Debug.println(newEntry.getParentFolder().getName() + "/" + newEntry.getName());
- cache.moveEntry(source, target, newEntry);
- }
- } catch (ParseException | InterruptedException e) {
- throw new IOException(e);
- }
+ @Override
+ public void close() throws IOException {
+ client.disconnect();
}
- /** */
- private void renameEntry(final Path source, final Path target) throws IOException, OneDriveException {
+ @Nonnull
+ @Override
+ public WatchService newWatchService() {
try {
- OneItem sourceEntry = cache.getEntry(source);
- OneItem targetEntry = cache.getEntry(target.getParent());
-
- OneItem newEntry = sourceEntry.rename(OneFolder.class.cast(targetEntry), toFilenameString(target));
-
- cache.removeEntry(source);
- cache.addEntry(target, newEntry);
- } catch (ParseException | InterruptedException e) {
- throw new IOException(e);
+ return new OneDriveWatchService(client);
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
}
}
}
diff --git a/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveFileSystemProvider.java b/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveFileSystemProvider.java
index 40f42689..c8fd37fb 100644
--- a/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveFileSystemProvider.java
+++ b/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveFileSystemProvider.java
@@ -26,6 +26,8 @@ public final class OneDriveFileSystemProvider extends FileSystemProviderBase {
public static final String ENV_APP_CREDENTIAL = "app_credential";
+ public static final String ENV_USE_SYSTEM_WATCHER = "use_system_watcher";
+
public OneDriveFileSystemProvider() {
super(new OneDriveFileSystemRepository());
}
diff --git a/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveFileSystemRepository.java b/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveFileSystemRepository.java
index 8c8db68a..084db41c 100644
--- a/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveFileSystemRepository.java
+++ b/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveFileSystemRepository.java
@@ -44,7 +44,7 @@
public final class OneDriveFileSystemRepository extends FileSystemRepositoryBase {
public OneDriveFileSystemRepository() {
- super("onedrive", new OneDriveFileSystemFactoryProvider());
+ super("onedrive1", new OneDriveFileSystemFactoryProvider());
}
/**
@@ -88,7 +88,7 @@ public FileSystemDriver createDriver(final URI uri, final Map env) th
OneDriveSDK client = OneDriveFactory.createOneDriveSDK(appCredential.getClientId(),
appCredential.getClientSecret(),
appCredential.getRedirectUrl(),
- OneDriveScope.OFFLINE_ACCESS);
+ OneDriveScope.valueOfByMicrosoftScopeString(appCredential.getScope()));
String url = client.getAuthenticationURL();
MicrosoftOAuth2 oauth2 = new MicrosoftOAuth2(wrap(appCredential, url), userCredential.getId());
@@ -123,7 +123,7 @@ public FileSystemDriver createDriver(final URI uri, final Map env) th
return new OneDriveFileSystemDriver(fileStore, factoryProvider, client, env);
} catch (OneDriveException e) {
- throw new IllegalStateException(e);
+ throw new IOException(e);
}
}
}
diff --git a/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveUploadOption.java b/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveUploadOption.java
index 55482580..b832f58d 100644
--- a/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveUploadOption.java
+++ b/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveUploadOption.java
@@ -14,6 +14,10 @@
/**
* OneDriveUploadOption.
*
+ * in {@link com.github.fge.filesystem.options.FileSystemOptionsFactory},
+ * instances of this class are compared by contains method. so i override
+ * {@link #equals(Object)} and {@link #hashCode()}.
+ *
* TODO CopyOption doesn't work.
*
* @author Naohide Sano (umjammer)
@@ -21,6 +25,9 @@
*/
public class OneDriveUploadOption implements OpenOption, CopyOption {
+ /** */
+ private static final long serialVersionUID = -3760090552182064957L;
+
/** */
private Path source;
@@ -41,7 +48,7 @@ public boolean equals(Object other) {
@Override
public int hashCode() {
- return Long.hashCode(-3760090552182064957L); // TODO ad-hoc
+ return Long.hashCode(serialVersionUID); // TODO ad-hoc
}
}
diff --git a/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveWatchService.java b/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveWatchService.java
new file mode 100644
index 00000000..fcfda7a8
--- /dev/null
+++ b/vavi-nio-file-onedrive/src/main/java/vavi/nio/file/onedrive/OneDriveWatchService.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2020 by Naohide Sano, All rights reserved.
+ *
+ * Programmed by Naohide Sano
+ */
+
+package vavi.nio.file.onedrive;
+
+import java.io.IOException;
+
+import vavi.nio.file.watch.webhook.WebHookBaseWatchService;
+import vavi.util.Debug;
+
+import de.tuberlin.onedrivesdk.OneDriveSDK;
+
+
+/**
+ * OneDriveWatchService.
+ *
- * If no modes are provided to check for, this simply checks for the
- * existence of the path.
- *
- *
- * @param path the path to check
- * @param modes the modes to check for, if any
- * @throws IOException filesystem level error, or a plain I/O error
- * if you use this with javafs (jnr-fuse), you should throw {@link NoSuchFileException} when the file not found.
- * @see FileSystemProvider#checkAccess(Path, AccessMode...)
- */
@Override
- protected void checkAccessImpl(final Path path, final AccessMode... modes) throws IOException {
- final OneDriveItem.Metadata entry = cache.getEntry(path);
-
- if (!entry.isFile()) {
- return;
- }
+ protected DriveItem.Metadata moveFolderEntry(DriveItem.Metadata sourceEntry, DriveItem.Metadata targetParentEntry, Path source, Path target, boolean targetIsParent) throws IOException {
+ PatchOperation operation = new PatchOperation();
+ operation.rename(toFilenameString(target));
+ operation.move(asDriveItem(targetParentEntry));
+ final FileSystemInfo info = new FileSystemInfo();
+ info.setLastModifiedDateTime(Instant.ofEpochMilli(sourceEntry.getLastModifiedDateTime().toEpochSecond()).atOffset(ZoneOffset.UTC));
+ operation.facet("fileSystemInfo", info);
+ Files.patch(asDriveItem(sourceEntry), operation);
+ return getEntry(null, target);
+ }
- // TODO: assumed; not a file == directory
- for (final AccessMode mode : modes) {
- if (mode == AccessMode.EXECUTE) {
- throw new AccessDeniedException(path.toString());
- }
- }
+ @Override
+ protected DriveItem.Metadata renameEntry(DriveItem.Metadata sourceEntry, DriveItem.Metadata targetParentEntry, Path source, Path target) throws IOException {
+ PatchOperation operation = new PatchOperation();
+ operation.rename(toFilenameString(target));
+ Files.patch(asDriveItem(sourceEntry), operation);
+ return getEntry(null, target);
}
@Override
public void close() throws IOException {
- // TODO: what to do here? OneDriveClient does not implement Closeable :(
+ closer.run();
}
- /**
- * @throws IOException if you use this with javafs (jnr-fuse), you should throw {@link NoSuchFileException} when the file not found.
- */
@Nonnull
@Override
- protected Object getPathMetadataImpl(final Path path) throws IOException {
- return cache.getEntry(path);
- }
-
- /** */
- private List getDirectoryEntries(Path dir, boolean useCache) throws IOException {
- final OneDriveItem.Metadata entry = cache.getEntry(dir);
-
- if (!entry.isFolder()) {
- throw new NotDirectoryException(dir.toString());
- }
-
- List list = null;
- if (useCache && cache.containsFolder(dir)) {
- list = cache.getFolder(dir);
- } else {
- list = new ArrayList<>();
-
- for (final OneDriveItem.Metadata child : OneDriveFolder.class.cast(entry.getResource()).getChildren()) {
- Path childPath = dir.resolve(child.getName());
- list.add(childPath);
-//System.err.println("child: " + childPath.toRealPath().toString());
-
- cache.putFile(childPath, child);
- }
-
- cache.putFolder(dir, list);
- }
-
- return list;
- }
-
- /** for created entry */
- private OneDriveItem.Metadata getEntry(Path path) throws IOException {
- final OneDriveItem.Metadata parentEntry = cache.getEntry(path.getParent());
-
- Optional found = StreamSupport.stream(OneDriveFolder.class.cast(parentEntry.getResource()).getChildren().spliterator(), false)
- .filter(child -> {
- try {
-System.err.println(child.getName() + ", " + toFilenameString(path));
- return child.getName().equals(toFilenameString(path));
- } catch (IOException e) {
- throw new IllegalStateException(e);
- }
- }).findFirst();
- if (found.isPresent()) {
- return found.get();
- } else {
- throw new NoSuchFileException(path.toString());
- }
- }
-
- /** */
- private void removeEntry(Path path) throws IOException {
- OneDriveItem.Metadata entry = cache.getEntry(path);
- if (entry.isFolder()) {
- if (getDirectoryEntries(path, false).size() > 0) {
- throw new DirectoryNotEmptyException(path.toString());
- }
- }
-
- // TODO: unknown what happens when a move operation is performed
- // and the target already exists
- entry.getResource().delete();
-
- cache.removeEntry(path);
- }
-
- /** */
- private void copyEntry(final Path source, final Path target) throws IOException {
- OneDriveItem.Metadata sourceEntry = cache.getEntry(source);
- OneDriveItem.Metadata targetParentEntry = cache.getEntry(target.getParent());
- if (sourceEntry.isFile()) {
- OneDriveCopyOperation operation = new OneDriveCopyOperation();
- operation.rename(toFilenameString(target));
- operation.copy(OneDriveFolder.class.cast(targetParentEntry.getResource()));
- OneDriveLongRunningAction action = sourceEntry.getResource().copy(operation);
- action.await(statusObject -> {
-Debug.printf("Copy Progress Operation %s progress %.0f %%, status %s",
- statusObject.getOperation(),
- statusObject.getPercentage(),
- statusObject.getStatus());
- });
- cache.addEntry(target, getEntry(target));
- } else if (sourceEntry.isFolder()) {
- throw new IsDirectoryException("source can not be a folder: " + source);
- }
- }
-
- /**
- * @param targetIsParent if the target is folder
- */
- private void moveEntry(final Path source, final Path target, boolean targetIsParent) throws IOException {
- OneDriveItem.Metadata sourceEntry = cache.getEntry(source);
- OneDriveItem.Metadata targetParentEntry = cache.getEntry(targetIsParent ? target : target.getParent());
- if (sourceEntry.isFile()) {
- OneDrivePatchOperation operation = new OneDrivePatchOperation();
- operation.rename(targetIsParent ? toFilenameString(source) : toFilenameString(target));
- operation.move(OneDriveFolder.class.cast(targetParentEntry.getResource()));
- final FileSystemInfoFacet info = new FileSystemInfoFacet();
- info.setLastModifiedDateTime(Instant.ofEpochMilli(sourceEntry.getLastModifiedDateTime().toEpochSecond()).atOffset(ZoneOffset.UTC));
- operation.facet("fileSystemInfo", info);
- sourceEntry.getResource().patch(operation);
- cache.removeEntry(source);
- if (targetIsParent) {
- cache.addEntry(target.resolve(source.getFileName()), getEntry(target.resolve(source.getFileName())));
- } else {
- cache.addEntry(target, getEntry(target));
- }
- } else if (sourceEntry.isFolder()) {
- OneDrivePatchOperation operation = new OneDrivePatchOperation();
- operation.rename(toFilenameString(target));
- operation.move(OneDriveFolder.class.cast(targetParentEntry.getResource()));
- final FileSystemInfoFacet info = new FileSystemInfoFacet();
- info.setLastModifiedDateTime(Instant.ofEpochMilli(sourceEntry.getLastModifiedDateTime().toEpochSecond()).atOffset(ZoneOffset.UTC));
- operation.facet("fileSystemInfo", info);
- sourceEntry.getResource().patch(operation);
- cache.moveEntry(source, target, getEntry(target));
+ public WatchService newWatchService() {
+ try {
+ return new OneDriveWatchService(client);
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
}
}
-
- /** */
- private void renameEntry(final Path source, final Path target) throws IOException {
- OneDriveItem.Metadata sourceEntry = cache.getEntry(source);
-
- OneDrivePatchOperation operation = new OneDrivePatchOperation();
- operation.rename(toFilenameString(target));
- sourceEntry.getResource().patch(operation);
- cache.removeEntry(source);
- cache.addEntry(target, getEntry(target));
- }
}
diff --git a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveFileSystemProvider.java b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveFileSystemProvider.java
index 3e4974d9..6850b7a4 100644
--- a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveFileSystemProvider.java
+++ b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveFileSystemProvider.java
@@ -26,6 +26,8 @@ public final class OneDriveFileSystemProvider extends FileSystemProviderBase {
public static final String ENV_APP_CREDENTIAL = "app_credential";
+ public static final String ENV_USE_SYSTEM_WATCHER = "use_system_watcher";
+
public OneDriveFileSystemProvider() {
super(new OneDriveFileSystemRepository());
}
diff --git a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveFileSystemRepository.java b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveFileSystemRepository.java
index 5a753be1..10ad7cc1 100644
--- a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveFileSystemRepository.java
+++ b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveFileSystemRepository.java
@@ -16,12 +16,13 @@
import javax.annotation.Nonnull;
import javax.annotation.ParametersAreNonnullByDefault;
+import org.nuxeo.onedrive.client.Drives;
import org.nuxeo.onedrive.client.JavaNetRequestExecutor;
import org.nuxeo.onedrive.client.OneDriveAPI;
import org.nuxeo.onedrive.client.OneDriveBasicAPI;
-import org.nuxeo.onedrive.client.OneDriveDrive;
import org.nuxeo.onedrive.client.RequestExecutor;
import org.nuxeo.onedrive.client.RequestHeader;
+import org.nuxeo.onedrive.client.types.Drive;
import com.github.fge.filesystem.driver.FileSystemDriver;
import com.github.fge.filesystem.provider.FileSystemRepositoryBase;
@@ -44,7 +45,7 @@ public final class OneDriveFileSystemRepository extends FileSystemRepositoryBase
/** */
public OneDriveFileSystemRepository() {
- super("onedrive", new OneDriveFileSystemFactoryProvider());
+ super("onedrive3", new OneDriveFileSystemFactoryProvider());
}
/**
@@ -84,7 +85,8 @@ public FileSystemDriver createDriver(final URI uri, final Map env) th
}
// 3. process
- String accessToken = new MicrosoftGraphOAuth2(appCredential, true).authorize(userCredential);
+ MicrosoftGraphOAuth2 oAuth2 = new MicrosoftGraphOAuth2(appCredential, true);
+ String accessToken = oAuth2.authorize(userCredential);
//Debug.println("accessToken: " + accessToken);
RequestExecutor executor = new JavaNetRequestExecutor(accessToken) {
@@ -130,8 +132,8 @@ public String getEmailURL() {
}
};
- OneDriveDrive drive = OneDriveDrive.getDefaultDrive(client);
+ Drive.Metadata drive = Drives.getDrives(client).next();
final OneDriveFileStore fileStore = new OneDriveFileStore(drive, factoryProvider.getAttributesFactory());
- return new OneDriveFileSystemDriver(fileStore, factoryProvider, client, drive, env);
+ return new OneDriveFileSystemDriver(fileStore, factoryProvider, client, () -> oAuth2.close(), drive, env);
}
}
diff --git a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveOutputStream.java b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveOutputStream.java
index 279a9ba0..283d134c 100644
--- a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveOutputStream.java
+++ b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveOutputStream.java
@@ -14,9 +14,9 @@
import java.util.function.Consumer;
import java.util.logging.Level;
-import org.nuxeo.onedrive.client.OneDriveFile;
import org.nuxeo.onedrive.client.OneDriveJsonObject;
-import org.nuxeo.onedrive.client.OneDriveUploadSession;
+import org.nuxeo.onedrive.client.UploadSession;
+import org.nuxeo.onedrive.client.types.DriveItem;
import vavi.util.Debug;
@@ -47,15 +47,15 @@
*/
public final class OneDriveOutputStream extends OutputStream {
- private final OneDriveUploadSession upload;
+ private final UploadSession upload;
private final Path file;
private final AtomicBoolean close = new AtomicBoolean();
private long offset = 0L;
private int length;
- private OneDriveFile.Metadata entry;
- private Consumer consumer;
+ private DriveItem.Metadata entry;
+ private Consumer consumer;
- public OneDriveOutputStream(final OneDriveUploadSession upload, final Path file, int length, Consumer consumer) {
+ public OneDriveOutputStream(final UploadSession upload, final Path file, int length, Consumer consumer) {
this.upload = upload;
this.file = file;
this.length = length;
@@ -79,8 +79,8 @@ public void write(final byte[] b, final int off, final int len) throws IOExcepti
}
Debug.printf("header %s", header);
OneDriveJsonObject object = upload.uploadFragment(header, content);
- if (OneDriveFile.Metadata.class.isInstance(object)) {
- entry = OneDriveFile.Metadata.class.cast(object);
+ if (DriveItem.Metadata.class.isInstance(object)) {
+ entry = DriveItem.Metadata.class.cast(object);
Debug.printf("Completed upload for %s", file);
} else {
Debug.printf(Level.FINE, "Uploaded fragment %s for file %s", header, file);
diff --git a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveUploadOption.java b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveUploadOption.java
index 38f17dae..ce3ab8f9 100644
--- a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveUploadOption.java
+++ b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveUploadOption.java
@@ -15,6 +15,10 @@
* OneDriveUploadOption.
*
* for large file.
+ *
+ * in {@link com.github.fge.filesystem.options.FileSystemOptionsFactory},
+ * instances of this class are compared by contains method. so i override
+ * {@link #equals(Object)} and {@link #hashCode()}.
*
* TODO CopyOption doesn't work.
*
@@ -23,6 +27,9 @@
*/
public class OneDriveUploadOption implements OpenOption, CopyOption {
+ /** */
+ private static final long serialVersionUID = 5575546140441990410L;
+
/** */
private Path source;
@@ -43,7 +50,7 @@ public boolean equals(Object other) {
@Override
public int hashCode() {
- return Long.hashCode(5575546140441990410L); // TODO ad-hoc
+ return Long.hashCode(serialVersionUID); // TODO ad-hoc
}
}
diff --git a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveWatchService.java b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveWatchService.java
new file mode 100644
index 00000000..499ed531
--- /dev/null
+++ b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/OneDriveWatchService.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2020 by Naohide Sano, All rights reserved.
+ *
+ * Programmed by Naohide Sano
+ */
+
+package vavi.nio.file.onedrive3;
+
+import java.io.IOException;
+
+import org.nuxeo.onedrive.client.OneDriveAPI;
+
+import vavi.nio.file.watch.webhook.WebHookBaseWatchService;
+import vavi.util.Debug;
+
+
+/**
+ * OneDriveWatchService.
+ *
+ *
+ * @author Naohide Sano (umjammer)
+ * @version 0.00 2020/07/23 umjammer initial version
+ */
+@ClientEndpoint(configurator = BasicAuthorizationConfigurator.class)
+public class MicrosoftWebSocketNotification extends StringWebSocketNotification {
+
+ private static final String websocketBaseUrl = System.getenv("VAVI_APPS_WEBHOOK_WEBSOCKET_BASE_URL");
+ private static final String websocketPath = System.getenv("VAVI_APPS_WEBHOOK_WEBSOCKET_MICROSOFT_PATH");
+
+ private static final URI uri = URI.create(websocketBaseUrl + websocketPath);
+
+ private Consumer callback;
+
+ /**
+ * @param args
+ */
+ public MicrosoftWebSocketNotification(Consumer callback, Object... args) throws IOException {
+ super(uri, args);
+ this.callback = callback;
+ }
+
+ @Override
+ public void onOpenImpl(Session session) throws IOException {
+ }
+
+ @Override
+ protected void onNotifyMessageImpl(String notification) throws IOException {
+ callback.accept(notification);
+ }
+
+ @Override
+ protected void onCloseImpl(Session session) throws IOException {
+ }
+}
+
+/* */
diff --git a/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/webhook/websocket/MicrosoftWebSocketNotificationProvider.java b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/webhook/websocket/MicrosoftWebSocketNotificationProvider.java
new file mode 100644
index 00000000..799e3e11
--- /dev/null
+++ b/vavi-nio-file-onedrive3/src/main/java/vavi/nio/file/onedrive3/webhook/websocket/MicrosoftWebSocketNotificationProvider.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2020 by Naohide Sano, All rights reserved.
+ *
+ * Programmed by Naohide Sano
+ */
+
+package vavi.nio.file.onedrive3.webhook.websocket;
+
+import java.io.IOException;
+import java.util.function.Consumer;
+
+import vavi.nio.file.watch.webhook.Notification;
+import vavi.nio.file.watch.webhook.NotificationProvider;
+
+
+/**
+ * MicrosoftWebSocketNotificationProvider.
+ *
+ * @author Naohide Sano (umjammer)
+ * @version 0.00 2020/07/23 umjammer initial version
+ */
+public class MicrosoftWebSocketNotificationProvider implements NotificationProvider {
+
+ @Override
+ public Notification getNotification(Consumer callback, Object... args) throws IOException {
+ return Notification.class.cast(new MicrosoftWebSocketNotification(Consumer.class.cast(callback), args));
+ }
+}
+
+/* */
diff --git a/vavi-nio-file-onedrive3/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider b/vavi-nio-file-onedrive3/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
index a3dc7617..7b51461b 100644
--- a/vavi-nio-file-onedrive3/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
+++ b/vavi-nio-file-onedrive3/src/main/resources/META-INF/services/java.nio.file.spi.FileSystemProvider
@@ -1 +1 @@
-#vavi.nio.file.onedrive3.OneDriveFileSystemProvider
+vavi.nio.file.onedrive3.OneDriveFileSystemProvider
diff --git a/vavi-nio-file-onedrive3/src/main/resources/META-INF/services/vavi.nio.file.watch.webhook.NotificationProvider b/vavi-nio-file-onedrive3/src/main/resources/META-INF/services/vavi.nio.file.watch.webhook.NotificationProvider
new file mode 100644
index 00000000..58c62b5f
--- /dev/null
+++ b/vavi-nio-file-onedrive3/src/main/resources/META-INF/services/vavi.nio.file.watch.webhook.NotificationProvider
@@ -0,0 +1 @@
+vavi.nio.file.onedrive3.webhook.websocket.MicrosoftWebSocketNotificationProvider
diff --git a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main.java b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main.java
index 668261e8..8a394290 100644
--- a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main.java
+++ b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main.java
@@ -24,10 +24,10 @@ public class Main {
@Test
void test01() throws Exception {
- String email = System.getenv("MICROSOFT3_TEST_ACCOUNT");
+ String email = System.getenv("MICROSOFT_TEST_ACCOUNT");
- URI uri = URI.create("onedrive:///?id=" + email);
+ URI uri = URI.create("onedrive3:///?id=" + email);
- testAll(new OneDriveFileSystemProvider().newFileSystem(uri, Collections.EMPTY_MAP));
+ testAll(new OneDriveFileSystemProvider().newFileSystem(uri, Collections.emptyMap()));
}
}
\ No newline at end of file
diff --git a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main2.java b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main2.java
index 692f5f56..7161c1a0 100644
--- a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main2.java
+++ b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main2.java
@@ -25,10 +25,10 @@ public class Main2 {
@Test
void test01() throws Exception {
- String email = System.getenv("MICROSOFT3_TEST_ACCOUNT");
+ String email = System.getenv("MICROSOFT_TEST_ACCOUNT");
- URI uri = URI.create("onedrive:///?id=" + email);
- FileSystem fs = new OneDriveFileSystemProvider().newFileSystem(uri, Collections.EMPTY_MAP);
+ URI uri = URI.create("onedrive3:///?id=" + email);
+ FileSystem fs = new OneDriveFileSystemProvider().newFileSystem(uri, Collections.emptyMap());
testLargeFile(fs, OneDriveUploadOption.class);
}
diff --git a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main3.java b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main3.java
index 114ef7d0..029eb3a0 100644
--- a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main3.java
+++ b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main3.java
@@ -25,10 +25,10 @@ public class Main3 {
@Test
void test01() throws Exception {
- String email = System.getenv("MICROSOFT3_TEST_ACCOUNT");
+ String email = System.getenv("MICROSOFT_TEST_ACCOUNT");
- URI uri = URI.create("onedrive:///?id=" + email);
- FileSystem fs = new OneDriveFileSystemProvider().newFileSystem(uri, Collections.EMPTY_MAP);
+ URI uri = URI.create("onedrive3:///?id=" + email);
+ FileSystem fs = new OneDriveFileSystemProvider().newFileSystem(uri, Collections.emptyMap());
testMoveFolder(fs);
}
diff --git a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main4.java b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main4.java
index b71cb5ea..f8d3f6ea 100644
--- a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main4.java
+++ b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main4.java
@@ -77,7 +77,7 @@ public void test01(String providerClassName) throws Exception {
public static void main(final String... args) throws IOException {
String email = args[1];
- URI uri = URI.create("onedrive:///?id=" + email);
+ URI uri = URI.create("onedrive3:///?id=" + email);
OAuth2AppCredential appCredential = new MicrosoftGraphLocalAppCredential();
diff --git a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main5.java b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main5.java
index a642233c..f044884d 100644
--- a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main5.java
+++ b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/Main5.java
@@ -35,13 +35,13 @@ public class Main5 {
void test01() throws Exception {
String email = System.getenv("TEST5_ACCOUNT");
- URI uri = URI.create("onedrive:///?id=" + email);
+ URI uri = URI.create("onedrive3:///?id=" + email);
Path src;
Path dstDir;
Path dst;
String a, b;
- try (FileSystem onedrivefs = new OneDriveFileSystemProvider().newFileSystem(uri, Collections.EMPTY_MAP)) {
+ try (FileSystem onedrivefs = new OneDriveFileSystemProvider().newFileSystem(uri, Collections.emptyMap())) {
src = Paths.get("src/test/resources/Hello.java");
dstDir = onedrivefs.getPath("/").resolve("TEST_FUSE_5");
@@ -60,7 +60,7 @@ void test01() throws Exception {
a = Util.toFilenameString(Files.list(dstDir).findFirst().get());
}
- try (FileSystem onedrivefs = new OneDriveFileSystemProvider().newFileSystem(uri, Collections.EMPTY_MAP)) {
+ try (FileSystem onedrivefs = new OneDriveFileSystemProvider().newFileSystem(uri, Collections.emptyMap())) {
dstDir = onedrivefs.getPath("/").resolve("TEST_FUSE_5");
dst = dstDir.resolve("ããšã 001");
diff --git a/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/WebHookApiTest.java b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/WebHookApiTest.java
new file mode 100644
index 00000000..90ae7e71
--- /dev/null
+++ b/vavi-nio-file-onedrive3/src/test/java/vavi/nio/file/onedrive3/WebHookApiTest.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2020 by Naohide Sano, All rights reserved.
+ *
+ * Programmed by Naohide Sano
+ */
+
+package vavi.nio.file.onedrive3;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Set;
+
+import org.nuxeo.onedrive.client.Drives;
+import org.nuxeo.onedrive.client.Files;
+import org.nuxeo.onedrive.client.JavaNetRequestExecutor;
+import org.nuxeo.onedrive.client.OneDriveAPI;
+import org.nuxeo.onedrive.client.OneDriveBasicAPI;
+import org.nuxeo.onedrive.client.types.Drive;
+import org.nuxeo.onedrive.client.types.DriveItem;
+import org.nuxeo.onedrive.client.RequestExecutor;
+import org.nuxeo.onedrive.client.RequestHeader;
+
+import vavi.net.auth.oauth2.microsoft.MicrosoftGraphLocalAppCredential;
+import vavi.net.auth.oauth2.microsoft.MicrosoftGraphOAuth2;
+import vavi.net.auth.web.microsoft.MicrosoftLocalUserCredential;
+
+
+/**
+ * WebHookApiTest.
+ *
+ * @author Naohide Sano (umjammer)
+ * @version 0.00 2020/07/03 umjammer initial version
+ * @see "https://docs.microsoft.com/graph/api/subscription-post-subscriptions?view=graph-rest-1.0&tabs=http"
+ */
+public class WebHookApiTest {
+
+ static final String VAVI_APPS_WEBHOOK_SECRET = System.getenv("VAVI_APPS_WEBHOOK_SECRET");
+ static String websocketBaseUrl = System.getenv("VAVI_APPS_WEBHOOK_WEBSOCKET_BASE_URL");
+ static String websocketPath = System.getenv("VAVI_APPS_WEBHOOK_WEBSOCKET_MICROSOFT_PATH");
+
+ /**
+ * @param args
+ */
+ public static void main(String[] args) throws Exception {
+ String email = System.getenv("MICROSOFT3_TEST_ACCOUNT");
+
+ MicrosoftLocalUserCredential userCredential = new MicrosoftLocalUserCredential(email);
+ MicrosoftGraphLocalAppCredential appCredential = new MicrosoftGraphLocalAppCredential();
+
+ @SuppressWarnings("resource")
+ String accessToken = new MicrosoftGraphOAuth2(appCredential, true).authorize(userCredential);
+//Debug.println("accessToken: " + accessToken);
+
+ RequestExecutor executor = new JavaNetRequestExecutor(accessToken) {
+ @Override
+ public void addAuthorizationHeader(final Set headers) {
+ super.addAuthorizationHeader(headers);
+ // HttpURLConnection adds "accept" header which is unavailable to onedrive.
+ headers.add(new RequestHeader("Accept", "application/json"));
+ }
+
+ @Override
+ public Upload doPatch(URL url, Set headers) throws IOException {
+ headers.add(new RequestHeader("X-HTTP-Method-Override", "PATCH"));
+ headers.add(new RequestHeader("X-HTTP-Method", "PATCH"));
+ return super.doPost(url, headers);
+ }
+ };
+
+ OneDriveAPI client = new OneDriveBasicAPI(executor) {
+ @Override
+ public RequestExecutor getExecutor() {
+ return executor;
+ }
+
+ @Override
+ public boolean isBusinessConnection() {
+ return false;
+ }
+
+ @Override
+ public boolean isGraphConnection() {
+ return true;
+ }
+
+ @Override
+ public String getBaseURL() {
+ return String.format("https://graph.microsoft.com%s", "/v1.0");
+ }
+
+ @Override
+ public String getEmailURL() {
+ return String.format("https://graph.microsoft.com%s", "/v1.0/me");
+ }
+ };
+
+ Drive.Metadata drive = Drives.getDrives(client).next();
+
+ // create
+ URI uri = URI.create(websocketBaseUrl + websocketPath);
+ // Listen for file upload events in the specified folder
+ DriveItem rootFolder = new Drive(client, drive.getId()).getRoot();
+ Iterator i = Files.getFiles(rootFolder);
+ while (i.hasNext()) {
+ DriveItem.Metadata child = i.next();
+ if (child.getName().equals("TEST_WEBHOOK")) {
+System.out.println("rmdir " + child.getName());
+ Files.delete(DriveItem.class.cast(child.getItem()));
+ }
+ }
+System.out.println("mkdir " + "TEST_WEBHOOK");
+ DriveItem.Metadata newFolder = Files.createFolder(rootFolder, "TEST_WEBHOOK");
+
+System.out.println("[create] webhook");
+// Subscription preSubscription = new Subscription();
+//// preSubscription.changeType = "created,updated,deleted"; // root is only supported update
+// preSubscription.changeType = "created,updated,deleted";
+// preSubscription.notificationUrl = uri.toString();
+// preSubscription.resource = "me/drive/root";
+// preSubscription.expirationDateTime = calendar;
+// preSubscription.clientState = VAVI_APPS_WEBHOOK_SECRET;
+// Subscription subscription = graphClient.subscriptions().buildRequest().post(preSubscription);
+//Debug.println(subscription.id);
+
+System.out.println("[ls] webhook");
+// for (Subscription s : subscPages.getCurrentPage()) {
+//System.out.println(s);
+// }
+
+System.out.println("mkdir " + "TEST_WEBHOOK/" + "NEW FOLDER");
+ DriveItem.Metadata subFolder = Files.createFolder(DriveItem.class.cast(newFolder), "NEW FOLDER");
+
+ // update
+System.out.println("[update] webhook");
+// subscription.expirationDateTime = calendar;
+// subscription = drive.subscriptions(subscription.id).buildRequest().patch(subscription);
+
+ // delete
+System.out.println("[delete] webhook");
+// drive.subscriptions(subscription.id).buildRequest().delete();
+
+System.out.println("rmdir " + subFolder.getName());
+ Files.delete(DriveItem.class.cast(subFolder));
+System.out.println("rmdir " + newFolder.getName());
+ Files.delete(DriveItem.class.cast(newFolder));
+ }
+}
+
+/* */
diff --git a/vavi-nio-file-onedrive4/pom.xml b/vavi-nio-file-onedrive4/pom.xml
index 90bdcbbe..1673ddcf 100644
--- a/vavi-nio-file-onedrive4/pom.xml
+++ b/vavi-nio-file-onedrive4/pom.xml
@@ -5,7 +5,7 @@
vavivavi-apps-fuse
- 0.1.6
+ 0.1.7vavi-nio-file-onedrive4
@@ -32,7 +32,7 @@
- com.github.umjammer.vavi-net-auth
+ ${vavi-net-auth.groupId}vavi-net-auth-microsoft${vavi-net-auth.version}
@@ -41,7 +41,18 @@
com.microsoft.graphmicrosoft-graph
- 1.4.0
+ 2.0.0
+
+
+ com.google.guava
+ guava
+
+
+
+
+
+ vavi
+ vavi-nio-file-commons
@@ -67,7 +78,6 @@
org.junit.jupiterjunit-jupiter-params
- 5.3.0test
diff --git a/vavi-nio-file-onedrive4/readme.md b/vavi-nio-file-onedrive4/readme.md
new file mode 100644
index 00000000..90184d0c
--- /dev/null
+++ b/vavi-nio-file-onedrive4/readme.md
@@ -0,0 +1,38 @@
+# vavi-nio-file-onedirve4
+
+nio filsystem provider for onedrive
+
+## feature
+
+ * based on the official sdk
+ * implements upload w/ monitor that *official sdk doesn't support*
+ * OnedriveUploadOption for large file uploading
+ * description as "user:attribute"
+ * thumbnail as "user:attribute" (works but where can we see those?)
+
+## issue
+
+official graph sdk version currently (2022-03-02) is upper 5.15.0.
+but i don't use those new versions for this project.
+because after `com.microsoft.graph:microsoft-graph:2.0.2`,
+the sdk deprecated `com.microsoft.graph.http.IConnection`
+and start using `okhttp3.Response` instead of it.
+this is not oop. (beginner should not use generics and method reference)
+`IConnection` is designed for library independency.
+why the official sdk doesn't implement okhttp3 library as `IConnection`?
+for performance reason? i don't think so. because
+network transportation is very slower than wrapping object.
+
+i tried to adapt v5.x.x to this project. see branch `graph-sdk-5`.
+but it was abandoned. i don't want to make any more effort to adapt
+this project to the bad api's library.
+(it's so hard to adapt lra monitor to official sdk.)
+
+when the official sdk stops supporting v2,
+it's a time to die this project.
+
+there are two other onedrive providers.
+so it's no problem!
+
+ * [vavi-nio-file-onedrive](../vavi-nio-file-onedrive) (based on [onedrivejavasdk](https://github.com/umjammer/OneDriveJavaSDK))
+ * [vavi-nio-file-onedrive3](../vavi-nio-file-onedrive3) (based on [onedrive-java-client](https://github.com/iterate-ch/onedrive-java-client))
\ No newline at end of file
diff --git a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveBasicFileAttributesProvider.java b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveBasicFileAttributesProvider.java
index 5f57d5b1..54a7c8fc 100644
--- a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveBasicFileAttributesProvider.java
+++ b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveBasicFileAttributesProvider.java
@@ -22,6 +22,8 @@
import com.github.fge.filesystem.attributes.provider.BasicFileAttributesProvider;
import com.microsoft.graph.models.extensions.DriveItem;
+import vavi.nio.file.onedrive4.OneDriveFileAttributesFactory.Metadata;
+
/**
* {@link BasicFileAttributes} implementation for OneDrive
@@ -37,8 +39,8 @@ public final class OneDriveBasicFileAttributesProvider extends BasicFileAttribut
private final DriveItem entry;
- public OneDriveBasicFileAttributesProvider(@Nonnull final DriveItem entry) throws IOException {
- this.entry = Objects.requireNonNull(entry);
+ public OneDriveBasicFileAttributesProvider(@Nonnull final Metadata entry) throws IOException {
+ this.entry = Objects.requireNonNull(entry).driveItem;
}
/**
@@ -54,7 +56,7 @@ public OneDriveBasicFileAttributesProvider(@Nonnull final DriveItem entry) throw
*/
@Override
public FileTime lastModifiedTime() {
- return FileTime.fromMillis(entry.lastModifiedDateTime.getTimeInMillis());
+ return FileTime.fromMillis(entry.lastModifiedDateTime.toInstant().toEpochMilli());
}
/**
diff --git a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileAttributesFactory.java b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileAttributesFactory.java
index 4cc2e6cd..be76167e 100644
--- a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileAttributesFactory.java
+++ b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileAttributesFactory.java
@@ -6,7 +6,7 @@
package vavi.nio.file.onedrive4;
-import com.github.fge.filesystem.attributes.FileAttributesFactory;
+import com.github.fge.filesystem.driver.ExtendedFileSystemDriverBase.ExtendsdFileAttributesFactory;
import com.microsoft.graph.models.extensions.DriveItem;
@@ -16,10 +16,20 @@
* @author Naohide Sano (umjammer)
* @version 0.00 2016/03/11 umjammer initial version
*/
-public final class OneDriveFileAttributesFactory extends FileAttributesFactory {
+public final class OneDriveFileAttributesFactory extends ExtendsdFileAttributesFactory {
+
+ static class Metadata {
+ OneDriveFileSystemDriver driver;
+ DriveItem driveItem;
+ Metadata(OneDriveFileSystemDriver driver, DriveItem driveItem) {
+ this.driver = driver;
+ this.driveItem = driveItem;
+ }
+ }
public OneDriveFileAttributesFactory() {
- setMetadataClass(DriveItem.class);
+ setMetadataClass(Metadata.class);
addImplementation("basic", OneDriveBasicFileAttributesProvider.class);
+ addImplementation("user", OneDriveUserDefinedFileAttributesProvider.class);
}
}
diff --git a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemDriver.java b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemDriver.java
index 11910f8d..5748db4e 100644
--- a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemDriver.java
+++ b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemDriver.java
@@ -11,31 +11,22 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
-import java.nio.file.AccessDeniedException;
-import java.nio.file.AccessMode;
import java.nio.file.CopyOption;
-import java.nio.file.DirectoryNotEmptyException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileAlreadyExistsException;
import java.nio.file.FileStore;
import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.NotDirectoryException;
import java.nio.file.OpenOption;
import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.FileAttribute;
-import java.nio.file.spi.FileSystemProvider;
+import java.nio.file.WatchEvent.Kind;
+import java.nio.file.WatchService;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.logging.Level;
-import javax.annotation.Nonnull;
-import javax.annotation.ParametersAreNonnullByDefault;
-
-import com.github.fge.filesystem.driver.ExtendedFileSystemDriverBase;
-import com.github.fge.filesystem.exceptions.IsDirectoryException;
+import com.github.fge.filesystem.driver.CachedFileSystemDriver;
import com.github.fge.filesystem.provider.FileSystemFactoryProvider;
import com.google.common.io.ByteStreams;
import com.microsoft.graph.concurrency.ChunkedUploadProvider;
@@ -52,20 +43,26 @@
import com.microsoft.graph.models.extensions.Folder;
import com.microsoft.graph.models.extensions.IGraphServiceClient;
import com.microsoft.graph.models.extensions.ItemReference;
+import com.microsoft.graph.models.extensions.ThumbnailSet;
import com.microsoft.graph.models.extensions.UploadSession;
+import com.microsoft.graph.options.QueryOption;
import com.microsoft.graph.requests.extensions.IDriveItemCollectionPage;
import com.microsoft.graph.requests.extensions.IDriveItemCopyRequest;
+import com.microsoft.graph.requests.extensions.IThumbnailSetCollectionPage;
-import vavi.nio.file.Cache;
import vavi.nio.file.Util;
+import vavi.nio.file.onedrive4.OneDriveFileAttributesFactory.Metadata;
import vavi.nio.file.onedrive4.graph.LraMonitorProvider;
import vavi.nio.file.onedrive4.graph.LraMonitorResponseHandler;
import vavi.nio.file.onedrive4.graph.LraMonitorResult;
import vavi.nio.file.onedrive4.graph.LraSession;
+import vavi.nio.file.onedrive4.graph.ThumbnailUploadProvider;
import vavi.util.Debug;
+import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
import static vavi.nio.file.Util.toFilenameString;
import static vavi.nio.file.Util.toPathString;
+import static vavi.nio.file.onedrive4.OneDriveFileSystemProvider.ENV_USE_SYSTEM_WATCHER;
/**
@@ -74,82 +71,92 @@
* @author Naohide Sano (umjammer)
* @version 0.00 2016/03/11 umjammer initial version
*/
-@ParametersAreNonnullByDefault
-public final class OneDriveFileSystemDriver extends ExtendedFileSystemDriverBase {
+public final class OneDriveFileSystemDriver extends CachedFileSystemDriver {
private final IGraphServiceClient client;
- private boolean ignoreAppleDouble = false;
+
+ private Runnable closer;
+ private OneDriveWatchService systemWatcher;
@SuppressWarnings("unchecked")
- public OneDriveFileSystemDriver(final FileStore fileStore,
- final FileSystemFactoryProvider provider,
- final IGraphServiceClient client,
- final Map env) {
+ public OneDriveFileSystemDriver(FileStore fileStore,
+ FileSystemFactoryProvider provider,
+ IGraphServiceClient client,
+ Runnable closer,
+ Map env) throws IOException {
super(fileStore, provider);
this.client = client;
- ignoreAppleDouble = (Boolean) ((Map) env).getOrDefault("ignoreAppleDouble", Boolean.FALSE);
-//System.err.println("ignoreAppleDouble: " + ignoreAppleDouble);
- }
-
- /** ugly */
- private boolean isFile(DriveItem entry) {
- return entry.file != null;
- }
+ this.closer = closer;
+ setEnv(env);
+ boolean useSystemWatcher = (Boolean) ((Map) env).getOrDefault(ENV_USE_SYSTEM_WATCHER, false);
- /** ugly */
- private boolean isFolder(DriveItem entry) {
- return entry.folder != null;
+ if (useSystemWatcher) {
+ systemWatcher = new OneDriveWatchService(client);
+ systemWatcher.setNotificationListener(this::processNotification);
+ }
}
- /** */
- private Cache cache = new Cache() {
- /**
- * TODO when the parent is not cached
- * @see #ignoreAppleDouble
- * @throws NoSuchFileException must be thrown when the path is not found in this cache
- */
- public DriveItem getEntry(Path path) throws IOException {
- if (cache.containsFile(path)) {
- return cache.getFile(path);
- } else {
- if (ignoreAppleDouble && path.getFileName() != null && Util.isAppleDouble(path)) {
- throw new NoSuchFileException("ignore apple double file: " + path);
- }
-
- String pathString = toPathString(path);
-//Debug.println("path: " + pathString);
+ /** for system watcher */
+ private void processNotification(String id, Kind kind) {
+ if (ENTRY_DELETE == kind) {
+ try {
+ Path path = cache.getEntry(e -> id.equals(e.id));
+ cache.removeEntry(path);
+ } catch (NoSuchElementException e) {
+Debug.println("NOTIFICATION: already deleted: " + id);
+ }
+ } else {
+ try {
try {
- DriveItem entry;
- if (pathString.equals("/")) {
- entry = client.drive().root().buildRequest().get();
- } else {
- entry = client.drive().root().itemWithPath(toItemPathString(pathString.substring(1))).buildRequest().get();
- }
- cache.putFile(path, entry);
- return entry;
- } catch (GraphServiceException e) {
- if (e.getMessage().startsWith("Error code: itemNotFound")) {
- if (cache.containsFile(path)) {
- cache.removeEntry(path);
- }
- throw new NoSuchFileException(pathString);
- } else {
- throw e;
- }
+ Path path = cache.getEntry(e -> id.equals(e.id));
+Debug.println("NOTIFICATION: maybe updated: " + path);
+ cache.removeEntry(path);
+ cache.getEntry(path);
+ } catch (NoSuchElementException e) {
+ DriveItem entry = client.drive().items(id).buildRequest().get();
+ Path parent = cache.getEntry(f -> entry.parentReference.id.equals(f.id));
+ Path path = parent.resolve(entry.name);
+Debug.println("NOTIFICATION: maybe created: " + path);
+ cache.addEntry(path, entry);
}
+ } catch (NoSuchElementException e) {
+Debug.println("NOTIFICATION: parent not found: " + e);
+ } catch (IOException e) {
+ e.printStackTrace();
}
}
- };
+ }
+
+ @Override
+ protected boolean isFolder(DriveItem entry) {
+ return entry.folder != null;
+ }
- @Nonnull
@Override
- public InputStream newInputStream(final Path path, final Set options) throws IOException {
- final DriveItem entry = cache.getEntry(path);
+ protected String getFilenameString(DriveItem entry) {
+ return entry.name;
+ }
- if (isFolder(entry)) {
- throw new IsDirectoryException(path.toString());
+ @Override
+ protected DriveItem getRootEntry(Path root) throws IOException {
+ return client.drive().root().buildRequest().get();
+ }
+
+ @Override
+ protected DriveItem getEntry(DriveItem parentEntry, Path path)throws IOException {
+ try {
+ return client.drive().root().itemWithPath(toItemPathString(toPathString(path))).buildRequest().get();
+ } catch (GraphServiceException e) {
+ if (e.getMessage().startsWith("Error code: itemNotFound")) {
+ return null;
+ } else {
+ throw new IOException(e);
+ }
}
+ }
+ @Override
+ protected InputStream downloadEntry(DriveItem entry, Path path, Set options) throws IOException {
try {
return client.drive().items(entry.id).content().buildRequest().get();
} catch (ClientException e) {
@@ -157,26 +164,13 @@ public InputStream newInputStream(final Path path, final Set options) throws IOException {
- try {
- DriveItem entry = cache.getEntry(path);
-
- if (isFolder(entry)) {
- throw new IsDirectoryException(path.toString());
- } else {
- throw new FileAlreadyExistsException(path.toString());
- }
- } catch (NoSuchFileException e) {
-Debug.println("newOutputStream: " + e.getMessage());
- }
-
+ protected OutputStream uploadEntry(DriveItem parentEntry, Path path, Set options) throws IOException {
OneDriveUploadOption uploadOption = Util.getOneOfOptions(OneDriveUploadOption.class, options);
if (uploadOption != null) {
// java.nio.file is highly abstracted, so here source information is lost.
// but onedrive graph api requires content length for upload.
- // so reluctantly we provide {@link OneDriveUploadOpenOption} for {@link java.nio.file.Files#copy} options.
+ // so reluctantly we provide {@link OneDriveUploadOption} for {@link java.nio.file.Files#copy} options.
Path source = uploadOption.getSource();
Debug.println("upload w/ option: " + source);
@@ -209,7 +203,7 @@ public void progress(final long current, final long max) {
}
@Override
public void success(final DriveItem result) {
- cache.addEntry(path, result);
+ updateEntry(path, result);
Debug.println("upload done: " + result.name);
}
@Override
@@ -223,7 +217,7 @@ public void failure(final ClientException ex) {
protected void onClosed() throws IOException {
InputStream is = getInputStream();
DriveItem newEntry = client.drive().root().itemWithPath(toItemPathString(toPathString(path))).content().buildRequest().put(ByteStreams.toByteArray(is)); // TODO depends on guava
- cache.addEntry(path, newEntry);
+ updateEntry(path, newEntry);
}
};
}
@@ -242,7 +236,7 @@ public void progress(final long current, final long max) {
}
@Override
public void success(final DriveItem result) {
- cache.addEntry(path, result);
+ updateEntry(path, result);
Debug.println("upload done: " + result.name);
}
@Override
@@ -252,253 +246,165 @@ public void failure(final ClientException ex) {
});
} else {
DriveItem newEntry = client.drive().root().itemWithPath(toItemPathString(toPathString(path))).content().buildRequest().put(ByteStreams.toByteArray(is)); // TODO depends on guava
- cache.addEntry(path, newEntry);
+ updateEntry(path, newEntry);
}
}
- /** */
+ /** ms-graph doesn't accept '+' in a path string */
private String toItemPathString(String pathString) throws IOException {
- return URLEncoder.encode(pathString, "utf-8").replace("+", "%20");
+ return URLEncoder.encode(pathString.replaceFirst("^\\/", ""), "utf-8").replace("+", "%20");
}
- @Nonnull
@Override
- public DirectoryStream newDirectoryStream(final Path dir,
- final DirectoryStream.Filter filter) throws IOException {
- return Util.newDirectoryStream(getDirectoryEntries(dir, true), filter);
+ protected List getDirectoryEntries(DriveItem dirEntry, Path dir) throws IOException {
+ List list = new ArrayList<>(dirEntry.folder.childCount);
+
+ IDriveItemCollectionPage pages = client.drive().items(dirEntry.id).children().buildRequest().get();
+ while (pages != null) {
+ for (final DriveItem child : pages.getCurrentPage()) {
+ list.add(child);
+//System.err.println("child: " + childPath.toRealPath().toString());
+ }
+ pages = pages.getNextPage() != null ? pages.getNextPage().buildRequest().get() : null;
+ }
+
+ return list;
}
@Override
- public void createDirectory(final Path dir, final FileAttribute... attrs) throws IOException {
- DriveItem parentEntry = cache.getEntry(dir.getParent());
-
- // TODO: how to diagnose?
+ protected DriveItem createDirectoryEntry(DriveItem parentEntry, Path dir) throws IOException {
DriveItem preEntry = new DriveItem();
preEntry.name = toFilenameString(dir);
preEntry.folder = new Folder();
DriveItem newEntry = client.drive().items(parentEntry.id).children().buildRequest().post(preEntry);
Debug.println(newEntry.id + ", " + newEntry.name + ", folder: " + isFolder(newEntry) + ", " + newEntry.hashCode());
- cache.addEntry(dir, newEntry);
+ return newEntry;
}
@Override
- public void delete(final Path path) throws IOException {
- removeEntry(path);
+ protected boolean hasChildren(DriveItem dirEntry, Path path) throws IOException {
+ IDriveItemCollectionPage pages = client.drive().items(dirEntry.id).children().buildRequest().get();
+ return pages.getCurrentPage().size() > 0;
}
@Override
- public void copy(final Path source, final Path target, final Set options) throws IOException {
- if (cache.existsEntry(target)) {
- if (options != null && options.stream().anyMatch(o -> o.equals(StandardCopyOption.REPLACE_EXISTING))) {
- removeEntry(target);
- } else {
- throw new FileAlreadyExistsException(target.toString());
- }
- }
- copyEntry(source, target);
+ protected void removeEntry(DriveItem entry, Path path) throws IOException {
+ client.drive().items(entry.id).buildRequest().delete();
}
@Override
- public void move(final Path source, final Path target, final Set options) throws IOException {
- if (cache.existsEntry(target)) {
- if (isFolder(cache.getEntry(target))) {
- if (options != null && options.stream().anyMatch(o -> o.equals(StandardCopyOption.REPLACE_EXISTING))) {
- // replace the target
- if (cache.getChildCount(target) > 0) {
- throw new DirectoryNotEmptyException(target.toString());
- } else {
- removeEntry(target);
- moveEntry(source, target, false);
- }
- } else {
- // move into the target
- // TODO SPEC is FileAlreadyExistsException ?
- moveEntry(source, target, true);
- }
- } else {
- if (options != null && options.stream().anyMatch(o -> o.equals(StandardCopyOption.REPLACE_EXISTING))) {
- removeEntry(target);
- moveEntry(source, target, false);
- } else {
- throw new FileAlreadyExistsException(target.toString());
- }
+ protected DriveItem copyEntry(DriveItem sourceEntry, DriveItem targetParentEntry, Path source, Path target, Set options) throws IOException {
+ ItemReference ir = new ItemReference();
+ ir.id = targetParentEntry.id;
+ IDriveItemCopyRequest request = client.drive().items(sourceEntry.id).copy(toFilenameString(target), ir).buildRequest();
+ BaseRequest.class.cast(request).setHttpMethod(HttpMethod.POST); // #send() hides IDriveItemCopyRequest fields already set above.
+ DriveItemCopyBody body = new DriveItemCopyBody(); // ditto
+ body.name = toFilenameString(target); // ditto
+ body.parentReference = ir; // ditto
+ LraMonitorResponseHandler handler = new LraMonitorResponseHandler<>();
+ @SuppressWarnings({ "unchecked", "rawtypes" }) // TODO
+ LraSession copySession = client.getHttpProvider().send((IHttpRequest) request, LraMonitorResult.class, body, (IStatefulResponseHandler) handler).getSession();
+ LraMonitorProvider copyMonitorProvider = new LraMonitorProvider<>(copySession, client, DriveItem.class);
+ copyMonitorProvider.monitor(new IProgressCallback() {
+ @Override
+ public void progress(final long current, final long max) {
+Debug.println("copy progress: " + current + "/" + max);
}
- } else {
- if (source.getParent().equals(target.getParent())) {
- // rename
- renameEntry(source, target);
- } else {
- moveEntry(source, target, false);
+ @Override
+ public void success(final DriveItem result) {
+Debug.println("copy done: " + result.id);
+ updateEntry(target, result);
}
- }
+ @Override
+ public void failure(final ClientException ex) {
+ throw new IllegalStateException(ex);
+ }
+ });
+ // null means that copy is async, cache by your self
+ // @see IProgressCallback#success()
+ return null;
}
- /**
- * Check access modes for a path on this filesystem
- *
- * If no modes are provided to check for, this simply checks for the
- * existence of the path.
- *
- *
- * @param path the path to check
- * @param modes the modes to check for, if any
- * @throws IOException filesystem level error, or a plain I/O error
- * if you use this with javafs (jnr-fuse), you should throw {@link NoSuchFileException} when the file not found.
- * @see FileSystemProvider#checkAccess(Path, AccessMode...)
- */
@Override
- protected void checkAccessImpl(final Path path, final AccessMode... modes) throws IOException {
- final DriveItem entry = cache.getEntry(path);
-
- if (!isFile(entry)) {
- return;
- }
-
- // TODO: assumed; not a file == directory
- for (final AccessMode mode : modes) {
- if (mode == AccessMode.EXECUTE) {
- throw new AccessDeniedException(path.toString());
- }
- }
+ protected DriveItem moveEntry(DriveItem sourceEntry, DriveItem targetParentEntry, Path source, Path target, boolean targetIsParent) throws IOException {
+ DriveItem preEntry = new DriveItem();
+ preEntry.name = toFilenameString(target);
+ preEntry.parentReference = new ItemReference();
+ preEntry.parentReference.id = targetParentEntry.id;
+ return client.drive().items(sourceEntry.id).buildRequest().patch(preEntry);
}
@Override
- public void close() throws IOException {
- // TODO: what to do here? OneDriveClient does not implement Closeable :(
+ protected DriveItem moveFolderEntry(DriveItem sourceEntry, DriveItem targetParentEntry, Path source, Path target, boolean targetIsParent) throws IOException {
+ DriveItem preEntry = new DriveItem();
+ preEntry.name = toFilenameString(target);
+ preEntry.parentReference = new ItemReference();
+ preEntry.parentReference.id = targetParentEntry.id;
+ return client.drive().items(sourceEntry.id).buildRequest().patch(preEntry);
}
- /**
- * @throws IOException you should throw {@link NoSuchFileException} when the file not found.
- */
- @Nonnull
@Override
- protected Object getPathMetadataImpl(final Path path) throws IOException {
- return cache.getEntry(path);
+ protected DriveItem renameEntry(DriveItem sourceEntry, DriveItem targetParentEntry, Path source, Path target) throws IOException {
+ DriveItem preEntry = new DriveItem();
+ preEntry.name = toFilenameString(target);
+ return client.drive().items(sourceEntry.id).buildRequest().patch(preEntry);
}
- /** */
- private List getDirectoryEntries(Path dir, boolean useCache) throws IOException {
- final DriveItem entry = cache.getEntry(dir);
-
- if (!isFolder(entry)) {
-//System.err.println(entry.name + ", " + entry.id + ", " + entry.hashCode());
- throw new NotDirectoryException(dir.toString());
- }
-
- List list = null;
- if (useCache && cache.containsFolder(dir)) {
- list = cache.getFolder(dir);
- } else {
- list = new ArrayList<>(entry.folder.childCount);
-
- IDriveItemCollectionPage pages = client.drive().items(entry.id).children().buildRequest().get();
- while (pages != null) {
- for (final DriveItem child : pages.getCurrentPage()) {
- Path childPath = dir.resolve(child.name);
- list.add(childPath);
-//System.err.println("child: " + childPath.toRealPath().toString());
-
- cache.putFile(childPath, child);
- }
- pages = pages.getNextPage() != null ? pages.getNextPage().buildRequest().get() : null;
- }
- cache.putFolder(dir, list);
- }
+ @Override
+ protected Object getPathMetadata(DriveItem entry) throws IOException {
+ return new Metadata(this, entry);
+ }
- return list;
+ @Override
+ public void close() throws IOException {
+ closer.run();
}
- /** */
- private void removeEntry(Path path) throws IOException {
- DriveItem entry = cache.getEntry(path);
- if (isFolder(entry)) {
- if (getDirectoryEntries(path, false).size() > 0) {
- throw new DirectoryNotEmptyException(path.toString());
- }
+ @Override
+ public WatchService newWatchService() {
+ try {
+ return new OneDriveWatchService(client);
+ } catch (IOException e) {
+ throw new IllegalStateException(e);
}
+ }
- // TODO: unknown what happens when a move operation is performed
- // and the target already exists
- client.drive().items(entry.id).buildRequest().delete();
+ //
+ // user:attributes
+ //
+ /** attributes user:description */
+ void patchEntryDescription(DriveItem sourceEntry, String description) throws IOException {
+ DriveItem preEntry = new DriveItem();
+ preEntry.description = description;
+ DriveItem newEntry = client.drive().items(sourceEntry.id).buildRequest().patch(preEntry);
+ Path path = cache.getEntry(sourceEntry);
cache.removeEntry(path);
- }
-
- /** */
- private void copyEntry(final Path source, final Path target) throws IOException {
- DriveItem sourceEntry = cache.getEntry(source);
- DriveItem targetParentEntry = cache.getEntry(target.getParent());
- if (isFile(sourceEntry)) {
- ItemReference ir = new ItemReference();
- ir.id = targetParentEntry.id;
- IDriveItemCopyRequest request = client.drive().items(sourceEntry.id).copy(toFilenameString(target), ir).buildRequest();
- BaseRequest.class.cast(request).setHttpMethod(HttpMethod.POST); // #send() hides IDriveItemCopyRequest fields already set above.
- DriveItemCopyBody body = new DriveItemCopyBody(); // ditto
- body.name = toFilenameString(target); // ditto
- body.parentReference = ir; // ditto
- LraMonitorResponseHandler handler = new LraMonitorResponseHandler<>();
- @SuppressWarnings({ "unchecked", "rawtypes" }) // TODO
- LraSession copySession = client.getHttpProvider().send((IHttpRequest) request, LraMonitorResult.class, body, (IStatefulResponseHandler) handler).getSession();
- LraMonitorProvider copyMonitorProvider = new LraMonitorProvider<>(copySession, client, DriveItem.class);
- copyMonitorProvider.monitor(new IProgressCallback() {
- @Override
- public void progress(final long current, final long max) {
-Debug.println("copy progress: " + current + "/" + max);
- }
- @Override
- public void success(final DriveItem result) {
-Debug.println("copy done: " + result.id);
- cache.addEntry(target, result);
- }
- @Override
- public void failure(final ClientException ex) {
- throw new IllegalStateException(ex);
- }
- });
- } else if (isFolder(sourceEntry)) {
- // TODO java spec. allows empty folder
- throw new IsDirectoryException("source can not be a folder: " + source);
- }
+ cache.addEntry(path, newEntry);
}
/**
- * @param targetIsParent if the target is folder
+ * attributes user:thumbnail
+ * @param image currently only jpeg is available.
*/
- private void moveEntry(final Path source, final Path target, boolean targetIsParent) throws IOException {
- DriveItem sourceEntry = cache.getEntry(source);
- DriveItem targetParentEntry = cache.getEntry(targetIsParent ? target : target.getParent());
- if (isFile(sourceEntry)) {
- DriveItem preEntry = new DriveItem();
- preEntry.name = targetIsParent ? toFilenameString(source) : toFilenameString(target);
- preEntry.parentReference = new ItemReference();
- preEntry.parentReference.id = targetParentEntry.id;
- DriveItem patchedEntry = client.drive().items(sourceEntry.id).buildRequest().patch(preEntry);
- cache.removeEntry(source);
- if (targetIsParent) {
- cache.addEntry(target.resolve(source.getFileName()), patchedEntry);
- } else {
- cache.addEntry(target, patchedEntry);
- }
- } else if (isFolder(sourceEntry)) {
- DriveItem preEntry = new DriveItem();
- preEntry.name = toFilenameString(target);
- preEntry.folder = new Folder();
- preEntry.parentReference = new ItemReference();
- preEntry.parentReference.id = targetParentEntry.id;
- DriveItem patchedEntry = client.drive().items(sourceEntry.id).buildRequest().patch(preEntry);
- cache.moveEntry(source, target, patchedEntry);
- }
+ void setThumbnail(DriveItem sourceEntry, byte[] image) throws IOException {
+ ThumbnailUploadProvider provider = new ThumbnailUploadProvider(sourceEntry, client);
+ provider.upload(image);
+Debug.println(Level.INFO, "thumbnail updated: " + sourceEntry.name + ", size: " + image.length);
}
- /** */
- private void renameEntry(final Path source, final Path target) throws IOException {
- DriveItem sourceEntry = cache.getEntry(source);
-//Debug.println(sourceEntry.id + ", " + sourceEntry.name);
-
- DriveItem preEntry = new DriveItem();
- preEntry.name = toFilenameString(target);
- DriveItem patchedEntry = client.drive().items(sourceEntry.id).buildRequest().patch(preEntry);
- cache.removeEntry(source);
- cache.addEntry(target, patchedEntry);
+ /**
+ * attributes user:thumbnail
+ * @return url
+ * @see "https://stackoverflow.com/a/45027853"
+ */
+ String getThumbnail(DriveItem sourceEntry) throws IOException {
+ IThumbnailSetCollectionPage page = client.drive().items(sourceEntry.id)
+ .thumbnails()
+ .buildRequest(Arrays.asList(new QueryOption("select", "source")))
+ .get();
+ ThumbnailSet set = page.getCurrentPage().get(0);
+Debug.println(Level.INFO, "thumbnail url: " + set.source.url);
+ return set.source.url;
}
}
diff --git a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemProvider.java b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemProvider.java
index 62b69198..e61f9482 100644
--- a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemProvider.java
+++ b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemProvider.java
@@ -26,6 +26,8 @@ public final class OneDriveFileSystemProvider extends FileSystemProviderBase {
public static final String ENV_APP_CREDENTIAL = "app_credential";
+ public static final String ENV_USE_SYSTEM_WATCHER = "use_system_watcher";
+
public OneDriveFileSystemProvider() {
super(new OneDriveFileSystemRepository());
}
diff --git a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemRepository.java b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemRepository.java
index a75f3a55..4fd3d688 100644
--- a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemRepository.java
+++ b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveFileSystemRepository.java
@@ -80,7 +80,8 @@ public FileSystemDriver createDriver(final URI uri, final Map env) th
}
// 3. process
- String accessToken = new MicrosoftGraphOAuth2(appCredential, true).authorize(userCredential);
+ MicrosoftGraphOAuth2 oAuth2 = new MicrosoftGraphOAuth2(appCredential, true);
+ String accessToken = oAuth2.authorize(userCredential);
//Debug.println("accessToken: " + accessToken);
IAuthenticationProvider authenticationProvider = new IAuthenticationProvider() {
@@ -95,6 +96,6 @@ public void authenticateRequest(IHttpRequest request) {
.buildClient();
final OneDriveFileStore fileStore = new OneDriveFileStore(graphClient, factoryProvider.getAttributesFactory());
- return new OneDriveFileSystemDriver(fileStore, factoryProvider, graphClient, env);
+ return new OneDriveFileSystemDriver(fileStore, factoryProvider, graphClient, () -> oAuth2.close(), env);
}
}
diff --git a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveUploadOption.java b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveUploadOption.java
index 73e32e31..83f38eb3 100644
--- a/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveUploadOption.java
+++ b/vavi-nio-file-onedrive4/src/main/java/vavi/nio/file/onedrive4/OneDriveUploadOption.java
@@ -14,6 +14,10 @@
/**
* OneDriveUploadOption.
*
+ * in {@link com.github.fge.filesystem.options.FileSystemOptionsFactory},
+ * instances of this class are compared by contains method. so i override
+ * {@link #equals(Object)} and {@link #hashCode()}.
+ *