From ea2ef95fcf26ff5d9bf3883d69f8342063bc52fb Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Tue, 9 Mar 2021 17:35:22 +0100 Subject: [PATCH 1/6] remove raspberry-gpio extension --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index f3a1c8d..6c6f73a 100644 --- a/README.md +++ b/README.md @@ -39,8 +39,6 @@ This installation is shipped with various extensions: * [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) to play music from the [SoundCloud](https://soundcloud.com/) service \([authentication token](https://pypi.org/project/Mopidy-SoundCloud/) needed\). -* [Raspberry-GPIO](https://mopidy.com/ext/raspberry-gpio/) to control Mopidy from GPIO signals on a Raspberry Pi (only available an ARM-architectures). - ## Documentation * Official documentation: https://docs.mopidy.com/en/latest/ From 0e2d38aa409b0188a6e8aabce72129a64af626fa Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Tue, 9 Mar 2021 17:37:25 +0100 Subject: [PATCH 2/6] remove raspberry-gpio extension --- scripts/_common.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 246aead..30c7cc4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -54,11 +54,11 @@ myynh_install() { # 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 From dccde83e079fe4553703923992f5eff0c1ab3120 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Tue, 9 Mar 2021 17:41:16 +0100 Subject: [PATCH 3/6] remove raspberry-gpio extension --- scripts/install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 9b6ec89..13fa6fb 100755 --- a/scripts/install +++ b/scripts/install @@ -134,10 +134,10 @@ ynh_add_systemd_config --others_var="conf_file start_file" # substitute __CO ynh_script_progression --message="Setup config file..." --time --weight=1 cp ../conf/app.conf "$conf_file" -if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) - then - cat ../conf/raspberry.conf >> "$conf_file" -fi +#if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) +# then +# cat ../conf/raspberry.conf >> "$conf_file" +#fi ynh_replace_string --match_string="__PORT__" --replace_string=$port --target_file="$conf_file" ynh_replace_string --match_string="__MEDIADIR__" --replace_string=$media_dir --target_file="$conf_file" From dab4b90e42ca33cb3de12aaf58903e32de77b045 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Tue, 9 Mar 2021 17:42:56 +0100 Subject: [PATCH 4/6] Update upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4919ef7..7a7f503 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -145,10 +145,10 @@ ynh_backup_if_checksum_is_different --file="$conf_file" cp ../conf/app.conf "$conf_file" -if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) - then - cat ../conf/raspberry.conf >> "$conf_file" -fi +#if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) +# then +# cat ../conf/raspberry.conf >> "$conf_file" +#fi ynh_replace_string --match_string="__PORT__" --replace_string=$port --target_file="$conf_file" ynh_replace_string --match_string="__MEDIADIR__" --replace_string=$media_dir --target_file="$conf_file" From 5729e42df1a79909b67e7309d154f6c64c066f77 Mon Sep 17 00:00:00 2001 From: siwinter Date: Wed, 10 Mar 2021 00:33:24 +0100 Subject: [PATCH 5/6] fix URI permissions --- scripts/install | 12 +----------- scripts/restore | 4 ---- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/scripts/install b/scripts/install index 13fa6fb..8990db5 100755 --- a/scripts/install +++ b/scripts/install @@ -40,16 +40,6 @@ ynh_script_progression --message="Validating installation parameters..." --time test ! -e "$final_path" || ynh_die --message="This path already contains a folder" -# Check web path availability -ynh_webpath_available $domain $path_url\ - || ynh_die --message="Path not available: ${domain}${path_url}" -ynh_webpath_available $domain "/musicbox_webclient"\ - || ynh_die --message="Path not available: ${domain}/musicbox_webclient" -ynh_webpath_available $domain "/mopidy"\ - || ynh_die --message="Path not available: ${domain}/mopidy" -ynh_webpath_available $domain "/local"\ - || ynh_die --message="Path not available: ${domain}/local" - # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -187,7 +177,7 @@ fi ynh_permission_url --permission="main" --add_url="$domain/mopidy/ws" ynh_permission_url --permission="main" --add_url="$domain/musicbox_webclient" -#ynh_permission_url --permission="main" --add_url="$domain/local" +ynh_permission_url --permission="main" --add_url="$domain/local" #================================================= # RELOAD NGINX diff --git a/scripts/restore b/scripts/restore index 0d87224..a8017a8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -51,10 +51,6 @@ ynh_webpath_available $domain "/mopidy"\ ynh_webpath_available $domain "/local"\ || ynh_die --message="Path not available: ${domain}/local" -# Register (book) web path -ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url - - #================================================= # STANDARD RESTORATION STEPS #================================================= From c25eb338cde62d39022a898b0c01946427679e55 Mon Sep 17 00:00:00 2001 From: siwinter <45730097+siwinter@users.noreply.github.com> Date: Wed, 17 Mar 2021 21:32:37 +0100 Subject: [PATCH 6/6] improve layout --- README.md | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 6c6f73a..5b69705 100644 --- a/README.md +++ b/README.md @@ -26,17 +26,12 @@ It plays music, podcasts and radio programs from local disk and various streamin This installation is shipped with various extensions: * [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) to control mopidy from your web browser - * [local](https://mopidy.com/ext/local/) to make your private music collection on `/home/yunohost.multimedia/share/Music/` browseable and searchable - * [YouTube](https://pypi.org/project/Mopidy-YouTube/) to play sound from YouTube - * [YTMusic](https://music.youtube.com/) to access Google’s streaming music named [YouTube Music](https://music.youtube.com/) * [Podcast-iTunes](https://mopidy.com/ext/podcast-itunes/) to search and browse podcasts from the Apple iTunes Store. * [RadioNet](https://mopidy.com/ext/radionet/) to play radio channels from the [radio.net](https://www.radio.net/). - * [Podcast](https://mopidy.com/ext/podcast/) to browse RSS feeds of podcasts and stream the episodes. - * [Soundcloud](https://pypi.org/project/Mopidy-SoundCloud/) to play music from the [SoundCloud](https://soundcloud.com/) service \([authentication token](https://pypi.org/project/Mopidy-SoundCloud/) needed\). ## Documentation @@ -61,10 +56,9 @@ Can the app be used by multiple users? ?? ## Additional information -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` +* 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`. **More info on the documentation page:** https://yunohost.org/packaging_apps @@ -80,11 +74,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 REPLACEBYYOURAPP -u https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug ```