Add an API for calendar providers #28970
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,7 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright 2017, Georg Ehrke <[email protected]> | ||
| * | ||
|
|
@@ -51,7 +54,7 @@ public function __construct(Calendar $calendar, array $calendarInfo, | |
| $this->calendarInfo = $calendarInfo; | ||
| $this->backend = $backend; | ||
| } | ||
|
|
||
| /** | ||
| * @return string defining the technical unique key | ||
| * @since 13.0.0 | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright 2021 Anna Larch <[email protected]> | ||
| * | ||
| * @author Anna Larch <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| namespace OCA\DAV\CalDAV; | ||
|
|
||
| use OCP\Calendar\ICalendarProvider; | ||
| use OCP\IConfig; | ||
| use OCP\IL10N; | ||
|
|
||
| class CalendarProvider implements ICalendarProvider { | ||
|
|
||
| /** @var CalDavBackend */ | ||
| private $calDavBackend; | ||
|
|
||
| /** @var IL10N */ | ||
| private $l10n; | ||
|
|
||
| /** @var IConfig */ | ||
| private $config; | ||
|
|
||
| public function __construct(CalDavBackend $calDavBackend, IL10N $l10n, IConfig $config) { | ||
| $this->calDavBackend = $calDavBackend; | ||
| $this->l10n = $l10n; | ||
| $this->config = $config; | ||
| } | ||
|
|
||
| public function getCalendars(string $principalUri, array $calendarUris = []): array { | ||
| $calendarInfos = []; | ||
| if (empty($calendarUris)) { | ||
| $calendarInfos[] = $this->calDavBackend->getCalendarsForUser($principalUri); | ||
| } else { | ||
| foreach ($calendarUris as $calendarUri) { | ||
| $calendarInfos[] = $this->calDavBackend->getCalendarByUri($principalUri, $calendarUri); | ||
miaulalala marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
|
|
||
| $calendarInfos = array_filter($calendarInfos); | ||
|
|
||
| $iCalendars = []; | ||
| foreach ($calendarInfos as $calendarInfo) { | ||
miaulalala marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| $calendar = new Calendar($this->calDavBackend, $calendarInfo, $this->l10n, $this->config); | ||
| $iCalendars[] = new CalendarImpl( | ||
| $calendar, | ||
| $calendarInfo, | ||
| $this->calDavBackend, | ||
| ); | ||
| } | ||
| return $iCalendars; | ||
| } | ||
| } | ||
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright 2021 Anna Larch <[email protected]> | ||
| * | ||
| * @author Anna Larch <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
| namespace OC\Calendar; | ||
|
|
||
| use OCP\Calendar\ICalendarQuery; | ||
|
|
||
| class CalendarQuery implements ICalendarQuery { | ||
|
|
||
| /** @var string */ | ||
| private $principalUri; | ||
|
|
||
| /** @var array */ | ||
| public $searchProperties; | ||
|
|
||
| /** @var string|null */ | ||
| private $searchPattern; | ||
|
|
||
| /** @var array */ | ||
| private $options; | ||
|
|
||
| /** @var int|null */ | ||
| private $offset; | ||
|
|
||
| /** @var int|null */ | ||
| private $limit; | ||
|
|
||
| /** @var array */ | ||
| private $calendarUris; | ||
|
|
||
| public function __construct(string $principalUri) { | ||
| $this->principalUri = $principalUri; | ||
| $this->searchProperties = []; | ||
| $this->options = [ | ||
| 'types' => [], | ||
| ]; | ||
| } | ||
|
|
||
| public function getPrincipalUri(): string { | ||
| return $this->principalUri; | ||
| } | ||
|
|
||
| public function setPrincipalUri(string $principalUri): void { | ||
| $this->principalUri = $principalUri; | ||
| } | ||
|
|
||
| public function setSearchPattern(string $pattern): void { | ||
| $this->searchPattern = $pattern; | ||
| } | ||
|
|
||
| public function getSearchPattern(): ?string { | ||
| return $this->searchPattern; | ||
| } | ||
|
|
||
| public function addSearchProperty(string $value): void { | ||
| $this->searchProperties[] = $value; | ||
| } | ||
|
|
||
| public function getSearchProperties(): array { | ||
| return $this->searchProperties; | ||
| } | ||
|
|
||
| public function addSearchCalendar(string $calendarUri): void { | ||
| $this->calendarUris[] = $calendarUri; | ||
| } | ||
|
|
||
| public function getCalendarUris(): array { | ||
| return $this->calendarUris; | ||
| } | ||
|
|
||
| public function getLimit(): ?int { | ||
| return $this->limit; | ||
| } | ||
|
|
||
| public function setLimit(int $limit): void { | ||
| $this->limit = $limit; | ||
| } | ||
|
|
||
| public function getOffset(): ?int { | ||
| return $this->offset; | ||
| } | ||
|
|
||
| public function setOffset(int $offset): void { | ||
| $this->offset = $offset; | ||
| } | ||
|
|
||
| public function addType(string $value): void { | ||
| $this->options['types'][] = $value; | ||
| } | ||
|
|
||
| public function setTimerangeStart(\DateTimeImmutable $startTime): void { | ||
| $this->options['timerange']['start'] = $startTime; | ||
|
Member
There was a problem hiding this comment. you want to initialize options with an empty array otherwise you access an offset of
Member
There was a problem hiding this comment. timerange is not initialized in the constructor |
||
| } | ||
|
|
||
| public function setTimerangeEnd(\DateTimeImmutable $endTime): void { | ||
| $this->options['timerange']['end'] = $endTime; | ||
| } | ||
|
|
||
| public function getOptions(): array { | ||
| return $this->options; | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.