Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
perf(files_reminders): Pre-cache directory
Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
Pytal authored and provokateurin committed Apr 28, 2025
commit 6a12408cbec55c96c1a751f573397591e1d6d066
19 changes: 19 additions & 0 deletions apps/files_reminders/lib/Dav/PropFindPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@
namespace OCA\FilesReminders\Dav;

use DateTimeInterface;
use OCA\DAV\Connector\Sabre\Directory;
use OCA\DAV\Connector\Sabre\Node;
use OCA\FilesReminders\Service\ReminderService;
use OCP\Files\Folder;
use OCP\IUser;
use OCP\IUserSession;
use Sabre\DAV\INode;
Expand Down Expand Up @@ -42,6 +44,15 @@ public function propFind(PropFind $propFind, INode $node) {
return;
}

if (
$node instanceof Directory
&& $propFind->getDepth() > 0
&& $propFind->getStatus(static::REMINDER_DUE_DATE_PROPERTY) !== null
) {
$folder = $node->getNode();
$this->cacheFolder($folder);
}

$propFind->handle(
static::REMINDER_DUE_DATE_PROPERTY,
function () use ($node) {
Expand All @@ -60,4 +71,12 @@ function () use ($node) {
},
);
}

private function cacheFolder(Folder $folder): void {
$user = $this->userSession->getUser();
if (!($user instanceof IUser)) {
return;
}
$this->reminderService->cacheFolder($user, $folder);
}
}
27 changes: 27 additions & 0 deletions apps/files_reminders/lib/Db/ReminderMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\QBMapper;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Files\Folder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IDBConnection;
Expand Down Expand Up @@ -131,4 +132,30 @@ public function findNotified(DateTime $buffer, ?int $limit = null) {

return $this->findEntities($qb);
}

/**
* @return Reminder[]
*/
public function findAllInFolder(IUser $user, Folder $folder) {
$fileIds = array_values(array_filter(array_map(
function (Node $node) {
try {
return $node->getId();
} catch (NotFoundException $e) {
return null;
}
},
$folder->getDirectoryListing(),
)));

$qb = $this->db->getQueryBuilder();

$qb->select('id', 'user_id', 'file_id', 'due_date', 'updated_at', 'created_at', 'notified')
->from($this->getTableName())
->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID(), IQueryBuilder::PARAM_STR)))
->andWhere($qb->expr()->in('file_id', $qb->createNamedParameter($fileIds, IQueryBuilder::PARAM_INT_ARRAY)))
->orderBy('due_date', 'ASC');

return $this->findEntities($qb);
}
}
15 changes: 15 additions & 0 deletions apps/files_reminders/lib/Service/ReminderService.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use OCA\FilesReminders\Exception\UserNotFoundException;
use OCA\FilesReminders\Model\RichReminder;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\ICache;
Expand Down Expand Up @@ -46,6 +47,20 @@ public function __construct(
$this->cache = $this->cacheFactory->createDistributed('files_reminders');
}

public function cacheFolder(IUser $user, Folder $folder): void {
$reminders = $this->reminderMapper->findAllInFolder($user, $folder);
$reminderMap = [];
foreach ($reminders as $reminder) {
$reminderMap[$reminder->getFileId()] = $reminder;
}

$nodes = $folder->getDirectoryListing();
foreach ($nodes as $node) {
$reminder = $reminderMap[$node->getId()] ?? false;
$this->cache->set("{$user->getUID()}-{$node->getId()}", $reminder);
}
}

/**
* @throws NodeNotFoundException
*/
Expand Down