preserves photos filenames when importing#1227
Open
aksingh737 wants to merge 2 commits intodtinit:masterfrom
Open
preserves photos filenames when importing#1227aksingh737 wants to merge 2 commits intodtinit:masterfrom
aksingh737 wants to merge 2 commits intodtinit:masterfrom
Conversation
jzacsh
requested changes
Apr 27, 2023
Collaborator
jzacsh
left a comment
jzacsh
left a comment
There was a problem hiding this comment.
LGTM - just need to sync; eg:
# get the latest changes in your repos
git checkout master &&
git pull upstream master &&
git push origin master
assuming the above went well, then do:
# merge the latest changes with your branch
photosImporter=extensions/data-transfer/portability-data-transfer-google/src/main/java/org/datatransferproject/datatransfer/google/photos/GooglePhotosImporter.java
git checkout preserver-filename-photos-fix &&
git show master:"$photosImporter" > "$photosImporter" &&
git commit -m 'WIP: reverting fix in prep for file-move from mege' "$photosImporter" &&
git merge master
# now you can re-write your fix into GPhotosUpload
| try (InputStream s = streamWrapper.getStream()) { | ||
| String uploadToken = getOrCreatePhotosInterface(jobId, authData).uploadPhotoContent(s, | ||
| photo.getSha1()); | ||
| photo.getSha1(), photo.getTitle()); |
Collaborator
There was a problem hiding this comment.
note I think this now lives in GPhotosUpload class, so you'll have to revert this file, merge ,and then re-add this param in the new class.
| .encodeToString(BaseEncoding.base16().decode(sha1.toUpperCase()))); | ||
| } | ||
|
|
||
| if(!title.isEmpty()) |
Collaborator
There was a problem hiding this comment.
nit: style here is a bit weird - I'm guessing this was just wonkiness from your new IDE setup
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.