Revert "drop support of Nextcloud 27 (#322)" (#335)

This reverts commit ca4c14c. We need this to keep the #327 included in NC 27. We'll drop it's support after AppAPI 3.0.0. --------- Signed-off-by: Andrey Borysenko <[email protected]>
nextcloud · Jul 23, 2024 · 91e2b6d · 91e2b6d
1 parent 14fb2ff
commit 91e2b6d
Show file tree

Hide file tree

Showing 6 changed files with 239 additions and 166 deletions.
diff --git a/Makefile b/Makefile
@@ -15,20 +15,32 @@ help:
 	@echo " "
 	@echo "  Next commands are only for dev environment with nextcloud-docker-dev!"
 	@echo "  Daemon register(Linux, socket):"
-	@echo "  dock-sock          create docker daemon for Nextcloud 30, 29, 28 (/var/run/docker.sock)"
+	@echo "  dock-sock          create docker daemon for Nextcloud 29, 28, 27 (/var/run/docker.sock)"
+	@echo "  dock-sock27        create docker daemon for Nextcloud 27 (/var/run/docker.sock)"
+	@echo "  dock-sock27-gpu    create docker daemon with GPU for Nextcloud 27 (/var/run/docker.sock)"
 	@echo "  dock-sock28        create docker daemon for Nextcloud 28 (/var/run/docker.sock)"
 	@echo "  dock-sock28-gpu    create docker daemon with GPU for Nextcloud 28 (/var/run/docker.sock)"
-	@echo "  dock-sock29        create docker daemon for Nextcloud 29 (/var/run/docker.sock)"
-	@echo "  dock-sock29-gpu    create docker daemon with GPU for Nextcloud 29 (/var/run/docker.sock)"
 	@echo "  dock-sock          create docker daemon for Nextcloud Last (/var/run/docker.sock)"
 	@echo "  dock-sock-gpu      create docker daemon with GPU for Nextcloud Last (/var/run/docker.sock)"
 	@echo " "
 	@echo "  Daemon register(any OS, host:port)"
 	@echo "  dock2port          will map docker socket to port. first use this!"
+	@echo "  dock-port27        create docker daemon for Nextcloud 27 (host.docker.internal:8443)"
 	@echo "  dock-port28        create docker daemon for Nextcloud 28 (host.docker.internal:8443)"
-	@echo "  dock-port29        create docker daemon for Nextcloud 29 (host.docker.internal:8443)"
 	@echo "  dock-port          create docker daemons for Nextcloud Last (host.docker.internal:8443)"
 
+.PHONY: dock-sock27
+dock-sock27:
+	@echo "creating daemon for nextcloud 'stable27' container"
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
+		docker_dev Docker docker-install http /var/run/docker.sock http://stable27.local/index.php --net=master_default
+
+.PHONY: dock-sock27-gpu
+dock-sock27-gpu:
+	@echo "creating daemon with NVIDIA gpu for nextcloud 'stable27' container"
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
+		docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable27.local/index.php --net=master_default --gpu --set-default
+
 .PHONY: dock-sock28
 dock-sock28:
 	@echo "creating daemon for nextcloud 'stable28' container"
@@ -41,18 +53,6 @@ dock-sock28-gpu:
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:daemon:register \
 		docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable28.local/index.php --net=master_default --gpu --set-default
 
-.PHONY: dock-sock29
-dock-sock29:
-	@echo "creating daemon for nextcloud 'stable29' container"
-	docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
-		docker_dev Docker docker-install http /var/run/docker.sock http://stable29.local/index.php --net=master_default
-
-.PHONY: dock-sock29-gpu
-dock-sock29-gpu:
-	@echo "creating daemon with NVIDIA gpu for nextcloud 'stable29' container"
-	docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
-		docker_dev_gpu "Docker with GPU" docker-install http /var/run/docker.sock http://stable29.local/index.php --net=master_default --gpu --set-default
-
 .PHONY: dock-sock
 dock-sock:
 	@echo "creating daemon for nextcloud 'master' container"
@@ -74,20 +74,20 @@ dock2port:
       --net=master_default \
       --restart unless-stopped --privileged -d ghcr.io/cloud-py-api/nextcloud-appapi-dsp:latest
 
+.PHONY: dock-port27
+dock-port27:
+	@echo "creating daemon for nextcloud '27' container"
+	docker exec master-stable27-1 sudo -u www-data php occ app_api:daemon:register \
+        docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable27.local/index.php \
+        --net=master_default --haproxy_password="some_secure_password"
+
 .PHONY: dock-port28
 dock-port28:
-	@echo "creating daemon for nextcloud '28' container"
+	@echo "creating daemon for nextcloud '27' container"
 	docker exec master-stable28-1 sudo -u www-data php occ app_api:daemon:register \
         docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable28.local/index.php \
         --net=master_default --haproxy_password="some_secure_password"
 
-.PHONY: dock-port29
-dock-port29:
-	@echo "creating daemon for nextcloud '29' container"
-	docker exec master-stable29-1 sudo -u www-data php occ app_api:daemon:register \
-        docker_dev Docker docker-install http nextcloud-appapi-dsp:2375 http://stable29.local/index.php \
-        --net=master_default --haproxy_password="some_secure_password"
-
 .PHONY: dock-port
 dock-port:
 	@echo "creating daemon for nextcloud 'master' container"

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -63,7 +63,7 @@ to join us in shaping a more versatile, stable, and secure app landscape.
 	<screenshot>https://raw.githubusercontent.com/cloud-py-api/app_api/main/screenshots/app_api_4.png</screenshot>
 	<dependencies>
 		<php min-version="8.1"/>
-		<nextcloud min-version="28" max-version="30"/>
+		<nextcloud min-version="27" max-version="30"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\AppAPI\BackgroundJob\ExAppInitStatusCheckJob</job>

diff --git a/lib/Listener/LoadFilesPluginListener.php b/lib/Listener/LoadFilesPluginListener.php
@@ -36,7 +36,12 @@ public function handle(Event $event): void {
 				'fileActions' => $exFilesActions,
 				'instanceId' => $this->config->getSystemValue('instanceid'),
 			]);
-			Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin');
+			$ncVersion = $this->config->getSystemValueString('version', '0.0.0');
+			if (version_compare($ncVersion, '28.0', '<')) {
+				Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin');
+			} else {
+				Util::addScript(Application::APP_ID, Application::APP_ID . '-filesplugin28');
+			}
 			Util::addStyle(Application::APP_ID, 'filesactions');
 		}
 	}