From 8fc8f4f421e65cff2d471544ceb87682c8a4fc3e Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Wed, 17 Mar 2021 20:40:41 +0100 Subject: [PATCH 01/19] initial version --- README_fr.md | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/README_fr.md b/README_fr.md index d7d410c..d147cad 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,21 +1,23 @@ -# App exemple pour YunoHost +# Mopidy pour YunoHost [![Niveau d'intégration](https://dash.yunohost.org/integration/REPLACEBYYOURAPP.svg)](https://dash.yunohost.org/appci/app/REPLACEBYYOURAPP) ![](https://ci-apps.yunohost.org/ci/badges/REPLACEBYYOURAPP.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/REPLACEBYYOURAPP.maintain.svg) [![Installer REPLACEBYYOURAPP avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=REPLACEBYYOURAPP) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer REPLACEBYYOURAPP rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Mopidy rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install) pour apprendre comment l'installer.* ## Vue d'ensemble -Description rapide de cette application. +Mopidy - est un serveur de musique extensible. +Mopidy lit de la musique, des podcasts et des programmes de radio à partir d'un disque local et de divers services de streaming. +Vous pouvez modifier la liste de lecture à partir d'un téléphone, d'une tablette ou d'un ordinateur. -**Version incluse :** 1.0 +**Version incluse :** 3.1.1 ## Captures d'écran -![](Lien vers une capture d'écran de cette application.) +![](sources/extra_files/mopidy_screenshot1.png) ## Démo @@ -23,18 +25,26 @@ Description rapide de cette application. ## Configuration -Comment configurer cette application : via le panneau d'administration, un fichier brut en SSH ou tout autre moyen. +Cette installation est livrée avec différentes extensions: + +* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) pour contrôler mopidy depuis votre navigateur Web +* [local](https://mopidy.com/ext/local/) pour rendre votre collection de musique privée sur `/home/yunohost.multimedia/share/Music/` consultable +* [YouTube](https://pypi.org/project/Mopidy-YouTube/) pour lire le son de YouTube +* [YTMusic](https://music.youtube.com/) pour accéder à la musique en streaming de Google intitulée [YouTube Music](https://music.youtube.com/) +* [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) pour rechercher et parcourir des podcasts sur l'iTunes Store d'Apple +* [RadioNet](https://mopidy.com/ext/radionet/) pour écouter les canaux radio de [radio.net](https://www.radio.net/) +* [Podcast](https://mopidy.com/ext/podcast/) pour parcourir les flux RSS des podcasts et diffuser les épisodes +* [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) pour lire de la musique à partir du service [SoundCloud](https://soundcloud.com/) service \([jeton d'authentification](https://pypi.org/project/Mopidy-SoundCloud/) nécessaire\). + ## Documentation - * Documentation officielle : Lien vers la documentation officielle de cette application. - * Documentation YunoHost : Si une documentation spécifique est nécessaire, n'hésitez pas à contribuer. - + * Documentation officielle : https://docs.mopidy.com/en/latest/ ## Caractéristiques spécifiques YunoHost #### Support multi-utilisateur -* L'authentification LDAP et HTTP est-elle prise en charge ? +* L'authentification LDAP et HTTP est-elle prise en charge ? Non * L'application peut-elle être utilisée par plusieurs utilisateurs ? #### Architectures supportées @@ -48,6 +58,12 @@ Comment configurer cette application : via le panneau d'administration, un fichi ## Informations additionnelles + +To list current settings enter `sudo mopidyctl config` \ +Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust mopidy's configuration.\\ + +To rebuild the database of your local music collection enter `sudo mopidyctl local scan` + * Autres informations que vous souhaitez ajouter sur cette application. **Plus d'informations sur la page de documentation :** From 29ac4925be7d407b932726476e17293fac810b5f Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Wed, 17 Mar 2021 20:47:04 +0100 Subject: [PATCH 02/19] Update README_fr.md --- README_fr.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/README_fr.md b/README_fr.md index d147cad..5b74306 100644 --- a/README_fr.md +++ b/README_fr.md @@ -58,13 +58,9 @@ Cette installation est livrée avec différentes extensions: ## Informations additionnelles - -To list current settings enter `sudo mopidyctl config` \ -Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust mopidy's configuration.\\ - -To rebuild the database of your local music collection enter `sudo mopidyctl local scan` - -* Autres informations que vous souhaitez ajouter sur cette application. +* Pour lister les paramètres actuels, entrez `sudo mopidyctl config` +* Modifiez le fichier /opt/yunohost/mopidy/mopidy.conf pour ajuster la configuration de mopidy +* Pour reconstruire la base de données de votre collection de musique locale, entrez `sudo mopidyctl local scan` **Plus d'informations sur la page de documentation :** https://yunohost.org/packaging_apps From 421e69d8cc4f2f909323e32b11974a2a49f4ac96 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Wed, 17 Mar 2021 21:23:56 +0100 Subject: [PATCH 03/19] initial version --- README_fr.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README_fr.md b/README_fr.md index 5b74306..e1f1d34 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ Vous pouvez modifier la liste de lecture à partir d'un téléphone, d'une table ## Démo -* [Démo officielle](Lien vers un site de démonstration de cette application.) +* Aucune démo disponible ## Configuration @@ -67,9 +67,8 @@ https://yunohost.org/packaging_apps ## Liens - * Signaler un bug : https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/issues - * Site de l'application : Lien vers le site officiel de cette application. - * Dépôt de l'application principale : Lien vers le dépôt officiel de l'application principale. + * Signaler un bug : https://github.com/YunoHost-Apps/mopidy_ynh/issues + * Site de l'application : https://mopidy.com/ * Site web YunoHost : https://yunohost.org/ --- @@ -77,11 +76,11 @@ https://yunohost.org/packaging_apps ## Informations pour les développeurs **Seulement si vous voulez utiliser une branche de test pour le codage, au lieu de fusionner directement dans la banche principale.** -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing). +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug ou -sudo yunohost app upgrade REPLACEBYYOURAPP -u https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing --debug +sudo yunohost app upgrade REPLACEBYYOURAPP -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug ``` From 9cf5f2a2a2eb207fb694d020ea1e8e8c51cd61e8 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 01:15:19 +0100 Subject: [PATCH 04/19] initial version --- LICENSE | 204 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index f3cff84..d645695 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,202 @@ -File containing the license of your package. -More information here: -https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-13---indiquer-la-licence-associ%C3%A9e-au-paquet---brouillon--auto--working- + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 20279325a80f1df2d03becd28ad5a45166e40925 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 02:04:29 +0100 Subject: [PATCH 05/19] 2>&1 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 246aead..1cc7992 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -82,7 +82,7 @@ myynh_install() { # Install or update the main directory yunohost.multimedia # see https://github.com/YunoHost-Apps/yunohost.multimedia ynh_multimedia_build_main_dir () { - wget -nv https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip + wget -nv https://github.com/maniackcrudelis/yunohost.multimedia/archive/master.zip 2>&1 unzip master.zip sudo ./yunohost.multimedia-master/script/ynh_media_build.sh } From f778e3e0b9e45b5f0f021f07f46eb2216e553e75 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 16:31:42 +0100 Subject: [PATCH 06/19] set license and maintainer --- manifest.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2216942..ff8c6f9 100644 --- a/manifest.json +++ b/manifest.json @@ -8,8 +8,12 @@ }, "version": "1.0.2", "url": "https://www.mopidy.com/", - "license": "free", + "license": "Apache-2.0", "maintainer": { + "name": "siwinter", + "email": "siegfried.winter@arcor.de" + }, + "previous_maintainer": { "name": "cyp", "email": "cyp@rouquin.me" }, From d9a8d5c4ce321a6936aa0355eccb4efaa9105023 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:15:47 +0100 Subject: [PATCH 07/19] initial version --- issue_template.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/issue_template.md b/issue_template.md index 4a290c4..758e822 100644 --- a/issue_template.md +++ b/issue_template.md @@ -8,7 +8,7 @@ about: When creating a bug report, please use the following template to provide 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* - - *Otherwise, the issue may be due to REPLACEBYYOURAPP itself. Refer to its documentation or repository for help.* + - *Otherwise, the issue may be due to mopidy itself. Refer to its documentation or repository for help.* - *When in doubt, post here and we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -31,7 +31,7 @@ about: When creating a bug report, please use the following template to provide - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install REPLACEBYYOURAPP + sudo yunohost app install mopidy ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* From f7232c1d8ff65137cc36beb31f46cd7def12640f Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:22:36 +0100 Subject: [PATCH 08/19] replace /path by /path/ --- conf/nginx.conf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 0d33d43..2cabe2d 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,4 @@ -location /mopidy/ws { +location /mopidy/ws/ { # Force usage of https if ($scheme = http) { @@ -15,7 +15,7 @@ location /mopidy/ws { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } -location __PATH__ { +location __PATH__/ { # Force usage of https if ($scheme = http) { @@ -30,7 +30,7 @@ location __PATH__ { include conf.d/yunohost_panel.conf.inc; } -location /musicbox_webclient { +location /musicbox_webclient/ { # Force usage of https if ($scheme = http) { @@ -45,7 +45,7 @@ location /musicbox_webclient { include conf.d/yunohost_panel.conf.inc; } -location /local { +location /local/ { # Force usage of https if ($scheme = http) { From 68213a5c1ad07de4f780f881bfa9834b269559e3 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:28:31 +0100 Subject: [PATCH 09/19] Rename check_process.default to check_process --- check_process.default => check_process | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename check_process.default => check_process (100%) diff --git a/check_process.default b/check_process similarity index 100% rename from check_process.default rename to check_process From 903cd6c8d6d72ba38172ab4a0474c52ac479f7ca Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:38:45 +0100 Subject: [PATCH 10/19] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f3a1c8d..3f92cb3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Mopidy for YunoHost -[![Integration level](https://dash.yunohost.org/integration/REPLACEBYYOURAPP.svg)](https://dash.yunohost.org/appci/app/REPLACEBYYOURAPP) ![](https://ci-apps.yunohost.org/ci/badges/REPLACEBYYOURAPP.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/REPLACEBYYOURAPP.maintain.svg) -[![Install REPLACEBYYOURAPP with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=REPLACEBYYOURAPP) +[![Integration level](https://dash.yunohost.org/integration/REPLACEBYYOURAPP.svg)](https://dash.yunohost.org/appci/app/REPLACEBYYOURAPP) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg) +[![Install mopidy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy) *[Lire ce readme en français.](./README_fr.md)* From cc1bcdd94b7378a7f20fbcf487f050a0d1442d51 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:40:18 +0100 Subject: [PATCH 11/19] Update README_fr.md --- README_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README_fr.md b/README_fr.md index e1f1d34..cedf7a5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ # Mopidy pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/REPLACEBYYOURAPP.svg)](https://dash.yunohost.org/appci/app/REPLACEBYYOURAPP) ![](https://ci-apps.yunohost.org/ci/badges/REPLACEBYYOURAPP.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/REPLACEBYYOURAPP.maintain.svg) -[![Installer REPLACEBYYOURAPP avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=REPLACEBYYOURAPP) +[![Niveau d'intégration](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg) +[![Installer mopidy avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy) *[Read this readme in english.](./README.md)* From 7b437eea118ba3a0e61eb9e837d40f4c4c924873 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:41:08 +0100 Subject: [PATCH 12/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3f92cb3..824b7cf 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Mopidy for YunoHost -[![Integration level](https://dash.yunohost.org/integration/REPLACEBYYOURAPP.svg)](https://dash.yunohost.org/appci/app/REPLACEBYYOURAPP) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/mopidy.svg)](https://dash.yunohost.org/appci/app/mopidy) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/mopidy.maintain.svg) [![Install mopidy with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mopidy) *[Lire ce readme en français.](./README_fr.md)* From cdad7a3a717e4b7cc66bb8cd1b43adb40f643d1d Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:45:36 +0100 Subject: [PATCH 13/19] replace placeholder --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 824b7cf..04cdc57 100644 --- a/README.md +++ b/README.md @@ -54,8 +54,8 @@ Can the app be used by multiple users? ?? #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/REPLACEBYYOURAPP/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/REPLACEBYYOURAPP/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/) ## Limitations @@ -73,7 +73,7 @@ https://yunohost.org/packaging_apps ## Links - * Report a bug: https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/issues + * Report a bug: https://github.com/YunoHost-Apps/mopidy_ynh/issues * App website: https://mopidy.com/ * YunoHost website: https://yunohost.org/ @@ -82,11 +82,11 @@ https://yunohost.org/packaging_apps ## Developer info **Only if you want to use a testing branch for coding, instead of merging directly into master.** -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing). To try the testing branch, please proceed like that. ``` -sudo yunohost app install https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing --debug +sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug or -sudo yunohost app upgrade REPLACEBYYOURAPP -u https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/tree/testing --debug +sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug ``` From 1035fef37ef0f3b2a6b1fbbba0c316a8dcd5ab45 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:48:50 +0100 Subject: [PATCH 14/19] replace placeholder --- README_fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README_fr.md b/README_fr.md index cedf7a5..0146670 100644 --- a/README_fr.md +++ b/README_fr.md @@ -49,8 +49,8 @@ Cette installation est livrée avec différentes extensions: #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/REPLACEBYYOURAPP/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/REPLACEBYYOURAPP%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/REPLACEBYYOURAPP/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/mopidy%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/mopidy/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/mopidy%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/mopidy/) ## Limitations @@ -82,5 +82,5 @@ Pour essayer la branche testing, procédez comme suit. ``` sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug ou -sudo yunohost app upgrade REPLACEBYYOURAPP -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug +sudo yunohost app upgrade mopidy -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug ``` From df50d8232750fb4d2162f9dd710c32fca0a850b9 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 17:59:21 +0100 Subject: [PATCH 15/19] progression bar settings --- scripts/remove | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/remove b/scripts/remove index 76c8ef9..e142348 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --time --weight=1 +ynh_script_progression --message="Loading installation settings..." --weight=4 app=$YNH_APP_INSTANCE_NAME @@ -31,14 +31,14 @@ cmd_file="/usr/local/bin/mopidyctl" # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then - ynh_script_progression --message="Removing $app service integration..." --time --weight=1 + ynh_script_progression --message="Removing $app service integration..." --weight=2 yunohost service remove $app fi #================================================= # STOP AND REMOVE SERVICE #================================================= -ynh_script_progression --message="Stopping and removing the systemd service..." --time --weight=1 +ynh_script_progression --message="Stopping and removing the systemd service..." --weight=4 # Remove the dedicated systemd config ynh_remove_systemd_config @@ -46,7 +46,7 @@ ynh_remove_systemd_config #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_script_progression --message="Removing dependencies..." --time --weight=1 +ynh_script_progression --message="Removing dependencies..." --weight=42 # Remove metapackage and its dependencies ynh_remove_app_dependencies @@ -54,7 +54,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_script_progression --message="Removing app main directory..." --time --weight=1 +ynh_script_progression --message="Removing app main directory..." --weight=2 # Remove the app directory securely ynh_secure_remove --file="$final_path" @@ -62,7 +62,7 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2 # Remove the dedicated NGINX config ynh_remove_nginx_config @@ -80,7 +80,7 @@ ynh_secure_remove --file="$cmd_file" #================================================= # REMOVE DEDICATED USER #================================================= -ynh_script_progression --message="Removing the dedicated system user..." --time --weight=1 +ynh_script_progression --message="Removing the dedicated system user..." --weight=2 # Delete a system user ynh_system_user_delete --username=$app From c7e0407da19cfd157c678119e9b214dbb8ca4525 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 18:19:34 +0100 Subject: [PATCH 16/19] Update remove --- scripts/remove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index e142348..68e9bb7 100755 --- a/scripts/remove +++ b/scripts/remove @@ -89,4 +89,4 @@ ynh_system_user_delete --username=$app # END OF SCRIPT #================================================= -ynh_script_progression --message="Removal of $app completed" --time --last +ynh_script_progression --message="Removal of $app completed" --last From 02977a75fd1295b3f3749bd6a697f41ba0d4d152 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 18:22:14 +0100 Subject: [PATCH 17/19] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 9b6ec89..37a9504 100755 --- a/scripts/install +++ b/scripts/install @@ -192,7 +192,7 @@ ynh_permission_url --permission="main" --add_url="$domain/musicbox_webclient" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --time --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 ynh_systemd_action --service_name=nginx --action=reload From 1ccd5ba821723c1da22b8664a584df455013bc4a Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 19:14:37 +0100 Subject: [PATCH 18/19] set progression bar --- scripts/install | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/install b/scripts/install index 37a9504..eedca0c 100755 --- a/scripts/install +++ b/scripts/install @@ -36,7 +36,7 @@ cmd_file="/usr/local/bin/mopidyctl" #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_script_progression --message="Validating installation parameters..." --time --weight=1 +ynh_script_progression --message="Validating installation parameters..." test ! -e "$final_path" || ynh_die --message="This path already contains a folder" @@ -56,7 +56,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --time --weight=1 +ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url @@ -66,7 +66,7 @@ ynh_app_setting_set --app=$app --key=path --value=$path_url #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Finding an available port..." --time --weight=1 +ynh_script_progression --message="Finding an available port..." # Find an available port port=$(ynh_find_port --port=6680) @@ -75,14 +75,14 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --time --weight=1 +ynh_script_progression --message="Installing dependencies..." --weight=40 ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER #================================================= -ynh_script_progression --message="Configuring system user..." --time --weight=1 +ynh_script_progression --message="Configuring system user..." # Create a system user ynh_system_user_create --username="$app" --home_dir="$final_path" --use_shell @@ -90,7 +90,7 @@ ynh_system_user_create --username="$app" --home_dir="$final_path" --use_shell #================================================= # INSTALL MOPIDY IN PYTHON ENVIRONMENT #================================================= -ynh_script_progression --message="Setting up source files..." --time --weight=1 +ynh_script_progression --message="Install in Python environment..." myynh_install @@ -99,7 +99,7 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring NGINX web server..." --time --weight=1 +ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated NGINX config ynh_add_nginx_config @@ -111,7 +111,7 @@ ynh_add_nginx_config #================================================= # CREATE YUNOHOST DIRECTORIES #================================================= -ynh_script_progression --message="Creating yunohost directories..." --time --weight=1 +ynh_script_progression --message="Creating yunohost directories..." ynh_multimedia_build_main_dir # /home/yunohost.multimedia @@ -122,7 +122,7 @@ chown -R $app: "$work_dir" #================================================= # SETUP SYSTEMD #================================================= -ynh_script_progression --message="Configuring a systemd service..." --time --weight=1 +ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config start_file="$final_path/env/bin/$app" @@ -131,7 +131,7 @@ ynh_add_systemd_config --others_var="conf_file start_file" # substitute __CO #================================================= # MODIFY A CONFIG FILE #================================================= -ynh_script_progression --message="Setup config file..." --time --weight=1 +ynh_script_progression --message="Setup config file..." cp ../conf/app.conf "$conf_file" if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) @@ -163,14 +163,14 @@ chown $app: $final_path #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= -ynh_script_progression --message="Integrating service in YunoHost..." --time --weight=1 +ynh_script_progression --message="Integrating service in YunoHost..." yunohost service add $app --log_type systemd --description "this is mopidy, a music server" #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." --time --weight=1 +ynh_script_progression --message="Starting a systemd service..." # Start a systemd service ynh_systemd_action --service_name=$app --action="start" @@ -178,7 +178,7 @@ ynh_systemd_action --service_name=$app --action="start" #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring permissions..." --time --weight=1 +ynh_script_progression --message="Configuring permissions..." # Make app public if necessary if [ $is_public -eq 1 ]; then @@ -192,14 +192,14 @@ ynh_permission_url --permission="main" --add_url="$domain/musicbox_webclient" #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading NGINX web server..." --weight=1 +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload #================================================= # PROVIDE ADDITIONAL SHELL COMAND #================================================= -ynh_script_progression --message="Provide additional shell comand..." --time --weight=1 +ynh_script_progression --message="Provide additional shell comand..." cp -a ../sources/extra_files/mopidyctl "$cmd_file" ynh_replace_string --match_string="__APP__" --replace_string=$app --target_file="$cmd_file" @@ -228,7 +228,7 @@ fi #================================================= # SCAN LOCAL MEDIA DIRECTORY #================================================= -ynh_script_progression --message="Scan local media directory..." --weight=1 +ynh_script_progression --message="Scan local media directory..." "$cmd_file" local scan @@ -236,4 +236,4 @@ ynh_script_progression --message="Scan local media directory..." --weight=1 # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" --time --last +ynh_script_progression --message="Installation of $app completed"--last From 674a5343ccb68ab5a7d703d2f717bd3946fb86e0 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Fri, 19 Mar 2021 19:22:55 +0100 Subject: [PATCH 19/19] set progression bar --- scripts/_common.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1cc7992..831eb21 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -16,7 +16,7 @@ pkg_dependencies="build-essential python3-dev python3-pip python3-venv git postg python_version="$(python3 -V | cut -d' ' -f2 | cut -d. -f1-2)" myynh_install() { - ynh_script_progression --message="Install / upgrade mopidy via pip..." --time --weight=1 + ynh_script_progression --message="Install / upgrade mopidy via pip..." --weight=8 python3 -m venv "${final_path}/env" chown -R "$app" "$final_path" @@ -27,7 +27,7 @@ myynh_install() { set -o nounset ynh_exec_as $app $final_path/env/bin/pip install --upgrade --no-cache-dir pip - ynh_script_progression --message="Installing essentials..." --time --weight=1 + ynh_script_progression --message="Installing essentials..." --weight=17 # to make Gstreamer visible in Python environment $final_path/env/bin/python3 -m pip install vext @@ -39,26 +39,26 @@ myynh_install() { ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-local==3.2.1 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-MusicBox-Webclient==3.1.0 - ynh_script_progression --message="Installing Mopidy-YouTube..." --time --weight=1 + ynh_script_progression --message="Installing Mopidy-YouTube..." --weight=7 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-YouTube==3.2 - ynh_script_progression --message="Installing Mopidy-YTMusic..." --time --weight=1 + ynh_script_progression --message="Installing Mopidy-YTMusic..." --weight=2 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-YTMusic==0.2.2 - ynh_script_progression --message="Installing Mopidy-RadioNet..." --time --weight=1 + ynh_script_progression --message="Installing Mopidy-RadioNet..." ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-RadioNet==0.2.2 - ynh_script_progression --message="Installing Mopidy-Podcast..." --time --weight=1 + ynh_script_progression --message="Installing Mopidy-Podcast..." ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast==3.0.0 - ynh_script_progression --message="Installing Mopidy-Podcast-iTunes..." --time --weight=1 + ynh_script_progression --message="Installing Mopidy-Podcast-iTunes..." --weight=2 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Podcast-iTunes==3.0.0 - ynh_script_progression --message="Installing Mopidy-SoundCloud..." --time --time --weight=1 + ynh_script_progression --message="Installing Mopidy-SoundCloud..." --weight=6 ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-SoundCloud # ynh_script_progression --message="Installing Mopidy-Spotify..." --time --weight=1 # ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Spotify Spotify Lib currently not available!! - if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) - then - ynh_script_progression --message="Installing Mopidy-Raspberry-GPIO..." --time --weight=1 - ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Raspberry-GPIO - fi +# if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) +# then +# ynh_script_progression --message="Installing Mopidy-Raspberry-GPIO..." --time --weight=1# +# ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Raspberry-GPIO +# fi # set +o nounset