From f8f60a429f1b5617bc9c63c752a9f4ba361e040f Mon Sep 17 00:00:00 2001
From: Michel Roux <xefir@crystalyx.net>
Date: Tue, 19 Nov 2024 20:45:17 +0000
Subject: [PATCH] refactor: :recycle: refacto makefile

---
 .dockerignore    | 23 +++++++++++++++++++++++
 Dockerfile       | 21 +++++++++++++++++++++
 Makefile         | 16 +++++++++++++++-
 appinfo/info.xml |  8 ++++----
 4 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..ee929f9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,23 @@
+.DS_Store
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+
+.marginalia
+
+js/
+build/
+coverage/
+utils/docker-ci
+
+vendor/
+.php-cs-fixer.cache
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..fd9687f
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,21 @@
+FROM nextcloud:30
+
+ARG APP_NAME=radio
+ENV NEXTCLOUD_UPDATE=1
+ENV NEXTCLOUD_ADMIN_USER=$APP_NAME
+ENV NEXTCLOUD_ADMIN_PASSWORD=$APP_NAME
+ENV NEXTCLOUD_INIT_HTACCESS=1
+ENV SQLITE_DATABASE=$APP_NAME
+
+RUN apt-get update && \
+    apt-get install -y nodejs npm sqlite3 && \
+    rm -f /usr/local/etc/php/conf.d/opcache-recommended.ini && \
+    /entrypoint.sh true
+
+USER www-data
+
+COPY --chown=www-data:www-data . apps/$APP_NAME
+RUN php occ app:enable $APP_NAME && \
+    php occ config:system:set debug --value=true
+
+USER root
diff --git a/Makefile b/Makefile
index 2cbc217..82cf57e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 all: dev-setup lint build-js-production test
 
 # Dev env management
-dev-setup: clean clean-dev npm-init
+dev-setup: clean clean-dev composer-init npm-init
 
 npm-init:
 	npm ci
@@ -12,6 +12,12 @@ npm-init:
 npm-update:
 	npm update
 
+composer-init:
+	composer install
+
+composer-update:
+	composer update
+
 # Building
 build-js:
 	npm run dev
@@ -52,6 +58,7 @@ clean:
 
 clean-dev:
 	rm -rf node_modules
+	rm -rf vendor
 
 release:
 	krankerl package
@@ -63,6 +70,13 @@ translations:
 	php utils/docker-ci/translations/translationtool/translationtool.phar create-pot-files
 	php utils/docker-ci/translations/translationtool/translationtool.phar convert-po-files
 
+dev: dev-setup
+	docker stop radio || true
+	docker rm radio || true
+	docker build -t radio .
+	docker run -itd --rm --name radio -v $(PWD):/var/www/html/apps/radio -p 80:80 radio
+	npm run watch
+
 publish-appstore-nightly:
 	$(eval ASSET_URL = $(shell curl -s https://git.project-insanity.org/api/v4/projects/onny%2Fnextcloud-app-radio/releases | jq -r '.[0].assets.links[0].url'))
 	wget $(ASSET_URL) -O build/artifacts/radio.tar.gz
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 0fc2251..bc64ad0 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -16,17 +16,17 @@ app uses radio-browser.info database as a backend.
 - 👂 Smoth audio playback and transitions
 
 </description>
-    <version>1.1.0</version>
+    <version>2.0.0</version>
     <licence>agpl</licence>
-    <author mail="onny@project-insanity.org" >Jonas Heinrich</author>
+    <author mail="onny@project-insanity.org">Jonas Heinrich</author>
     <namespace>Radio</namespace>
     <category>multimedia</category>
     <website>https://git.project-insanity.org/onny/nextcloud-app-radio</website>
     <bugs>https://git.project-insanity.org/onny/nextcloud-app-radio/issues</bugs>
     <screenshot small-thumbnail="https://git.project-insanity.org/onny/nextcloud-app-radio/raw/master/screenshot-thumbnail.jpg">https://git.project-insanity.org/onny/nextcloud-app-radio/raw/master/screenshot.png</screenshot>
     <dependencies>
-      <php min-version="7.4" max-version="8" />
-      <nextcloud min-version="20" max-version="21"/>
+      <php min-version="8.1" />
+      <nextcloud min-version="29" max-version="30"/>
     </dependencies>
     <navigations>
         <navigation>