diff --git a/.github/workflows/phpunit-pgsql.yml b/.github/workflows/phpunit-pgsql.yml index 795c566d..4fabd638 100644 --- a/.github/workflows/phpunit-pgsql.yml +++ b/.github/workflows/phpunit-pgsql.yml @@ -41,7 +41,7 @@ jobs: fail-fast: false matrix: php-versions: ['8.2'] - server-versions: ['master', 'stable29'] + server-versions: ['master'] services: postgres: diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml index 0e2806d4..3f4f0fb4 100644 --- a/.github/workflows/psalm.yml +++ b/.github/workflows/psalm.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: php-versions: [ '8.1', '8.2', '8.3' ] - server-versions: [ 'dev-master', 'dev-stable29' ] + server-versions: [ 'dev-master' ] fail-fast: false name: Nextcloud diff --git a/Makefile b/Makefile index 2ac0e446..6e4f4bcc 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ source_dir=$(build_dir)/source sign_dir=$(build_dir)/sign package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates -version+=7.1.0 +version+=8.0.0 all: dev-setup build-js-production diff --git a/appinfo/info.xml b/appinfo/info.xml index 806b6592..f5ba42b1 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -76,7 +76,7 @@ Requirements: The app does not send any sensitive data to cloud providers or similar services. All processing is done on your Nextcloud machine, using Tensorflow.js running in Node.js. ]]> - 7.1.0 + 8.0.0 agpl Marcel Klehr @@ -92,7 +92,7 @@ The app does not send any sensitive data to cloud providers or similar services. https://raw.githubusercontent.com/nextcloud/recognize/main/screenshots/Logo.png https://raw.githubusercontent.com/nextcloud/recognize/main/screenshots/imagenet_examples.jpg - + diff --git a/lib/Service/IgnoreService.php b/lib/Service/IgnoreService.php index e2a1facd..38354b05 100644 --- a/lib/Service/IgnoreService.php +++ b/lib/Service/IgnoreService.php @@ -45,7 +45,7 @@ public function getIgnoredDirectories(int $storageId, array $ignoreMarkers): arr return $directories; } - $qb = new CacheQueryBuilder($this->db, $this->systemConfig, $this->logger, $this->metadataManager); + $qb = new CacheQueryBuilder($this->db->getQueryBuilder(), $this->metadataManager); $result = $qb->selectFileCache() ->andWhere($qb->expr()->in('name', $qb->createNamedParameter($ignoreMarkers, IQueryBuilder::PARAM_STR_ARRAY))) ->andWhere($qb->expr()->eq('storage', $qb->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) diff --git a/lib/Service/StorageService.php b/lib/Service/StorageService.php index 18f56629..577fb959 100644 --- a/lib/Service/StorageService.php +++ b/lib/Service/StorageService.php @@ -64,7 +64,7 @@ public function getMounts(): \Generator { $overrideRoot = $rootId; if (in_array($row['mount_provider_class'], self::HOME_MOUNT_TYPES)) { // Only crawl files, not cache or trashbin - $qb = new CacheQueryBuilder($this->db, $this->systemConfig, $this->logger, $this->metadataManager); + $qb = new CacheQueryBuilder($this->db->getQueryBuilder(), $this->metadataManager); try { $res = $qb->selectFileCache() ->andWhere($qb->expr()->eq('filecache.storage', $qb->createNamedParameter($storageId, IQueryBuilder::PARAM_INT))) diff --git a/package-lock.json b/package-lock.json index 47fa5477..96c9d13a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "recognize", - "version": "7.0.3", + "version": "7.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "recognize", - "version": "7.0.3", + "version": "7.1.0", "license": "MIT", "dependencies": { "@exifer/gps": "^1.0.0-beta.2", diff --git a/package.json b/package.json index ecfcd3d0..f255de11 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "recognize", - "version": "7.1.0", + "version": "8.0.0", "description": "Image recognition in nextcloud", "main": "src/classifier_imagenet.js", "directories": { diff --git a/tests/stub.phpstub b/tests/stub.phpstub index 9fde8ef5..bdda1960 100644 --- a/tests/stub.phpstub +++ b/tests/stub.phpstub @@ -21,23 +21,6 @@ namespace OC { } -namespace OC\Files\Cache { - - use OCP\FilesMetadata\IFilesMetadataManager; - use OCP\IDBConnection; - use Psr\Log\LoggerInterface; - - class CacheQueryBuilder extends \OCP\DB\QueryBuilder\IQueryBuilder { - public function __construct(\OCP\IDBCOnnection $db, \OC\SystemConfig $config, \Psr\Log\LoggerInterface $logger, \OCP\FilesMetadata\IFilesMetadataManager $filesMetadataManager); - public function selectFileCache(string $alias = null, bool $joinExtendedCache = true):CacheQueryBuilder; - public function whereStorageId(int $storageId):CacheQueryBuilder; - public function whereFileId(int $fileId):CacheQueryBuilder; - public function wherePath(string $path):CacheQueryBuilder; - public function whereParent(int $parent):CacheQueryBuilder; - public function whereParentInParameter(string $parameter):CacheQueryBuilder; - } -} - namespace Doctrine\DBAL { final class ParameterType {