Merge pull request #44 from YunoHost-Apps/testing

Co-authored-by: OniriCorpe <oniricorpe@disroot.org>
Co-authored-by: Yunohost-Bot <>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: Salamandar <6552989+Salamandar@users.noreply.github.com>
Co-authored-by: YunoHost Bot <yunohost-bot@users.noreply.github.com>

ALL_README.md

@@ -1,6 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
+- [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)
-- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)

README.md

@@ -9,7 +9,7 @@ It shall NOT be edited by hand.
 
 [![Install Kavita with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kavita)
 
-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*
 
 > *This package allows you to install Kavita 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.*
@@ -31,7 +31,7 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu
 - OPDS-PS Support
 
 
-**Shipped version:** 0.7.14~ynh1
+**Shipped version:** 0.8.0~ynh1
 
 **Demo:** <https://demo.kavitareader.com/>
 
@@ -45,7 +45,7 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu
 
 ## Documentation and resources
 
-- Official app website: <www.kavitareader.com>
+- Official app website: <https://www.kavitareader.com/>
 - Official admin documentation: <https://wiki.kavitareader.com/en>
 - Upstream app code repository: <https://github.com/Kareadita/Kavita>
 - YunoHost Store: <https://apps.yunohost.org/app/kavita>

README_eu.md

@@ -0,0 +1,66 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Kavita YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/kavita.svg)](https://dash.yunohost.org/appci/app/kavita) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/kavita.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/kavita.maintain.svg)
+
+[![Instalatu Kavita YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kavita)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Kavita YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+Kavita is a fast, feature rich, cross platform reading server. Built with a focus for manga and the goal of being a full solution for all your reading needs. Setup your own server and share your reading collection with your friends and family.
+
+### Features
+
+- Extensive File support
+- Manga/Comic Reader
+- Book Reader
+- User Management and Sharing
+- Cross Platform with no dependencies - Everything in the box
+- Full-text search to quickly find what you want to read
+- Mixed media Libraries - Light Novels and Manga can be right next to each other
+- Fast and efficient library scans. Don't perform I/O if the underlying file hasn't changed.
+- OPDS-PS Support
+
+
+**Paketatutako bertsioa:** 0.8.0~ynh1
+
+**Demoa:** <https://demo.kavitareader.com/>
+
+## Pantaila-argazkiak
+
+![Kavita(r)en pantaila-argazkia](./doc/screenshots/screenshot.png)
+
+## :red_circle: Ezaugarri zalantzagarriak
+
+- **Ordainpeko edukia**: Ordainpeko zerbitzu bat sustatzen du edo bere mende dago, osorik edo neurri batean.
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://www.kavitareader.com/>
+- Administratzaileen dokumentazio ofiziala: <https://wiki.kavitareader.com/en>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/Kareadita/Kavita>
+- YunoHost Denda: <https://apps.yunohost.org/app/kavita>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/kavita_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/kavita_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/kavita_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade kavita -u https://github.com/YunoHost-Apps/kavita_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -30,7 +30,7 @@ Kavita est un serveur de lecture multiplateforme rapide et riche en fonctionnali
 - Analyses de bibliothèque rapides et efficaces. N'effectuez pas d'E/S si le fichier sous-jacent n'a pas changé.
 - Prise en charge OPDS-PS
 
-**Version incluse :** 0.7.14~ynh1
+**Version incluse :** 0.8.0~ynh1
 
 **Démo :** <https://demo.kavitareader.com/>
 
@@ -40,11 +40,11 @@ Kavita est un serveur de lecture multiplateforme rapide et riche en fonctionnali
 
 ## :red_circle: Anti-fonctionnalités
 
-- **Contenu payant**: Promeut ou dépend, entièrement ou partiellement, d'un service payant.
+- **Contenu payant **: Promeut ou dépend, entièrement ou partiellement, d'un service payant.
 
 ## Documentations et ressources
 
-- Site officiel de l’app : <www.kavitareader.com>
+- Site officiel de l’app : <https://www.kavitareader.com/>
 - Documentation officielle de l’admin : <https://wiki.kavitareader.com/en>
 - Dépôt de code officiel de l’app : <https://github.com/Kareadita/Kavita>
 - YunoHost Store : <https://apps.yunohost.org/app/kavita>

README_gl.md

@@ -31,7 +31,7 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu
 - OPDS-PS Support
 
 
-**Versión proporcionada:** 0.7.14~ynh1
+**Versión proporcionada:** 0.8.0~ynh1
 
 **Demo:** <https://demo.kavitareader.com/>
 
@@ -45,7 +45,7 @@ Kavita is a fast, feature rich, cross platform reading server. Built with a focu
 
 ## Documentación e recursos
 
-- Web oficial da app: <www.kavitareader.com>
+- Web oficial da app: <https://www.kavitareader.com/>
 - Documentación oficial para admin: <https://wiki.kavitareader.com/en>
 - Repositorio de orixe do código: <https://github.com/Kareadita/Kavita>
 - Tenda YunoHost: <https://apps.yunohost.org/app/kavita>

README_zh_Hans.md

@@ -0,0 +1,66 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 的 Kavita
+
+[![集成程度](https://dash.yunohost.org/integration/kavita.svg)](https://dash.yunohost.org/appci/app/kavita) ![工作状态](https://ci-apps.yunohost.org/ci/badges/kavita.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/kavita.maintain.svg)
+
+[![使用 YunoHost 安装 Kavita](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=kavita)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Kavita。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+Kavita is a fast, feature rich, cross platform reading server. Built with a focus for manga and the goal of being a full solution for all your reading needs. Setup your own server and share your reading collection with your friends and family.
+
+### Features
+
+- Extensive File support
+- Manga/Comic Reader
+- Book Reader
+- User Management and Sharing
+- Cross Platform with no dependencies - Everything in the box
+- Full-text search to quickly find what you want to read
+- Mixed media Libraries - Light Novels and Manga can be right next to each other
+- Fast and efficient library scans. Don't perform I/O if the underlying file hasn't changed.
+- OPDS-PS Support
+
+
+**分发版本：** 0.8.0~ynh1
+
+**演示：** <https://demo.kavitareader.com/>
+
+## 截图
+
+![Kavita 的截图](./doc/screenshots/screenshot.png)
+
+## :red_circle: 负面特征
+
+- **Paid content**: Promotes or depends, entirely or partially, on a paid service.
+
+## 文档与资源
+
+- 官方应用网站： <https://www.kavitareader.com/>
+- 官方管理文档： <https://wiki.kavitareader.com/en>
+- 上游应用代码库： <https://github.com/Kareadita/Kavita>
+- YunoHost 商店： <https://apps.yunohost.org/app/kavita>
+- 报告 bug： <https://github.com/YunoHost-Apps/kavita_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/kavita_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/kavita_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade kavita -u https://github.com/YunoHost-Apps/kavita_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>

manifest.toml

@@ -1,3 +1,5 @@
+#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json
+
 packaging_format = 2
 
 id = "kavita"
@@ -5,20 +7,20 @@ name = "Kavita"
 description.en = "Media server for your comics, manga and books"
 description.fr = "Serveur multimédia pour vos bandes dessinées, mangas et livres"
 
-version = "0.7.14~ynh1"
+version = "0.8.0~ynh1"
 
-maintainers = ["eric_G"]
+maintainers = [ "eric_G" ]
 
 [upstream]
 license = "MIT"
-website = "www.kavitareader.com"
+website = "https://www.kavitareader.com/"
 demo = "https://demo.kavitareader.com/"
 admindoc = "https://wiki.kavitareader.com/en"
 code = "https://github.com/Kareadita/Kavita"
 
 [integration]
 yunohost = ">= 11.2"
-architectures = ["amd64", "arm64", "armhf"]
+architectures = [ "amd64", "arm64", "armhf" ]
 multi_instance = true
 
 ldap = false
@@ -46,12 +48,12 @@ ram.runtime = "50M"
     [resources.sources]
         [resources.sources.main]
         in_subdir = true
-        amd64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.14/kavita-linux-x64.tar.gz"
+        amd64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.8.0/kavita-linux-x64.tar.gz"
-        amd64.sha256 = "385e75ce4e6faae5a09b50ac0c3ebda6a5374d51c249dfcf045e1e44bb49b22b"
+        amd64.sha256 = "84702cce150403fb4830e29e13097b395887b58cc487bf0701388b306a22c647"
-        arm64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.14/kavita-linux-arm64.tar.gz"
+        arm64.url = "https://github.com/Kareadita/Kavita/releases/download/v0.8.0/kavita-linux-arm64.tar.gz"
-        arm64.sha256 = "d0514a54537f18b3cfdc385f06796806e77a69f91825ec914cd50809a423a902"
+        arm64.sha256 = "6c4d87af649dc79b8004b687f5ceb78a4c09efb7f9ef2b80a4e243cb55b0b9bc"
-        armhf.url = "https://github.com/Kareadita/Kavita/releases/download/v0.7.14/kavita-linux-arm.tar.gz"
+        armhf.url = "https://github.com/Kareadita/Kavita/releases/download/v0.8.0/kavita-linux-arm.tar.gz"
-        armhf.sha256 = "e8201324ee8cd6ad6f65d1437cc95ef194fd9518b794465c93c36e2e05b016f4"
+        armhf.sha256 = "c7d8ac8c59bb1551a434a545db02771bc5eda301344e03f801bea78e9e22b43e"
 
         # https://yunohost.org/fr/packaging_apps_resources#regarding-autoupdate
         autoupdate.strategy = "latest_github_release"
@@ -59,27 +61,27 @@ ram.runtime = "50M"
         autoupdate.asset.arm64 = "kavita-linux-arm64.tar.gz"
         autoupdate.asset.armhf = "kavita-linux-arm.tar.gz"
 
-    [resources.ports]
+[resources.ports]
-    main.default = 5000
+main.default = 5000
 
-    [resources.system_user]
+[resources.system_user]
 
-    [resources.install_dir]
+[resources.install_dir]
 
-    [resources.permissions]
+[resources.permissions]
-    main.url = "/"
+main.url = "/"
 
-    api.url = "/api"
+api.url = "/api"
-    api.show_tile = false
+api.show_tile = false
-    api.protected= true
+api.protected = true
-    api.allowed = ["visitors", "all_users"]
+api.allowed = [ "visitors", "all_users" ]
-    api.auth_header = false
+api.auth_header = false
 
-    hubs.url = "/hubs"
+hubs.url = "/hubs"
-    hubs.show_tile = false
+hubs.show_tile = false
-    hubs.protected= true
+hubs.protected = true
-    hubs.auth_header = false
+hubs.auth_header = false
-    hubs.allowed = ["visitors", "all_users"]
+hubs.allowed = [ "visitors", "all_users" ]
 
-    [resources.apt]
+[resources.apt]
-    packages = "sqlite3"
+packages = "sqlite3"

scripts/install

@@ -32,6 +32,12 @@ ynh_add_nginx_config
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
+mkdir -p "/var/log/$app"
+chmod 640 "/var/log/$app"
+
+# Use logrotate to manage app-specific logfile(s)
+ynh_use_logrotate --non-append
+
 yunohost service add "$app" --description="Cross platform reading server" --log="/var/log/$app/$app.log"
 
 #=================================================

scripts/restore

@@ -31,7 +31,7 @@ then
 	ynh_script_progression --message="Migrating binary architecture..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep="config/appsettings.json"
+	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config"
 fi
 
 chmod -R o-rwx "$install_dir"
@@ -48,6 +48,12 @@ ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
 ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
 systemctl enable "$app".service --quiet
 
+mkdir -p "/var/log/$app"
+chmod 640 "/var/log/$app"
+
+# Use logrotate to manage app-specific logfile(s)
+ynh_use_logrotate --non-append
+
 yunohost service add "$app" --description="Cross platform reading server" --log="/var/log/$app/$app.log"
 
 #=================================================

scripts/upgrade

@@ -33,7 +33,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --keep="config/appsettings.json"
+	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config"
 fi
 
 chmod -R o-rwx "$install_dir"
@@ -77,6 +77,9 @@ ynh_add_nginx_config
 # Create a dedicated systemd config
 ynh_add_systemd_config
 
+mkdir -p "/var/log/$app"
+chmod 640 "/var/log/$app"
+
 # Use logrotate to manage app-specific logfile(s)
 ynh_use_logrotate --non-append