Skip to content

[stable25] use more efficient tag retrieval on DAV report request #39233

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
blizzz merged 15 commits into from
Jul 11, 2023
Merged

[stable25] use more efficient tag retrieval on DAV report request #39233

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7e2ad76
use efficient tag retrieval on DAV report request
blizzz Apr 28, 2023
5086dff
fix: change if with conditionless else to switch; and a parameter value
blizzz May 11, 2023
837fd9f
fix: favorites view and universal search against tags
blizzz May 11, 2023
03590e8
fix: ensure searchBySystemTag() is available
blizzz May 11, 2023
2b513e9
chore: cleanup unused code
blizzz May 11, 2023
8d25273
fix: no search when LazyFolder was provided
blizzz May 12, 2023
5c0a1a4
fix: search with more than one search tags
blizzz Jun 2, 2023
d21b251
fix: include invisible tags for admins
blizzz Jun 15, 2023
1ffae9d
fix: cominbation of small fixes
blizzz Jun 21, 2023
9f54901
fix: obey offset and limit for results from favs and circles
blizzz Jun 21, 2023
2c16269
fix: use array_unitersect against objects
blizzz Jun 21, 2023
5cd984b
refactor: save unnecessary method_exists
blizzz Jun 21, 2023
6256da1
fix: cannot apply limit+offset on multi-tag-search
blizzz Jun 27, 2023
33b9ba5
refactor: adjust to unexposed searchBySystemTag
blizzz Jul 6, 2023
2ca8c71
fix: PHP 7.4 compatibility
blizzz Jul 10, 2023
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
fix: no search when LazyFolder was provided 
Signed-off-by: Arthur Schiwon <[email protected]>
  • Loading branch information
@blizzz
blizzz committed Jul 7, 2023
commit 8d252731927fa7cb129d099d0b2b80711756db61
7 changes: 6 additions & 1 deletion apps/dav/lib/Connector/Sabre/FilesReportPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/
namespace OCA\DAV\Connector\Sabre;

use OC\Files\Node\LazyFolder;
use OC\Files\View;
use OCP\App\IAppManager;
use OCP\Files\Folder;
Expand Down Expand Up @@ -332,7 +333,11 @@ protected function processFilterRulesForFileNodes(array $filterRules, ?int $limi

// type check to ensure searchBySystemTag is available, it is not
// exposed in API yet
if (!empty($systemTagIds) && $this->userFolder instanceof \OC\Files\Node\Folder) {
if (
!empty($systemTagIds)
&& ($this->userFolder instanceof \OC\Files\Node\Folder
|| $this->userFolder instanceof LazyFolder)
) {
$tags = $this->tagManager->getTagsByIds($systemTagIds);
$tagName = (current($tags))->getName();
$nodes = $this->userFolder->searchBySystemTag($tagName, $this->userSession->getUser()->getUID(), $limit ?? 0, $offset ?? 0);
Expand Down