From 4b39a19b5cbba7aa9bcc9c63972809f0e8755872 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Wed, 2 Nov 2022 22:55:12 +0100 Subject: [PATCH 01/14] Switch to Digitranscode --- manifest.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/manifest.json b/manifest.json index 8347769..d4da35d 100644 --- a/manifest.json +++ b/manifest.json @@ -1,20 +1,20 @@ { - "name": "Digiwords", - "id": "digiwords", + "name": "Digitranscode", + "id": "digitranscode", "packaging_format": 1, "description": { - "en": "With Digiwords, you can create interactive wordclouds.", - "fr": "Digiwords permet de créer des nuages de mots interactifs." + "en": "an online app that can convert audio files (.mp3, .wav, .m4a, .ogg, .flac, .aac, .wma) and video files (.wmv, .avi, .webm, .mkv, .ogm, .mp4, .m4v, .mov, .flv) into different formats.", + "fr": "Une application en ligne qui permet de convertir des fichiers audio (.mp3, .wav, .m4a, .ogg, .flac, .aac, .wma) et des vidéos (.wmv, .avi, .webm, .mkv, .ogm, .mp4, .m4v, .mov, .flv) en différents formats." }, - "version": "0.3.5~ynh1", + "version": "0.1.2~ynh1", "url": "https://ladigitale.dev/", "upstream": { "license": "GPL-3.0-only", "website": "https://ladigitale.dev/", - "demo": "https://ladigitale.dev/digiwords/#/", - "admindoc": "https://codeberg.org/ladigitale/digiwords/src/branch/master/README.md", - "userdoc": "https://ladigitale.dev/blog/digiwords-pour-creer-des-nuages-de-mots", - "code": "https://codeberg.org/ladigitale/digiwords" + "demo": "https://ladigitale.dev/digitranscode/", + "admindoc": "https://codeberg.org/ladigitale/digitranscode/src/branch/main/README.md", + "userdoc": "https://ladigitale.dev/blog/digitranscode-pour-convertir-des-fichiers-audio-et-des-videos", + "code": "https://codeberg.org/ladigitale/digitranscode" }, "license": "GPL-3.0-only", "maintainer": { @@ -22,7 +22,7 @@ "email": "xxxxx" }, "requirements": { - "yunohost": ">= 4.3.0" + "yunohost": ">= 11.0" }, "multi_instance": true, "services": [ @@ -39,14 +39,14 @@ "name": "path", "type": "path", "example": "/example", - "default": "/digiwords" + "default": "/digitranscode" }, { "name": "is_public", "type": "boolean", "help": { - "en": "If public, any visitor can create word clouds and see saved ones, providing they know their secret questions and answers.", - "fr": "Si l’application est publique, n’importe quel visiteur pourra créer un nuage de mots et consulter ceux sauvegardés dont ils connaissent à la fois la question secrète et la réponse." + "en": "If public, any visitor can convert audio or video files using your server.", + "fr": "Si l’application est publique, n’importe quel visiteur pourra utiliser votre serveur pour convertir des fichiers audio et vidéos." }, "default": true } From e1f6ef8315224531fb430cd211b38332dac47f49 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 2 Nov 2022 21:55:15 +0000 Subject: [PATCH 02/14] Auto-update README --- README.md | 30 +++++++++++++++--------------- README_fr.md | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 7b18b19..2537e36 100644 --- a/README.md +++ b/README.md @@ -3,42 +3,42 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# Digiwords for YunoHost +# Digitranscode for YunoHost -[![Integration level](https://dash.yunohost.org/integration/digiwords.svg)](https://dash.yunohost.org/appci/app/digiwords) ![Working status](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg) -[![Install Digiwords with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords) +[![Integration level](https://dash.yunohost.org/integration/digitranscode.svg)](https://dash.yunohost.org/appci/app/digitranscode) ![Working status](https://ci-apps.yunohost.org/ci/badges/digitranscode.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/digitranscode.maintain.svg) +[![Install Digitranscode with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digitranscode) *[Lire ce readme en français.](./README_fr.md)* -> *This package allows you to install Digiwords quickly and simply on a YunoHost server. +> *This package allows you to install Digitranscode quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview -With Digiwords, you can create interactive wordclouds. +an online app that can convert audio files (.mp3, .wav, .m4a, .ogg, .flac, .aac, .wma) and video files (.wmv, .avi, .webm, .mkv, .ogm, .mp4, .m4v, .mov, .flv) into different formats. -**Shipped version:** 0.3.5~ynh1 +**Shipped version:** 0.1.2~ynh1 -**Demo:** https://ladigitale.dev/digiwords/#/ +**Demo:** https://ladigitale.dev/digitranscode/ ## Documentation and resources * Official app website: -* Official user documentation: -* Official admin documentation: -* Upstream app code repository: -* YunoHost documentation for this app: -* Report a bug: +* Official user documentation: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/digitranscode_ynh/tree/testing). To try the testing branch, please proceed like that. ``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/digitranscode_ynh/tree/testing --debug or -sudo yunohost app upgrade digiwords -u https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing --debug +sudo yunohost app upgrade digitranscode -u https://github.com/YunoHost-Apps/digitranscode_ynh/tree/testing --debug ``` **More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 5f7fdf4..4f29697 100644 --- a/README_fr.md +++ b/README_fr.md @@ -3,42 +3,42 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app It shall NOT be edited by hand. --> -# Digiwords pour YunoHost +# Digitranscode pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/digiwords.svg)](https://dash.yunohost.org/appci/app/digiwords) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/digiwords.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/digiwords.maintain.svg) -[![Installer Digiwords avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digiwords) +[![Niveau d'intégration](https://dash.yunohost.org/integration/digitranscode.svg)](https://dash.yunohost.org/appci/app/digitranscode) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/digitranscode.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/digitranscode.maintain.svg) +[![Installer Digitranscode avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=digitranscode) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Digiwords rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Digitranscode rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* ## Vue d'ensemble -Digiwords permet de créer des nuages de mots interactifs. +Une application en ligne qui permet de convertir des fichiers audio (.mp3, .wav, .m4a, .ogg, .flac, .aac, .wma) et des vidéos (.wmv, .avi, .webm, .mkv, .ogm, .mp4, .m4v, .mov, .flv) en différents formats. -**Version incluse :** 0.3.5~ynh1 +**Version incluse :** 0.1.2~ynh1 -**Démo :** https://ladigitale.dev/digiwords/#/ +**Démo :** https://ladigitale.dev/digitranscode/ ## Documentations et ressources * Site officiel de l'app : -* Documentation officielle utilisateur : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : -* Documentation YunoHost pour cette app : -* Signaler un bug : +* Documentation officielle utilisateur : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/digitranscode_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` bash -sudo yunohost app install https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/digitranscode_ynh/tree/testing --debug ou -sudo yunohost app upgrade digiwords -u https://github.com/YunoHost-Apps/digiwords_ynh/tree/testing --debug +sudo yunohost app upgrade digitranscode -u https://github.com/YunoHost-Apps/digitranscode_ynh/tree/testing --debug ``` **Plus d'infos sur le packaging d'applications :** From d4251809cd42ea4959b47f5523fb346f494e622a Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Wed, 2 Nov 2022 22:57:47 +0100 Subject: [PATCH 03/14] Switch to Digitranscode --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5007fea..d484043 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="php$YNH_DEFAULT_PHP_VERSION-sqlite3" +# pkg_dependencies="php$YNH_DEFAULT_PHP_VERSION-sqlite3" #================================================= # PERSONAL HELPERS From 467365e395de4427ee1610ead56e6018c82903d1 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Wed, 2 Nov 2022 23:00:24 +0100 Subject: [PATCH 04/14] Switch to Digitranscode --- conf/nginx.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4ac1997..6f7aa67 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -25,4 +25,8 @@ location __PATH__/ { # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; + + # Needed part because the app uses SharedArrayBuffer + add_header 'Cross-Origin-Embedder-Policy' 'require-corp'; + add_header 'Cross-Origin-Opener-Policy' 'same-origin'; } From 7b14f896b25d2f3fcd9d7efadb5dd71cc2ebe31b Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Wed, 2 Nov 2022 23:05:31 +0100 Subject: [PATCH 05/14] =?UTF-8?q?Pas=20de=20d=C3=A9pendances=20pour=20Digi?= =?UTF-8?q?transcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d4ab396..f4ad571 100644 --- a/scripts/install +++ b/scripts/install @@ -111,7 +111,7 @@ ynh_script_progression --message="Installing dependencies..." --weight=1 ### - As well as the section "REINSTALL DEPENDENCIES" in the restore script ### - And the section "UPGRADE DEPENDENCIES" in the upgrade script -ynh_install_app_dependencies $pkg_dependencies +# ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER From 1dfc619fde6bb666f932bb1a7553c218b53be5c5 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Wed, 2 Nov 2022 23:09:47 +0100 Subject: [PATCH 06/14] Switch to Digitranscode --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 5939d80..b86a998 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YunoHost-Apps/digiwords_ynh/releases/download/0.3.5/digiwords-v0.3.5.zip -SOURCE_SUM=cba502b1e853cc4e54a07168e8811e829aab0dbd260f0069b7e2c97acf31ef27 +SOURCE_URL=https://github.com/YunoHost-Apps/digitranscode_ynh/releases/download/0.1.2/digitranscode-v0.1.2.zip +SOURCE_SUM=dafa74cbffa3c330ec94ec5a3cb7ee6c07639c1cd89a4b5cce3384098027bbb6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From cd5221477854b9b12be76ab7ecebdc8e353ec27d Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Wed, 2 Nov 2022 23:20:04 +0100 Subject: [PATCH 07/14] No dependencies for this app --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 2019d36..b8ff783 100644 --- a/scripts/remove +++ b/scripts/remove @@ -52,7 +52,7 @@ ynh_remove_fpm_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --weight=1 +#ynh_script_progression --message="Removing dependencies..." --weight=1 # Remove metapackage and its dependencies ynh_remove_app_dependencies From 307b4e93edd0dd1a5731ddab57a754e454865a07 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Nov 2022 01:24:46 +0100 Subject: [PATCH 08/14] No dependency to restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 2c60b67..cd43b99 100644 --- a/scripts/restore +++ b/scripts/restore @@ -102,7 +102,7 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +# ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE VARIOUS FILES From 33ef594d34f7cd51c7a2d8d2d5b244733aa48e73 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Nov 2022 01:30:52 +0100 Subject: [PATCH 09/14] No dependency to upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0905b70..1f05b83 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -157,9 +157,9 @@ ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_script_progression --message="Upgrading dependencies..." --weight=1 +#ynh_script_progression --message="Upgrading dependencies..." --weight=1 -ynh_install_app_dependencies $pkg_dependencies +#ynh_install_app_dependencies $pkg_dependencies #================================================= # PHP-FPM CONFIGURATION From 5374d64ed6421916c845dfb6cc8b967ac4e9ed98 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Nov 2022 01:31:33 +0100 Subject: [PATCH 10/14] Update restore --- scripts/restore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index cd43b99..ecbc2ad 100644 --- a/scripts/restore +++ b/scripts/restore @@ -99,10 +99,10 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Reinstalling dependencies..." --weight=1 +#ynh_script_progression --message="Reinstalling dependencies..." --weight=1 # Define and install dependencies -# ynh_install_app_dependencies $pkg_dependencies +#ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE VARIOUS FILES From 6f47432e8bca8e869b0ce1d148c74f38b3e19b01 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Nov 2022 01:47:54 +0100 Subject: [PATCH 11/14] Change add_header to more_set_headers --- conf/nginx.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6f7aa67..d964231 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -27,6 +27,5 @@ location __PATH__/ { include conf.d/yunohost_panel.conf.inc; # Needed part because the app uses SharedArrayBuffer - add_header 'Cross-Origin-Embedder-Policy' 'require-corp'; - add_header 'Cross-Origin-Opener-Policy' 'same-origin'; + more_set_headers "Cross-Origin-Embedder-Policy: require-corp" "Cross-Origin-Opener-Policy: same-origin"; } From 4a30b6124806fca3aae2e30d92fc18edf0209093 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Nov 2022 01:49:58 +0100 Subject: [PATCH 12/14] Update check_process --- check_process | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/check_process b/check_process index ca8532e..8a29f5d 100644 --- a/check_process +++ b/check_process @@ -20,7 +20,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=cc131db79e58280d13674c7a99cb6d21cd67f7d5 + upgrade=1 from_commit=6f47432e8bca8e869b0ce1d148c74f38b3e19b01 backup_restore=1 multi_instance=1 port_already_use=0 @@ -29,6 +29,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=cc131db79e58280d13674c7a99cb6d21cd67f7d5 - ;name=Bump from 0.3.3. + ; commit=6f47432e8bca8e869b0ce1d148c74f38b3e19b01 + ;name=First version for YNH ;manifest_arg=domain=DOMAIN&path=PATH&language=fr&is_public=1& From 186b64d918988d1c6448a49351d882747db25d9f Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Fri, 4 Nov 2022 10:36:14 +0100 Subject: [PATCH 13/14] Shorten descriptions --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index d4da35d..7ab0c91 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "digitranscode", "packaging_format": 1, "description": { - "en": "an online app that can convert audio files (.mp3, .wav, .m4a, .ogg, .flac, .aac, .wma) and video files (.wmv, .avi, .webm, .mkv, .ogm, .mp4, .m4v, .mov, .flv) into different formats.", - "fr": "Une application en ligne qui permet de convertir des fichiers audio (.mp3, .wav, .m4a, .ogg, .flac, .aac, .wma) et des vidéos (.wmv, .avi, .webm, .mkv, .ogm, .mp4, .m4v, .mov, .flv) en différents formats." + "en": "an online app that can convert audio files and video files into different formats.", + "fr": "Une application en ligne qui permet de convertir des fichiers audio et des vidéos en différents formats." }, "version": "0.1.2~ynh1", "url": "https://ladigitale.dev/", From fb4a8fc5e41e7f8c4e94a368d14ab1aebeebe760 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 4 Nov 2022 09:36:19 +0000 Subject: [PATCH 14/14] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2537e36..1bbfa37 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -an online app that can convert audio files (.mp3, .wav, .m4a, .ogg, .flac, .aac, .wma) and video files (.wmv, .avi, .webm, .mkv, .ogm, .mp4, .m4v, .mov, .flv) into different formats. +an online app that can convert audio files and video files into different formats. **Shipped version:** 0.1.2~ynh1 diff --git a/README_fr.md b/README_fr.md index 4f29697..9b22643 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Une application en ligne qui permet de convertir des fichiers audio (.mp3, .wav, .m4a, .ogg, .flac, .aac, .wma) et des vidéos (.wmv, .avi, .webm, .mkv, .ogm, .mp4, .m4v, .mov, .flv) en différents formats. +Une application en ligne qui permet de convertir des fichiers audio et des vidéos en différents formats. **Version incluse :** 0.1.2~ynh1