Skip to content
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

Add creation time field to GoogleMediaItem and populate the upload time for the media models. #1306

Merged
merged 42 commits into from
Jan 3, 2024
Merged

Add creation time field to GoogleMediaItem and populate the upload time for the media models. #1306

Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
154e8ec
First changelist description
aksingh737 Apr 21, 2023
1ab1f67
Merge remote-tracking branch 'origin/master' into master-dtp
aksingh737 Sep 6, 2023
13fcba5
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Sep 7, 2023
7dd9fc8
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Sep 29, 2023
debf243
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Oct 24, 2023
36bfb5f
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Nov 15, 2023
09bb4d9
Merge remote-tracking branch 'upstream/master' into master-dtp
aksingh737 Nov 27, 2023
9be9ff9
Fixes upload time bug. Upload time wasn't being populated
aksingh737 Nov 28, 2023
df1de36
Merge branch 'master' of /~https://github.com/google/data-transfer-project
aksingh737 Nov 28, 2023
7671b3e
Merge branch 'master' of github.com:aksingh737/data-transfer-project …
aksingh737 Nov 28, 2023
330465f
remove unused code
aksingh737 Nov 28, 2023
ec8d12f
remove en secrets
aksingh737 Nov 28, 2023
b70332d
remove useless changelist
aksingh737 Nov 28, 2023
5dc41e7
Merge pull request #1 from aksingh737/uploadTimeBug
aksingh737 Nov 28, 2023
d450001
adressed the comments on the changelist
aksingh737 Nov 29, 2023
b1feaa9
Merge pull request #2 from aksingh737/uploadTimeBug
aksingh737 Nov 29, 2023
c66c0ae
fix tests
aksingh737 Nov 29, 2023
67fe6f9
Merge pull request #3 from aksingh737/uploadTimeBug
aksingh737 Nov 29, 2023
ab251a1
Verify creationTime is not null and can be parsed. Skip item if metad…
aksingh737 Dec 1, 2023
d00ea59
Removed nullException check and addressed comments.
aksingh737 Dec 4, 2023
a68cab8
cleanup and syntax.
aksingh737 Dec 4, 2023
09380bd
added env.secrets to gitignore
aksingh737 Dec 4, 2023
5263ad9
Merge conflict and syntax clean up
aksingh737 Dec 4, 2023
7607f9f
Update excceptions to ParseException
aksingh737 Dec 4, 2023
480e5d9
removed not needed logging
aksingh737 Dec 4, 2023
344e157
remove gitignore
aksingh737 Dec 4, 2023
c15ce56
removed end.secrets file
aksingh737 Dec 4, 2023
92b7ded
remove ws
aksingh737 Dec 4, 2023
533e22a
Added logging and addressed comments
aksingh737 Dec 5, 2023
be59841
Syntax formating and refactoring
aksingh737 Dec 5, 2023
372f3db
removed extra new lines
aksingh737 Dec 5, 2023
86ef255
Merge branch 'google:master' into uploadTimeBug
aksingh737 Dec 8, 2023
4368ad9
Merge remote-tracking branch 'upstream/master' into uploadTimeBug
aksingh737 Dec 8, 2023
31ccd8e
Merge branch 'uploadTimeBug' of github.com:aksingh737/data-transfer-p…
aksingh737 Dec 20, 2023
1c073bb
Merge remote-tracking branch 'origin' into uploadTimeBug
aksingh737 Dec 20, 2023
31a9958
Merge remote-tracking branch 'upstream/master' into uploadTimeBug
aksingh737 Dec 20, 2023
9463c30
Add errorlogging for failed media items
aksingh737 Dec 20, 2023
bb83ca0
Inlined errorDetail
aksingh737 Dec 20, 2023
45b82db
Merge remote-tracking branch 'upstream/master' into uploadTimeBug
aksingh737 Dec 20, 2023
6660d6e
Logged errors and addressed merge issues
aksingh737 Dec 20, 2023
1ca3610
Catching exception in a single block
aksingh737 Dec 21, 2023
f4a0855
Added error logging to GoogleVideoExporter
aksingh737 Dec 21, 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
Prev Previous commit
Next Next commit
Inlined errorDetail
  • Loading branch information
@aksingh737
aksingh737 committed Dec 20, 2023
commit bb83ca0e50cdda505e760c85859e9b294d5b3544
30 changes: 10 additions & 20 deletions .../src/main/java/org/datatransferproject/datatransfer/google/media/GoogleMediaExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,10 +232,8 @@ private ExportResult<MediaContainerResource> exportPhotosContainer(
monitor.info(() -> "Parse exception occurred while converting photo, skipping this item. "
+ "Failure message : %s ", e.getMessage());

ErrorDetail errorDetail =
GoogleErrorLogger.createErrorDetail(
googleMediaItem.getId(), googleMediaItem.getFilename(), e, /* canSkip= */ true);
errors.add(errorDetail);
errors.add(GoogleErrorLogger.createErrorDetail(
googleMediaItem.getId(), googleMediaItem.getFilename(), e, /* canSkip= */ true));
}
}
// Log all the errors in 1 commit to DataStore
Expand Down Expand Up @@ -283,10 +281,8 @@ private ExportResult<MediaContainerResource> exportMediaContainer(
monitor.info(() -> "Parse exception occurred while converting photo, skipping this item. "
+ "Failure message : %s ", e.getMessage());

ErrorDetail errorDetail =
GoogleErrorLogger.createErrorDetail(
photoMediaItem.getId(), photoMediaItem.getFilename(), e, /* canSkip= */ true);
errors.add(errorDetail);
errors.add(GoogleErrorLogger.createErrorDetail(
photoMediaItem.getId(), photoMediaItem.getFilename(), e, /* canSkip= */ true));
}
}

Expand All @@ -303,10 +299,8 @@ private ExportResult<MediaContainerResource> exportMediaContainer(
monitor.info(() -> "Parse exception occurred while converting video, skipping this item. "
+ "Failure message : %s ", e.getMessage());

ErrorDetail errorDetail =
GoogleErrorLogger.createErrorDetail(
videoMediaItem.getId(), videoMediaItem.getFilename(), e, /* canSkip= */ true);
errors.add(errorDetail);
errors.add(GoogleErrorLogger.createErrorDetail(
videoMediaItem.getId(), videoMediaItem.getFilename(), e, /* canSkip= */ true));
}
}

Expand Down Expand Up @@ -495,10 +489,8 @@ private MediaContainerResource convertMediaListToResource(
monitor.info(() -> "Parse exception occurred while converting photo, skipping this item. "
+ "Failure message : %s ", e.getMessage());

ErrorDetail errorDetail =
GoogleErrorLogger.createErrorDetail(
mediaItem.getId(), mediaItem.getFilename(), e, /* canSkip= */ true);
errors.add(errorDetail);
errors.add(GoogleErrorLogger.createErrorDetail(
mediaItem.getId(), mediaItem.getFilename(), e, /* canSkip= */ true));
}
}
} else if (mediaItem.isVideo()) {
Expand All @@ -513,10 +505,8 @@ private MediaContainerResource convertMediaListToResource(
monitor.info(() -> "Parse exception occurred while converting video, skipping this item. "
+ "Failure message : %s ", e.getMessage());

ErrorDetail errorDetail =
GoogleErrorLogger.createErrorDetail(
mediaItem.getId(), mediaItem.getFilename(), e, /* canSkip= */ true);
errors.add(errorDetail);
errors.add(GoogleErrorLogger.createErrorDetail(
mediaItem.getId(), mediaItem.getFilename(), e, /* canSkip= */ true));
}
}
}
Expand Down