Skip to content

Fix base album url in MicrosoftMediaImporter #1220

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
jzacsh merged 2 commits into from
Mar 15, 2023
Merged

Fix base album url in MicrosoftMediaImporter #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57b9b13
Fix base album url in MicrosoftMediaImporter
seehamrun Mar 15, 2023
3cdb089
Fix tests
seehamrun Mar 15, 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
11 changes: 8 additions & 3 deletions ...rc/main/java/org/datatransferproject/transfer/microsoft/media/MicrosoftMediaImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,17 @@ public MicrosoftMediaImporter(String baseUrl, OkHttpClient client, ObjectMapper
TemporaryPerJobDataStore jobStore, Monitor monitor,
MicrosoftCredentialFactory credentialFactory) {

createFolderUrl = baseUrl + "/v1.0/me/drive/special/photo-video/children";
// NOTE: "special/photos" is a specific folder in One Drive that corresponds to items that
// should appear in https://photos.onedrive.com/, for more information see:
// https://learn.microsoft.com/en-us/onedrive/developer/rest-api/api/drive_get_specialfolder?#special-folder-names
createFolderUrl = baseUrl + "/v1.0/me/drive/special/photos/children";
albumlessMediaUrlTemplate =
baseUrl + "/v1.0/me/drive/special/photos:/%s:/createUploadSession%s";

// first param is the folder id, second param is the file name
// /me/drive/items/{parent-id}:/{filename}:/content;
uploadMediaUrlTemplate = baseUrl + "/v1.0/me/drive/items/%s:/%s:/createUploadSession%s";
albumlessMediaUrlTemplate =
baseUrl + "/v1.0/me/drive/special/photo-video:/%s:/createUploadSession%s";


this.client = client;
this.objectMapper = objectMapper;
Expand Down
6 changes: 3 additions & 3 deletions ...est/java/org/datatransferproject/transfer/microsoft/media/MicrosoftMediaImporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public void testCleanAlbumNames() throws Exception {
}

return r.url().toString().equals(
"https://www.baseurl.com/v1.0/me/drive/special/photo-video/children")
"https://www.baseurl.com/v1.0/me/drive/special/photos/children")
&& body.contains("album1_");
}));
Response response = mock(Response.class);
Expand Down Expand Up @@ -151,7 +151,7 @@ public void testImportItemPermissionDenied() throws Exception {
doReturn(call).when(client).newCall(
argThat((Request r)
-> r.url().toString().equals(
"https://www.baseurl.com/v1.0/me/drive/special/photo-video/children")));
"https://www.baseurl.com/v1.0/me/drive/special/photos/children")));
Response response = mock(Response.class);
ResponseBody body = mock(ResponseBody.class);
when(body.bytes())
Expand Down Expand Up @@ -189,7 +189,7 @@ public void testImportItemAllSuccess() throws Exception {
doReturn(call).when(client).newCall(
argThat((Request r)
-> r.url().toString().equals(
"https://www.baseurl.com/v1.0/me/drive/special/photo-video/children")));
"https://www.baseurl.com/v1.0/me/drive/special/photos/children")));
Response response = mock(Response.class);
ResponseBody body = mock(ResponseBody.class);
when(body.bytes())
Expand Down