Skip to content

Adapt to server API changes #2447

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
juliusknorr merged 4 commits into from
Jun 29, 2023
Merged

Adapt to server API changes #2447

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42fb12b
fix: Adapt NoopScanner to renamed ObjectStoreScanner
juliusknorr Jun 28, 2023
57eaa82
fix: Adapt to new Folder interface method
juliusknorr Jun 28, 2023
98eded8
adjust stubs
icewind1991 Jun 28, 2023
9130130
fix: Adapt NoopScanner to renamed ObjectStoreScanner in Scan.php
blizzz Jun 29, 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
fix: Adapt NoopScanner to renamed ObjectStoreScanner in Scan.php 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
  • Loading branch information
@blizzz
blizzz committed Jun 29, 2023
commit 913013055625287469f6a4b93a82773f969930a6
4 changes: 2 additions & 2 deletions lib/Command/Scan.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

namespace OCA\GroupFolders\Command;

use OC\Files\ObjectStore\NoopScanner;
use OC\Files\ObjectStore\ObjectStoreScanner;
use OCP\Constants;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputArgument;
Expand Down Expand Up @@ -84,7 +84,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
$scanner = $mount->getStorage()->getScanner();

$output->writeln("Scanning group folder with id\t<info>{$folder['id']}</info>", OutputInterface::VERBOSITY_VERBOSE);
if ($scanner instanceof NoopScanner) {
if ($scanner instanceof ObjectStoreScanner) {
$output->writeln("Scanning group folders using an object store as primary storage is not supported.");
return -1;
}
Expand Down
1 change: 0 additions & 1 deletion lib/Mount/GroupFolderStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
namespace OCA\GroupFolders\Mount;

use OC\Files\Cache\Scanner;
use OC\Files\ObjectStore\NoopScanner;
use OC\Files\ObjectStore\ObjectStoreScanner;
use OC\Files\ObjectStore\ObjectStoreStorage;
use OC\Files\Storage\Wrapper\Quota;
Expand Down