Skip to content

fix: include timestamp in DriveImporter root folder #1309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexeyqu-fb merged 6 commits into from
Dec 8, 2023
Merged

fix: include timestamp in DriveImporter root folder #1309

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dab6ead
fix: include timestamp in drive root folder
alexeyqu-fb Dec 1, 2023
e2c773b
Merge branch 'master' into fix/include-timestamp-drive-root-folder
alexeyqu-fb Dec 1, 2023
622a1bb
use hypnens
alexeyqu-fb Dec 1, 2023
248050b
Merge branch 'fix/include-timestamp-drive-root-folder' of github.com:…
alexeyqu-fb Dec 1, 2023
2ee5bf6
Merge branch 'master' of github.com:google/data-transfer-project into…
alexeyqu-fb Dec 8, 2023
2e45a43
add todo
alexeyqu-fb Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ...google/src/main/java/org/datatransferproject/datatransfer/google/drive/DriveImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.UUID;
import org.datatransferproject.api.launcher.Monitor;
import org.datatransferproject.datatransfer.google.common.GoogleCredentialFactory;
Expand All @@ -30,6 +32,7 @@
public final class DriveImporter
implements Importer<TokensAndUrlAuthData, BlobbyStorageContainerResource> {
private static final String ROOT_FOLDER_ID = "root-id";
private static final String ROOT_FOLDER_FORMAT_STRING = "transfer-%s";

private final GoogleCredentialFactory credentialFactory;
private final TemporaryPerJobDataStore jobStore;
Expand Down Expand Up @@ -63,7 +66,7 @@ public ImportResult importItem(
idempotentExecutor.executeOrThrowException(
ROOT_FOLDER_ID,
data.getName(),
() -> importSingleFolder(driveInterface, "MigratedContent", null));
() -> importSingleFolder(driveInterface, getRootFolderName(), null));
} else {
parentId = idempotentExecutor.getCachedValue(data.getId());
}
Expand Down Expand Up @@ -153,4 +156,11 @@ private synchronized Drive getDriveInterface(TokensAndUrlAuthData authData) {

return driveInterface;
}

private String getRootFolderName() {
// TODO(alexeyqu): use PortabilityJob.createdTimestamp here for consistency
return String.format(
ROOT_FOLDER_FORMAT_STRING,
new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date()));
}
}