Skip to content

Commit 0ba70e9

Browse files
filter non folders
1 parent c3b5a5c commit 0ba70e9

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

DriveBackup/src/main/java/ratismal/drivebackup/uploaders/onedrive/OneDriveUploader.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,13 @@ private FQID getRootFolder(@NotNull String folder) throws IOException, GraphApiE
339339
*/
340340
@Nullable
341341
private FQID getFolder(@NotNull FQID root, @NotNull String folder) throws IOException, GraphApiErrorException {
342-
for (JSONObject childItem : getChildren(root, "?select=name,id,parentReference,remoteItem")) {
343-
String folderName = childItem.getString("name"); // TODO filter non folders
344-
if (folder.equals(folderName)) {
342+
String queryParams = "?select=name,id,folder,parentReference,remoteItem";
343+
for (JSONObject childItem : getChildren(root, queryParams)) {
344+
String itemName = childItem.getString("name");
345+
if (folder.equals(itemName)) {
346+
if (!childItem.has("folder")) {
347+
return null;
348+
}
345349
if (childItem.has("remoteItem")) {
346350
childItem = childItem.getJSONObject("remoteItem");
347351
}

0 commit comments

Comments
 (0)