1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/mopidy_ynh.git synced 2024-09-03 19:46:21 +02:00

Merge branch 'master' into testing

This commit is contained in:
siwinter 2021-03-19 19:40:33 +01:00 committed by GitHub
commit c2312c8ac8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 36 deletions

View file

@ -26,21 +26,14 @@ It plays music, podcasts and radio programs from local disk and various streamin
This installation is shipped with various extensions: This installation is shipped with various extensions:
* [MusicBox-Webclient](https://mopidy.com/ext/musicbox-webclient/) to control mopidy from your web browser * [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 * [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 * [YouTube](https://pypi.org/project/Mopidy-YouTube/) to play sound from YouTube
* [YTMusic](https://music.youtube.com/) to access Googles streaming music named [YouTube Music](https://music.youtube.com/) * [YTMusic](https://music.youtube.com/) to access Googles 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. * [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/). * [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. * [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\). * [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 ## Documentation
* Official documentation: https://docs.mopidy.com/en/latest/ * Official documentation: https://docs.mopidy.com/en/latest/
@ -63,10 +56,9 @@ Can the app be used by multiple users? ??
## Additional information ## Additional information
To list current settings enter `sudo mopidyctl config` \ * To list current settings enter `sudo mopidyctl config`.
Edit the file `/opt/yunohost/mopidy/mopidy.conf` to adjust mopidy's configuration.\\ * 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 rebuild the database of your local music collection enter `sudo mopidyctl local scan`
**More info on the documentation page:** **More info on the documentation page:**
https://yunohost.org/packaging_apps https://yunohost.org/packaging_apps
@ -89,4 +81,5 @@ To try the testing branch, please proceed like that.
sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/mopidy_ynh/tree/testing --debug
or or
sudo yunohost app upgrade mopidy -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
``` ```

View file

@ -56,7 +56,7 @@ myynh_install() {
# if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) # if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx)
# then # then
# ynh_script_progression --message="Installing Mopidy-Raspberry-GPIO..." --time --weight=1# # 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 # ynh_exec_as $app $final_path/env/bin/python3 -m pip install --no-cache-dir Mopidy-Raspberry-GPIO
# fi # fi

View file

@ -40,16 +40,6 @@ ynh_script_progression --message="Validating installation parameters..."
test ! -e "$final_path" || ynh_die --message="This path already contains a folder" 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 # Register (book) web path
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
@ -134,10 +124,10 @@ ynh_add_systemd_config --others_var="conf_file start_file" # substitute __CO
ynh_script_progression --message="Setup config file..." ynh_script_progression --message="Setup config file..."
cp ../conf/app.conf "$conf_file" cp ../conf/app.conf "$conf_file"
if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) #if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx)
then # then
cat ../conf/raspberry.conf >> "$conf_file" # cat ../conf/raspberry.conf >> "$conf_file"
fi #fi
ynh_replace_string --match_string="__PORT__" --replace_string=$port --target_file="$conf_file" 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" ynh_replace_string --match_string="__MEDIADIR__" --replace_string=$media_dir --target_file="$conf_file"
@ -187,7 +177,7 @@ fi
ynh_permission_url --permission="main" --add_url="$domain/mopidy/ws" 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/musicbox_webclient"
#ynh_permission_url --permission="main" --add_url="$domain/local" ynh_permission_url --permission="main" --add_url="$domain/local"
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX

View file

@ -51,10 +51,6 @@ ynh_webpath_available $domain "/mopidy"\
ynh_webpath_available $domain "/local"\ ynh_webpath_available $domain "/local"\
|| ynh_die --message="Path not 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 # STANDARD RESTORATION STEPS
#================================================= #=================================================

View file

@ -145,10 +145,10 @@ ynh_backup_if_checksum_is_different --file="$conf_file"
cp ../conf/app.conf "$conf_file" cp ../conf/app.conf "$conf_file"
if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx) #if [ -n "$(uname -m | grep arm)" ]; # check CPU (raspberry is armxx)
then # then
cat ../conf/raspberry.conf >> "$conf_file" # cat ../conf/raspberry.conf >> "$conf_file"
fi #fi
ynh_replace_string --match_string="__PORT__" --replace_string=$port --target_file="$conf_file" 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" ynh_replace_string --match_string="__MEDIADIR__" --replace_string=$media_dir --target_file="$conf_file"