feat: Add IAccountScopedSearchProvider - #64491
Open
CarlSchwan wants to merge 6 commits into
Open
CarlSchwan wants to merge 6 commits into
CarlSchwan wants to merge 6 commits into
Conversation
CarlSchwan
force-pushed
the
carl/investigation-api
branch
3 times, most recently
from
September 21, 2026 12:20
789c118 to
e9d774b
Compare
CarlSchwan
marked this pull request as ready for review
September 21, 2026 12:22
CarlSchwan
requested review from
a team,
ChristophWurst,
SebastianKrupinski,
hamza221 and
tcitworld
as code owners
September 21, 2026 12:22
CarlSchwan
requested review from
Altahrim,
icewind1991,
leftybournes and
salmart-dev
and removed request for
a team
September 21, 2026 12:22
CarlSchwan
force-pushed
the
carl/investigation-api
branch
2 times, most recently
from
September 21, 2026 14:27
313d1c7 to
4c0220e
Compare
icewind1991
reviewed
Sep 21, 2026
icewind1991
reviewed
Sep 21, 2026
icewind1991
reviewed
Sep 21, 2026
Comment on lines
+83
to
+90
| $fields = [ | ||
| ['id' => 'name', 'title' => $this->l10n->t('Name'), 'type' => 'text', 'default' => ''], | ||
| ['id' => 'path', 'title' => $this->l10n->t('Path'), 'type' => 'text', 'default' => ''], | ||
| ['id' => 'mimetype', 'title' => $this->l10n->t('File type'), 'type' => 'text', 'default' => ''], | ||
| ['id' => 'size', 'title' => $this->l10n->t('Size'), 'type' => 'number', 'default' => 0], | ||
| ['id' => 'modified', 'title' => $this->l10n->t('Modified'), 'type' => 'number', 'default' => 0], | ||
| ['id' => 'created', 'title' => $this->l10n->t('Created'), 'type' => 'number', 'default' => 0], | ||
| ]; |
Member
There was a problem hiding this comment.
Could we reuse the data from FileSearchBackend::getPropertyDefinitionsForScope here somehow? or create a shared source of truth somewhere else
icewind1991
reviewed
Sep 21, 2026
icewind1991
reviewed
Sep 21, 2026
Member
|
(only looked at part of the code so far, non-existence of comments on code should not be takes as a non-existence of (possible) issues) |
CarlSchwan
force-pushed
the
carl/investigation-api
branch
from
September 23, 2026 13:12
4c0220e to
1ba9b22
Compare
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Carl Schwan <carl@carlschwan.eu>
CarlSchwan
force-pushed
the
carl/investigation-api
branch
from
September 23, 2026 15:02
bfccfe0 to
c9a7b00
Compare
Assisted-by: ClaudeCode:claude-opus-5 Signed-off-by: Carl Schwan <carl@carlschwan.eu>
CarlSchwan
force-pushed
the
carl/investigation-api
branch
from
September 23, 2026 15:46
c9a7b00 to
aa5f9aa
Compare
artonge
approved these changes
Sep 23, 2026
icewind1991
requested changes
Sep 24, 2026
Comment on lines
+54
to
+58
| default => array_reduce( | ||
| $operator->getArguments(), | ||
| static fn (bool $carry, ISearchOperator $child): bool => $carry && self::node($child, $values), | ||
| true, | ||
| ), |
Comment on lines
+48
to
+52
| ISearchBinaryOperator::OPERATOR_OR => array_reduce( | ||
| $operator->getArguments(), | ||
| static fn (bool $carry, ISearchOperator $child): bool => $carry || self::node($child, $values), | ||
| false, | ||
| ), |
| 'path', | ||
| is_array($value) | ||
| ? array_map(static fn (mixed $path): string => 'files/' . ltrim((string)$path, '/'), $value) | ||
| : 'files/' . ltrim((string)$value, '/'), |
Member
There was a problem hiding this comment.
this will break for groupfolders/external storages
| return $value; | ||
| } | ||
|
|
||
| $term = preg_replace('/(?<!\\\\)[%_]/', ' ', $value) ?? $value; |
| */ | ||
| private function fileIdsToComparison(array $ids): ISearchOperator { | ||
| if ($ids === []) { | ||
| return new SearchComparison(ISearchComparison::COMPARE_EQUAL, 'fileid', -1); |
Member
There was a problem hiding this comment.
I think an empty "and" search operator has the expected effect of matching nothing (but you'll need to double check that). But it should be handled better by later query optimizations/manipulation steps than doing an "invalid" comparison like this.
| * | ||
| * @experimental 36.0.0 | ||
| */ | ||
| final class SearchPropertyDefinition { |
Member
There was a problem hiding this comment.
This is a SearchDAV\Backend\SearchPropertyDefinition with an added title field right?
Would it make sense to inherit that instead or otherwise reuse bits
This branch has not been deployed
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Summary
See
occ search:providersandocc search:queryfor using thisTODO
Checklist
3. to review, feature component)stable32)AI (if applicable)