Skip to content

Commit 2cffbf2

Browse files
authored
fix: include timestamp in DriveImporter root folder (#1309)
1 parent 8a14321 commit 2cffbf2

File tree

1 file changed

+11
-1
lines changed
  • extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/drive

1 file changed

+11
-1
lines changed

extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/drive/DriveImporter.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.google.common.base.Strings;
1313
import com.google.common.collect.ImmutableList;
1414
import java.io.IOException;
15+
import java.text.SimpleDateFormat;
16+
import java.util.Date;
1517
import java.util.UUID;
1618
import org.datatransferproject.api.launcher.Monitor;
1719
import org.datatransferproject.datatransfer.google.common.GoogleCredentialFactory;
@@ -30,6 +32,7 @@
3032
public final class DriveImporter
3133
implements Importer<TokensAndUrlAuthData, BlobbyStorageContainerResource> {
3234
private static final String ROOT_FOLDER_ID = "root-id";
35+
private static final String ROOT_FOLDER_FORMAT_STRING = "transfer-%s";
3336

3437
private final GoogleCredentialFactory credentialFactory;
3538
private final TemporaryPerJobDataStore jobStore;
@@ -63,7 +66,7 @@ public ImportResult importItem(
6366
idempotentExecutor.executeOrThrowException(
6467
ROOT_FOLDER_ID,
6568
data.getName(),
66-
() -> importSingleFolder(driveInterface, "MigratedContent", null));
69+
() -> importSingleFolder(driveInterface, getRootFolderName(), null));
6770
} else {
6871
parentId = idempotentExecutor.getCachedValue(data.getId());
6972
}
@@ -153,4 +156,11 @@ private synchronized Drive getDriveInterface(TokensAndUrlAuthData authData) {
153156

154157
return driveInterface;
155158
}
159+
160+
private String getRootFolderName() {
161+
// TODO(alexeyqu): use PortabilityJob.createdTimestamp here for consistency
162+
return String.format(
163+
ROOT_FOLDER_FORMAT_STRING,
164+
new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date()));
165+
}
156166
}

0 commit comments

Comments
 (0)