diff --git a/ALL_README.md b/ALL_README.md index 8938aae..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,7 +1,7 @@ # All available README files by language - [Read the README in English](README.md) -- [Lee el README en español](README_es.md) +- [Lea el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) diff --git a/README.md b/README.md index e5cf343..c520863 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ By using Piped, you can freely watch and listen to content without the fear of p - [x] Public [JSON API](https://docs.piped.video/docs/api-documentation/) - [x] Federated protocol on Matrix to let instances collaborate with each other -**Shipped version:** 2024.05.18~ynh1 +**Shipped version:** 2024.06.01~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 95edb30..858a929 100644 --- a/README_es.md +++ b/README_es.md @@ -56,7 +56,7 @@ By using Piped, you can freely watch and listen to content without the fear of p - [x] Public [JSON API](https://docs.piped.video/docs/api-documentation/) - [x] Federated protocol on Matrix to let instances collaborate with each other -**Versión actual:** 2024.05.18~ynh1 +**Versión actual:** 2024.06.01~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index e1d8b48..8325da5 100644 --- a/README_eu.md +++ b/README_eu.md @@ -56,7 +56,7 @@ By using Piped, you can freely watch and listen to content without the fear of p - [x] Public [JSON API](https://docs.piped.video/docs/api-documentation/) - [x] Federated protocol on Matrix to let instances collaborate with each other -**Paketatutako bertsioa:** 2024.05.18~ynh1 +**Paketatutako bertsioa:** 2024.06.01~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index c7ac4c7..1fb1cba 100644 --- a/README_fr.md +++ b/README_fr.md @@ -56,7 +56,7 @@ By using Piped, you can freely watch and listen to content without the fear of p - [x] Public [JSON API](https://docs.piped.video/docs/api-documentation/) - [x] Federated protocol on Matrix to let instances collaborate with each other -**Version incluse :** 2024.05.18~ynh1 +**Version incluse :** 2024.06.01~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index ffcf78b..20a7e7c 100644 --- a/README_gl.md +++ b/README_gl.md @@ -56,7 +56,7 @@ By using Piped, you can freely watch and listen to content without the fear of p - [x] Public [JSON API](https://docs.piped.video/docs/api-documentation/) - [x] Federated protocol on Matrix to let instances collaborate with each other -**Versión proporcionada:** 2024.05.18~ynh1 +**Versión proporcionada:** 2024.06.01~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 8fb3c73..17d782a 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -56,7 +56,7 @@ By using Piped, you can freely watch and listen to content without the fear of p - [x] Public [JSON API](https://docs.piped.video/docs/api-documentation/) - [x] Federated protocol on Matrix to let instances collaborate with each other -**分发版本:** 2024.05.18~ynh1 +**分发版本:** 2024.06.01~ynh1 **演示:** diff --git a/conf/config.properties b/conf/config.properties index c5b1d89..9a210d0 100644 --- a/conf/config.properties +++ b/conf/config.properties @@ -82,7 +82,7 @@ MATRIX_SERVER:https://matrix-client.matrix.org # Hibernate properties hibernate.connection.url:jdbc:postgresql://127.0.0.1:5432/__DB_NAME__ hibernate.connection.driver_class:org.postgresql.Driver -hibernate.dialect:org.hibernate.dialect.PostgreSQLDialect +#hibernate.dialect:org.hibernate.dialect.PostgreSQLDialect hibernate.connection.username:__DB_USER__ hibernate.connection.password:__DB_PWD__ diff --git a/manifest.toml b/manifest.toml index 44a3eb0..0f9a677 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Piped" description.en = "An open-source alternative frontend for YouTube which is efficient by design." -version = "2024.05.18~ynh1" +version = "2024.06.01~ynh1" maintainers = [ "orhtej2" ] @@ -41,8 +41,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/TeamPiped/Piped/archive/499697f0e8914ef5a035c5f4ec2cf34da9b15916.tar.gz" - sha256 = "12c54c154dfe4f3c9bc7a5f6d662cece6745116a907a3d0ca4a2820172ed5579" + url = "https://github.com/TeamPiped/Piped/archive/f94d56c16540282266b94d33c5a865268e255a70.tar.gz" + sha256 = "8d8bb55d725f04986e3ca22fe4558e889a116f0576610ee5add0fb22474a51fd" autoupdate.strategy = "latest_github_commit" [resources.sources.api] @@ -52,8 +52,8 @@ ram.runtime = "50M" autoupdate.upstream = "https://github.com/TeamPiped/Piped-Backend/" [resources.sources.proxy] - url = "https://github.com/TeamPiped/piped-proxy/archive/31b3d3bcfa8a99d9fff611a83d536653811837f5.tar.gz" - sha256 = "4ca6bcef1a4601ef3a1d2fb89de6afdc356050cab363e689e26e69b891fe16ea" + url = "https://github.com/TeamPiped/piped-proxy/archive/aad4375921bca890b927f6d4c50dcebd0b65cc2d.tar.gz" + sha256 = "7e30aaf9244c3da00266fb5b45d163cfcd7a914b5f689041b1fe7c6134a81580" autoupdate.strategy = "latest_github_commit" autoupdate.upstream = "https://github.com/TeamPiped/piped-proxy/" diff --git a/scripts/change_url b/scripts/change_url index b5baad5..9faa09e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -14,7 +14,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app-api --action="stop" --log_path="/var/log/$app/$app-api.log" --line_match="Shutdown completed" +ynh_systemd_action --service_name=$app-api --action="stop" --log_path="/var/log/$app/$app-api.log" #================================================= # MODIFY URL IN NGINX CONF @@ -39,7 +39,7 @@ chmod 600 "$install_dir/config.properties" #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="HTTP Server is listening on" +ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="Database connection is ready!" #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index bd0075b..973c749 100644 --- a/scripts/install +++ b/scripts/install @@ -119,7 +119,7 @@ yunohost service add "$app-proxy" --description="Piped HTTP proxy service" --log ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service -ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="HTTP Server is listening on" +ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="Database connection is ready!" ynh_systemd_action --service_name=$app-proxy --action="start" --log_path="/var/log/$app/$app-proxy.log" --line_match="Running server!" diff --git a/scripts/restore b/scripts/restore index 166c7ca..14e6701 100644 --- a/scripts/restore +++ b/scripts/restore @@ -69,7 +69,7 @@ ynh_systemd_action --service_name=nginx --action=reload #================================================= # START SYSTEMD SERVICE #================================================= -ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="HTTP Server is listening on" +ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="Database connection is ready!" ynh_systemd_action --service_name=$app-proxy --action="start" --log_path="/var/log/$app/$app-proxy.log" --line_match="Running server!" diff --git a/scripts/upgrade b/scripts/upgrade index 54e5b52..3860c6d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -24,7 +24,7 @@ chmod 640 "/var/log/$app" #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app-api --action="stop" --log_path="/var/log/$app/$app-api.log" --line_match="Shutdown completed" +ynh_systemd_action --service_name=$app-api --action="stop" --log_path="/var/log/$app/$app-api.log" ynh_systemd_action --service_name=$app-proxy --action="stop" #================================================= @@ -135,7 +135,7 @@ chmod 600 "$install_dir/config.properties" ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="HTTP Server is listening on" +ynh_systemd_action --service_name=$app-api --action="start" --log_path="/var/log/$app/$app-api.log" --line_match="Database connection is ready!" ynh_systemd_action --service_name=$app-proxy --action="start" --log_path="/var/log/$app/$app-proxy.log" --line_match="Running server!" diff --git a/sources/patches/proxy-001.patch b/sources/patches/proxy-001.patch deleted file mode 100644 index 0edbf2d..0000000 --- a/sources/patches/proxy-001.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e299b8c..3492d62 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1041,9 +1041,9 @@ dependencies = [ - - [[package]] - name = "libmimalloc-sys" --version = "0.1.37" -+version = "0.1.35" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7" -+checksum = "3979b5c37ece694f1f5e51e7ecc871fdb0f517ed04ee45f88d15d6d553cb9664" - dependencies = [ - "cc", - "libc", -@@ -1125,9 +1125,9 @@ checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - - [[package]] - name = "mimalloc" --version = "0.1.41" -+version = "0.1.39" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d" -+checksum = "fa01922b5ea280a911e323e4d2fd24b7fe5cc4042e0d2cda3c40775cdc4bdc9c" - dependencies = [ - "libmimalloc-sys", - ] -diff --git a/Cargo.toml b/Cargo.toml -index 91444eb..da3f806 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -13,7 +13,7 @@ reqwest = { version = "0.11.27", features = ["stream", "brotli", "gzip", "socks" - qstring = "0.7.2" - - # Alternate Allocator --mimalloc = { version = "0.1.41", optional = true } -+mimalloc = { version = "0.1.39", optional = true } - - # Transcoding Images to WebP/AVIF to save bandwidth - image = { version = "0.25.1", features = ["jpeg", "webp", "rayon"], default-features = false, optional = true }