Merge pull request #20 from YunoHost-Apps/testing

ALL_README.md

@@ -5,4 +5,5 @@
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
+- [Baca README dalam bahasa bahasa Indonesia](README_id.md)
 - [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -5,7 +5,7 @@ It shall NOT be edited by hand.
 
 # Headphones for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/headphones.svg)](https://dash.yunohost.org/appci/app/headphones) ![Working status](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
+[![Integration level](https://dash.yunohost.org/integration/headphones.svg)](https://ci-apps.yunohost.org/ci/apps/headphones/) ![Working status](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
 
 [![Install Headphones with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=headphones)
 
@@ -19,7 +19,7 @@ It shall NOT be edited by hand.
 Headphones is an automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole.
 
 
-**Shipped version:** 0.6.3~ynh1
+**Shipped version:** 0.6.3~ynh2
 
 ## Screenshots
 

README_es.md

@@ -5,7 +5,7 @@ No se debe editar a mano.
 
 # Headphones para Yunohost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/headphones.svg)](https://dash.yunohost.org/appci/app/headphones) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/headphones.svg)](https://ci-apps.yunohost.org/ci/apps/headphones/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
 
 [![Instalar Headphones con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=headphones)
 
@@ -19,7 +19,7 @@ No se debe editar a mano.
 Headphones is an automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole.
 
 
-**Versión actual:** 0.6.3~ynh1
+**Versión actual:** 0.6.3~ynh2
 
 ## Capturas
 

README_eu.md

@@ -5,7 +5,7 @@ EZ editatu eskuz.
 
 # Headphones YunoHost-erako
 
-[![Integrazio maila](https://dash.yunohost.org/integration/headphones.svg)](https://dash.yunohost.org/appci/app/headphones) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
+[![Integrazio maila](https://dash.yunohost.org/integration/headphones.svg)](https://ci-apps.yunohost.org/ci/apps/headphones/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
 
 [![Instalatu Headphones YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=headphones)
 
@@ -19,7 +19,7 @@ EZ editatu eskuz.
 Headphones is an automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole.
 
 
-**Paketatutako bertsioa:** 0.6.3~ynh1
+**Paketatutako bertsioa:** 0.6.3~ynh2
 
 ## Pantaila-argazkiak
 

README_fr.md

@@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main.
 
 # Headphones pour YunoHost
 
-[![Niveau d’intégration](https://dash.yunohost.org/integration/headphones.svg)](https://dash.yunohost.org/appci/app/headphones) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
+[![Niveau d’intégration](https://dash.yunohost.org/integration/headphones.svg)](https://ci-apps.yunohost.org/ci/apps/headphones/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
 
 [![Installer Headphones avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=headphones)
 
@@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main.
 Headphones is an automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole.
 
 
-**Version incluse :** 0.6.3~ynh1
+**Version incluse :** 0.6.3~ynh2
 
 ## Captures d’écran
 

README_gl.md

@@ -5,7 +5,7 @@ NON debe editarse manualmente.
 
 # Headphones para YunoHost
 
-[![Nivel de integración](https://dash.yunohost.org/integration/headphones.svg)](https://dash.yunohost.org/appci/app/headphones) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
+[![Nivel de integración](https://dash.yunohost.org/integration/headphones.svg)](https://ci-apps.yunohost.org/ci/apps/headphones/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
 
 [![Instalar Headphones con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=headphones)
 
@@ -19,7 +19,7 @@ NON debe editarse manualmente.
 Headphones is an automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole.
 
 
-**Versión proporcionada:** 0.6.3~ynh1
+**Versión proporcionada:** 0.6.3~ynh2
 
 ## Capturas de pantalla
 

README_id.md

@@ -0,0 +1,47 @@
+<!--
+N.B.: README ini dibuat secara otomatis oleh <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+Ini TIDAK boleh diedit dengan tangan.
+-->
+
+# Headphones untuk YunoHost
+
+[![Tingkat integrasi](https://dash.yunohost.org/integration/headphones.svg)](https://ci-apps.yunohost.org/ci/apps/headphones/) ![Status kerja](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![Status pemeliharaan](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
+
+[![Pasang Headphones dengan YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=headphones)
+
+*[Baca README ini dengan bahasa yang lain.](./ALL_README.md)*
+
+> *Paket ini memperbolehkan Anda untuk memasang Headphones secara cepat dan mudah pada server YunoHost.*  
+> *Bila Anda tidak mempunyai YunoHost, silakan berkonsultasi dengan [panduan](https://yunohost.org/install) untuk mempelajari bagaimana untuk memasangnya.*
+
+## Ringkasan
+
+Headphones is an automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole.
+
+
+**Versi terkirim:** 0.6.3~ynh2
+
+## Tangkapan Layar
+
+![Tangkapan Layar pada Headphones](./doc/screenshots/screenshot01.png)
+
+## Dokumentasi dan sumber daya
+
+- Dokumentasi pengguna resmi: <https://github.com/rembo10/headphones/wiki/Usage-guide>
+- Repositori kode aplikasi hulu: <https://github.com/rembo10/headphones>
+- Gudang YunoHost: <https://apps.yunohost.org/app/headphones>
+- Laporkan bug: <https://github.com/YunoHost-Apps/headphones_ynh/issues>
+
+## Info developer
+
+Silakan kirim pull request ke [`testing` branch](https://github.com/YunoHost-Apps/headphones_ynh/tree/testing).
+
+Untuk mencoba branch `testing`, silakan dilanjutkan seperti:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/headphones_ynh/tree/testing --debug
+atau
+sudo yunohost app upgrade headphones -u https://github.com/YunoHost-Apps/headphones_ynh/tree/testing --debug
+```
+
+**Info lebih lanjut mengenai pemaketan aplikasi:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -5,7 +5,7 @@
 
 # YunoHost 上的 Headphones
 
-[![集成程度](https://dash.yunohost.org/integration/headphones.svg)](https://dash.yunohost.org/appci/app/headphones) ![工作状态](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
+[![集成程度](https://dash.yunohost.org/integration/headphones.svg)](https://ci-apps.yunohost.org/ci/apps/headphones/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/headphones.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/headphones.maintain.svg)
 
 [![使用 YunoHost 安装 Headphones](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=headphones)
 
@@ -19,7 +19,7 @@
 Headphones is an automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole.
 
 
-**分发版本：** 0.6.3~ynh1
+**分发版本：** 0.6.3~ynh2
 
 ## 截图
 

conf/systemd.service

@@ -6,7 +6,7 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__INSTALL_DIR__/
-ExecStart=__INSTALL_DIR__/venv/bin/python3 __INSTALL_DIR__/Headphones.py --config /etc/__APP__/headphones.ini --datadir __DATA_DIR__ --nolaunch
+ExecStart=__INSTALL_DIR__/venv/bin/python3 __INSTALL_DIR__/Headphones.py --config __INSTALL_DIR__/headphones.ini --datadir __DATA_DIR__ --nolaunch
 
 # Sandboxing options to harden security
 # Depending on specificities of your service/app, you may need to tweak these

manifest.toml

@@ -5,7 +5,7 @@ name = "Headphones"
 description.en = "Automated music downloader for NZB and Torrent"
 description.fr = "Téléchargeur de musique automatisé pour NZB et Torrent"
 
-version = "0.6.3~ynh1"
+version = "0.6.3~ynh2"
 
 maintainers = []
 

scripts/backup

@@ -47,12 +47,6 @@ ynh_backup --src_path="/etc/logrotate.d/$app"
 
 ynh_backup --src_path="/etc/systemd/system/$app.service"
 
-#=================================================
-# BACKUP VARIOUS FILES
-#=================================================
-
-ynh_backup --src_path="/etc/$app/"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/change_url

@@ -32,12 +32,7 @@ ynh_change_url_nginx_config
 #=================================================
 ynh_script_progression --message="Updating a configuration file..."
 
-path=$new_path
+ynh_replace_string --match_string="^http_root = .*" --replace_string="http_root = $new_path" --target_file="$install_dir/headphones.ini"
-domain=$new_domain
-ynh_add_config --template="../conf/headphones.ini" --destination="/etc/$app/headphones.ini"
-
-chmod 600 "/etc/$app/headphones.ini"
-chown $app:$app "/etc/$app/headphones.ini"
 
 #=================================================
 # GENERIC FINALISATION

scripts/install

@@ -43,11 +43,11 @@ python3 -m venv $install_dir/venv
 #=================================================
 ynh_script_progression --message="Adding a configuration file..."
 
-mkdir -p "/etc/$app"
+ynh_add_config --template="../conf/headphones.ini" --destination="$install_dir/headphones.ini"
-ynh_add_config --template="../conf/headphones.ini" --destination="/etc/$app/headphones.ini"
+ynh_delete_file_checksum --file="$install_dir/headphones.ini"
 
-chmod 650 "/etc/$app/headphones.ini"
+chmod 650 "$install_dir/headphones.ini"
-chown $app:$app "/etc/$app/headphones.ini"
+chown $app:$app "$install_dir/headphones.ini"
 
 #=================================================
 # SETUP SYSTEMD

scripts/remove

@@ -46,19 +46,6 @@ ynh_script_progression --message="Removing NGINX web server configuration..."
 # Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-#=================================================
-# SPECIFIC REMOVE
-#=================================================
-# REMOVE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Removing various files..."
-
-# Remove a directory securely
-ynh_secure_remove --file="/etc/$app"
-
-# Remove the log files
-ynh_secure_remove --file="/var/log/$app"
-
 #=================================================
 # END OF SCRIPT
 #=================================================

scripts/restore

@@ -40,16 +40,6 @@ ynh_restore_file --origin_path="$data_dir" --not_mandatory
 
 chown -R $app:$app "$data_dir"
 
-#=================================================
-# RESTORE VARIOUS FILES
-#=================================================
-ynh_script_progression --message="Restoring various files..."
-
-ynh_restore_file --origin_path="/etc/$app/"
-
-chmod 600 "/etc/$app/headphones.ini"
-chown $app:$app "/etc/$app/headphones.ini"
-
 #=================================================
 # RESTORE SYSTEMD
 #=================================================

scripts/upgrade

@@ -63,11 +63,7 @@ python3 -m venv $install_dir/venv
 #=================================================
 ynh_script_progression --message="Updating a configuration file..."
 
-mkdir -p "/etc/$app"
+ynh_replace_string --match_string="^http_root = .*" --replace_string="http_root = $path" --target_file="$install_dir/headphones.ini"
-ynh_add_config --template="../conf/headphones.ini" --destination="/etc/$app/headphones.ini"
-
-chmod 600 "/etc/$app/headphones.ini"
-chown $app:$app "/etc/$app/headphones.ini"
 
 #=================================================
 # SETUP SYSTEMD