Parse QuickXorHash.

Author: dkocher

onedrive/src/main/java/ch/cyberduck/core/onedrive/features/GraphAttributesFinderFeature.java

@@ -33,23 +33,21 @@
 import org.nuxeo.onedrive.client.OneDriveAPIException;
 import org.nuxeo.onedrive.client.types.DriveItem;
 import org.nuxeo.onedrive.client.types.DriveItemVersion;
+import org.nuxeo.onedrive.client.types.File;
 import org.nuxeo.onedrive.client.types.FileSystemInfo;
+import org.nuxeo.onedrive.client.types.Hashes;
 import org.nuxeo.onedrive.client.types.Publication;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Optional;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 
 public class GraphAttributesFinderFeature implements AttributesFinder, AttributesAdapter<DriveItem.Metadata> {
 
     private final GraphSession session;
     private final GraphFileIdProvider fileid;
 
-    private static final Pattern ETAG_PATTERN = Pattern.compile("\"\\{([0-9A-Z-]+)\\},\\d+\"");
-
     public GraphAttributesFinderFeature(final GraphSession session, final GraphFileIdProvider fileid) {
         this.session = session;
         this.fileid = fileid;
@@ -94,10 +92,11 @@ private DriveItem.Metadata toMetadata(final Path file, final DriveItem item) thr
     public PathAttributes toAttributes(final DriveItem.Metadata metadata) {
         final PathAttributes attributes = new PathAttributes();
         attributes.setETag(metadata.getETag());
-        if(null != metadata.getETag()) {
-            final Matcher matcher = ETAG_PATTERN.matcher(metadata.getETag());
-            if(matcher.matches()) {
-                attributes.setChecksum(Checksum.parse(matcher.group(1)));
+        final File file = metadata.getFile();
+        if(file != null) {
+            final Hashes hashes = file.getHashes();
+            if(hashes != null) {
+                attributes.setChecksum(Checksum.parse(hashes.getQuickXorHash()));
             }
         }
         Optional<DescriptiveUrl> webUrl = getWebUrl(metadata);

onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphAttributesFinderFeatureTest.java

@@ -22,7 +22,7 @@
 import ch.cyberduck.core.exception.NotfoundException;
 import ch.cyberduck.core.features.Delete;
 import ch.cyberduck.core.features.Home;
-import ch.cyberduck.core.io.HashAlgorithm;
+import ch.cyberduck.core.io.Checksum;
 import ch.cyberduck.core.onedrive.features.GraphAttributesFinderFeature;
 import ch.cyberduck.core.onedrive.features.GraphDeleteFeature;
 import ch.cyberduck.core.onedrive.features.GraphDirectoryFeature;
@@ -64,8 +64,7 @@ public void testFindFile() throws Exception {
         assertNotEquals(-1L, attributes.getCreationDate());
         assertNotEquals(-1L, attributes.getModificationDate());
         assertNotNull(attributes.getETag());
-        assertNotNull(attributes.getChecksum());
-        assertEquals(HashAlgorithm.uuid, attributes.getChecksum().algorithm);
+        assertNotEquals(Checksum.NONE, attributes.getChecksum());
         assertNull(attributes.getVersionId());
         assertNotNull(attributes.getLink());
         assertNotNull(attributes.getFileId());
@@ -83,7 +82,7 @@ public void testFindDirectory() throws Exception {
         assertNotEquals(-1L, attributes.getModificationDate());
         assertNotNull(attributes.getETag());
         assertNotNull(attributes.getChecksum());
-        assertEquals(HashAlgorithm.uuid, attributes.getChecksum().algorithm);
+        assertEquals(Checksum.NONE, attributes.getChecksum().algorithm);
         assertNull(attributes.getVersionId());
         assertNotNull(attributes.getLink());
         assertNotNull(attributes.getFileId());

onedrive/src/test/java/ch/cyberduck/core/onedrive/GraphMoveFeatureTest.java

@@ -104,7 +104,8 @@ public void testMove() throws BackgroundException {
         Path touchedFile = new Path(drive, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
         touch.touch(touchedFile, new TransferStatus().setMime("x-application/cyberduck"));
         final PathAttributes attributes = attributesFinder.find(touchedFile);
-
+        assertEquals("AAAAAAAAAAAAAAAAAAAAAAAAAAA=", attributes.getChecksum().base64);
+        assertEquals("0000000000000000000000000000000000000000", attributes.getChecksum().hex);
         Path rename = new Path(targetDirectory, touchedFile.getName(), EnumSet.of(Path.Type.file));
         assertTrue(move.isSupported(touchedFile, Optional.of(rename)));
         final Path target = move.move(touchedFile, rename, new TransferStatus(), new Delete.DisabledCallback(), new DisabledConnectionCallback());

onedrive/src/test/java/ch/cyberduck/core/onedrive/OneDriveWriteFeatureTest.java

@@ -62,32 +62,33 @@ public void testWrite() throws Exception {
         final PathAttributes folderAttributes = new GraphAttributesFinderFeature(session, fileid).find(folder);
         final String folderEtag = folderAttributes.getETag();
         final long folderTimestamp = folderAttributes.getModificationDate();
-        final byte[] content = RandomUtils.nextBytes(5 * 1024 * 1024);
+        final byte[] sourceContent = RandomUtils.nextBytes(5 * 1024 * 1024);
         final TransferStatus status = new TransferStatus();
-        status.setLength(content.length);
+        status.setLength(sourceContent.length);
         final Path file = new Path(folder, new AlphanumericRandomStringService().random(), EnumSet.of(Path.Type.file));
         final String id = new GraphTouchFeature(session, fileid).touch(file, new TransferStatus()).attributes().getFileId();
         final StatusOutputStream<DriveItem.Metadata> out = feature.write(file, status, new DisabledConnectionCallback());
-        new StreamCopier(status, status).transfer(new ByteArrayInputStream(content), out);
+        new StreamCopier(status, status).transfer(new ByteArrayInputStream(sourceContent), out);
         assertNotNull(out.getStatus());
         assertTrue(status.isComplete());
         assertNotSame(PathAttributes.EMPTY, status.getResponse());
         assertEquals(Protocol.DirectoryTimestamp.explicit, session.getHost().getProtocol().getDirectoryTimestamp());
         assertEquals(folderEtag, new GraphAttributesFinderFeature(session, fileid).find(folder).getETag());
         assertEquals(folderTimestamp, new GraphAttributesFinderFeature(session, fileid).find(folder).getModificationDate());
         assertTrue(new DefaultFindFeature(session).find(file));
-        final byte[] compare = new byte[content.length];
-        final InputStream stream = new GraphReadFeature(session, fileid).read(file, new TransferStatus().setLength(content.length), new DisabledConnectionCallback());
+        final byte[] compare = new byte[sourceContent.length];
+        final InputStream stream = new GraphReadFeature(session, fileid).read(file, new TransferStatus().setLength(sourceContent.length), new DisabledConnectionCallback());
         IOUtils.readFully(stream, compare);
         stream.close();
-        assertArrayEquals(content, compare);
+        assertArrayEquals(sourceContent, compare);
         final Path copy = new Path(file);
         copy.attributes().setCustom(Collections.emptyMap());
         assertEquals(id, fileid.getFileId(copy));
         // Overwrite
         final StatusOutputStream<DriveItem.Metadata> overwrite = feature.write(file, status.setExists(true), new DisabledConnectionCallback());
         assertNotNull(overwrite);
-        assertEquals(content.length, IOUtils.copyLarge(new ByteArrayInputStream(content), overwrite));
+        final byte[] overwriteContent = RandomUtils.nextBytes(5 * 1024 * 1024);
+        assertEquals(overwriteContent.length, IOUtils.copyLarge(new ByteArrayInputStream(overwriteContent), overwrite));
         overwrite.close();
         final PathAttributes overwriteAttr = new GraphAttributesFinderFeature(session, fileid).toAttributes(overwrite.getStatus());
         assertEquals(overwriteAttr, new GraphAttributesFinderFeature(session, fileid).find(file));