Support NC 30

Signed-off-by: Marcel Klehr <[email protected]>

.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:

.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

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
 

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.
 
 ]]></description>
-	<version>7.1.0</version>
+	<version>8.0.0</version>
 	<licence>agpl</licence>
 	<author mail="[email protected]">Marcel Klehr</author>
 	<types>
@@ -92,7 +92,7 @@ The app does not send any sensitive data to cloud providers or similar services.
 	<screenshot>https://raw.githubusercontent.com/nextcloud/recognize/main/screenshots/Logo.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/recognize/main/screenshots/imagenet_examples.jpg</screenshot>
 	<dependencies>
-		<nextcloud min-version="29" max-version="30" />
+		<nextcloud min-version="30" max-version="30" />
 	</dependencies>
 
 	<repair-steps>

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)))

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)))

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": {

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
     {