Skip to content

Filter early on non-constructible path #17340

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
merged 1 commit into from
Aug 21, 2025
Merged

Filter early on non-constructible path #17340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions onedrive/src/main/java/ch/cyberduck/core/onedrive/AbstractDriveListService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,17 @@ protected Path toPath(final Drive.Metadata metadata, final Path directory) {
attributes.setSize(used);
}
}
String name = metadata.getName();
if(StringUtils.isBlank(metadata.getName())) {
name = metadata.getId();
}
return new Path(directory, name, EnumSet.of(Path.Type.directory, Path.Type.volume), attributes);
return new Path(directory, metadata.getName(), EnumSet.of(Path.Type.directory, Path.Type.volume), attributes);
}

@Override
protected boolean filter(final Path directory, final Metadata metadata) {
if(StringUtils.isBlank(metadata.getId())) {
return false;
}
if(StringUtils.isBlank(metadata.getName())) {
return false;
}
return super.filter(directory, metadata);
}
}
6 changes: 3 additions & 3 deletions onedrive/src/main/java/ch/cyberduck/core/onedrive/AbstractItemListService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

import org.apache.commons.lang3.StringUtils;
import org.nuxeo.onedrive.client.types.DriveItem;
import org.nuxeo.onedrive.client.types.DriveItem.Metadata;

import java.util.EnumSet;

Expand Down Expand Up @@ -53,8 +52,9 @@ protected Path toPath(final DriveItem.Metadata metadata, final Path directory) {
}

@Override
protected boolean filter(final Path directory, final Metadata metadata) {
if(StringUtils.isBlank(metadata.getId())) {
protected boolean filter(final Path directory, final DriveItem.Metadata metadata) {
// Don't filter on Id, as it is generated in toPath() from Session.
if(StringUtils.isBlank(metadata.getName())) {
return false;
}
return super.filter(directory, metadata);
Expand Down
12 changes: 4 additions & 8 deletions onedrive/src/main/java/ch/cyberduck/core/onedrive/features/sharepoint/GroupListService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,17 @@ protected Iterator<GroupItem.Metadata> getIterator(final Path directory) {
protected Path toPath(final GroupItem.Metadata metadata, final Path directory) {
final PathAttributes attributes = new PathAttributes();
attributes.setFileId(metadata.getId());
final String name;
if(StringUtils.isBlank(metadata.getDisplayName())) {
name = metadata.getId();
}
else {
name = metadata.getDisplayName();
}
return new Path(directory, name, EnumSet.of(Path.Type.volume, Path.Type.directory, Path.Type.placeholder), attributes);
return new Path(directory, metadata.getDisplayName(), EnumSet.of(Path.Type.volume, Path.Type.directory, Path.Type.placeholder), attributes);
}

@Override
protected boolean filter(final Path directory, final GroupItem.Metadata metadata) {
if(StringUtils.isBlank(metadata.getId())) {
return false;
}
if(StringUtils.isBlank(metadata.getDisplayName())) {
return false;
}
return super.filter(directory, metadata);
}
}
3 changes: 3 additions & 0 deletions onedrive/src/main/java/ch/cyberduck/core/onedrive/features/sharepoint/SitesListService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ protected boolean filter(final Path directory, final Metadata metadata) {
if(StringUtils.isBlank(metadata.getId())) {
return false;
}
if(StringUtils.isBlank(metadata.getName())) {
return false;
}
if(!session.isSingleSite() && directory.getParent().isRoot()) {
if(metadata.getRoot() == null) {
return false;
Expand Down
Loading