Skip to content

align listContents with local filesystem adapter #16

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

Open
ylebre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

align listContents with local filesystem adapter #16

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
16 changes: 15 additions & 1 deletion src/Nextcloud.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,21 @@ final public function listContents(string $directory = '', bool $recursive = fal
$nodes = $node->getDirectoryListing();

$result = array_map(function (\OCP\Files\Node $node) {
return $this->normalizeNodeInfo($node);
$attributes = $this->normalizeNodeInfo($node);
if ($this->isDirectory($node)) {
return new DirectoryAttributes(
$attributes['path'],
$attributes['visibility'],
$attributes['time']
);
} else {
return new FileAttributes(
$attributes['path'],
$attributes['size'],
$attributes['visibility'],
$attributes['timestamp']
);
}
}, $nodes);
}

Expand Down
15 changes: 13 additions & 2 deletions src/NextcloudCalendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,12 @@ final public function listContents(string $directory = '', bool $recursive = fal
$calendars = $this->calDavBackend->getCalendarsForUser($this->userId);

return array_map(function ($calendar) {
return $this->normalizeCalendar($calendar);
$attributes = $this->normalizeCalendar($calendar);
return new DirectoryAttributes(
$attributes['path'],
$attributes['visibility'],
$attributes['time']
);
}, $calendars);
} else {
$directory = basename($directory);
Expand All @@ -260,7 +265,13 @@ final public function listContents(string $directory = '', bool $recursive = fal
}

return array_map(function($calendarItem) use ($directory) {
return $this->normalizeCalendarItem($calendarItem, $directory);
$attributes = $this->normalizeCalendarItem($calendarItem, $directory);
return new FileAttributes(
$attributes['path'],
$attributes['size'],
$attributes['visibility'],
$attributes['timestamp']
);
}, $contents);
}
}
Expand Down
15 changes: 13 additions & 2 deletions src/NextcloudContacts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,12 @@ final public function listContents(string $directory = '', bool $recursive = fal
$addressBooks = $this->cardDavBackend->getAddressBooksForUser($this->userId);

return array_map(function ($addressBook) {
return $this->normalizeAddressBook($addressBook);
$attributes = $this->normalizeAddressBook($addressBook);
return new DirectoryAttributes(
$attributes['path'],
$attributes['visibility'],
$attributes['time']
);
}, $addressBooks);
} else {
$directory = basename($directory);
Expand All @@ -266,7 +271,13 @@ final public function listContents(string $directory = '', bool $recursive = fal
}

return array_map(function($card) use ($directory) {
return $this->normalizeCard($card, $directory);
$attributes = $this->normalizeCard($card, $directory);
return new FileAttributes(
$attributes['path'],
$attributes['size'],
$attributes['visibility'],
$attributes['timestamp']
);
}, $contents);
}
}
Expand Down
11 changes: 8 additions & 3 deletions src/NextcloudProfile.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,14 @@ final public function directoryExists(string $path): bool
*/
final public function listContents(string $directory = '', bool $recursive = false): iterable
{
return [
$this->normalizeProfile()
];
$attributes = $this->normalizeProfile();

return [new FileAttributes(
$attributes['path'],
$attributes['size'],
$attributes['visibility'],
$attributes['timestamp']
)];
}

/**
Expand Down
Loading