flibusta-apps/meilie_updater
1
0
Fork 0
mirror of https://github.com/flibusta-apps/meilie_updater.git synced 2025-12-06 07:05:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Bulat Kurbanov
2023-09-14 21:53:42 +02:00
parent 079f675402
commit dde74e8d27
5 changed files with 56 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build_docker_image.yml vendored
View File

@@ -13,12 +13,6 @@ jobs:
name: Checkout name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
- -
name: Set up Docker Buildx name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3 uses: docker/setup-buildx-action@v3

74
Cargo.lock generated
View File

@@ -982,9 +982,9 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-index-setting-macro" name = "meilisearch-index-setting-macro"
version = "0.24.1" version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "923bb7380030676cfd6563bc09cf88f7150fab55fc881c44e86f4a10c9b7ae2a" checksum = "b6e019768c1720f9820e94e8ec527e492be150eb0a5deeec28d85af7a5bbbe6a"
dependencies = [ dependencies = [
"convert_case", "convert_case",
"proc-macro2", "proc-macro2",
@@ -994,9 +994,9 @@ dependencies = [
[[package]] [[package]]
name = "meilisearch-sdk" name = "meilisearch-sdk"
version = "0.24.1" version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff38036cb0ce16609896d1fd90fbce9432a173c744abd3a0d8daf2e4cdbb0d65" checksum = "639a940bc77db5398000cb184c543106a823677f474f2f195251d2bdd373b6de"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"either", "either",
@@ -1283,9 +1283,9 @@ dependencies = [
[[package]] [[package]]
name = "postgres-protocol" name = "postgres-protocol"
version = "0.6.5" version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78b7fa9f396f51dffd61546fd8573ee20592287996568e6175ceb0f8699ad75d" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520"
dependencies = [ dependencies = [
"base64", "base64",
"byteorder", "byteorder",
@@ -1547,9 +1547,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
[[package]] [[package]]
name = "sentry" name = "sentry"
version = "0.31.5" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01b0ad16faa5d12372f914ed40d00bda21a6d1bdcc99264c5e5e1c9495cf3654" checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc"
dependencies = [ dependencies = [
"httpdate", "httpdate",
"native-tls", "native-tls",
@@ -1566,9 +1566,9 @@ dependencies = [
[[package]] [[package]]
name = "sentry-backtrace" name = "sentry-backtrace"
version = "0.31.5" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "11f2ee8f147bb5f22ac59b5c35754a759b9a6f6722402e2a14750b2a63fc59bd" checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"once_cell", "once_cell",
@@ -1578,9 +1578,9 @@ dependencies = [
[[package]] [[package]]
name = "sentry-contexts" name = "sentry-contexts"
version = "0.31.5" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dcd133362c745151eeba0ac61e3ba8350f034e9fe7509877d08059fe1d7720c6" checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147"
dependencies = [ dependencies = [
"hostname", "hostname",
"libc", "libc",
@@ -1592,9 +1592,9 @@ dependencies = [
[[package]] [[package]]
name = "sentry-core" name = "sentry-core"
version = "0.31.5" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7163491708804a74446642ff2c80b3acd668d4b9e9f497f85621f3d250fd012b" checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"rand", "rand",
@@ -1605,9 +1605,9 @@ dependencies = [
[[package]] [[package]]
name = "sentry-debug-images" name = "sentry-debug-images"
version = "0.31.5" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a5003d7ff08aa3b2b76994080b183e8cfa06c083e280737c9cee02ca1c70f5e" checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd"
dependencies = [ dependencies = [
"findshlibs", "findshlibs",
"once_cell", "once_cell",
@@ -1616,9 +1616,9 @@ dependencies = [
[[package]] [[package]]
name = "sentry-panic" name = "sentry-panic"
version = "0.31.5" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4dfe8371c9b2e126a8b64f6fefa54cef716ff2a50e63b5558a48b899265bccd" checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa"
dependencies = [ dependencies = [
"sentry-backtrace", "sentry-backtrace",
"sentry-core", "sentry-core",
@@ -1626,9 +1626,9 @@ dependencies = [
[[package]] [[package]]
name = "sentry-tracing" name = "sentry-tracing"
version = "0.31.5" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5aca8b88978677a27ee1a91beafe4052306c474c06f582321fde72d2e2cc2f7f" checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac"
dependencies = [ dependencies = [
"sentry-backtrace", "sentry-backtrace",
"sentry-core", "sentry-core",
@@ -1638,13 +1638,13 @@ dependencies = [
[[package]] [[package]]
name = "sentry-types" name = "sentry-types"
version = "0.31.5" version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e7a88e0c1922d19b3efee12a8215f6a8a806e442e665ada71cc222cab72985f" checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740"
dependencies = [ dependencies = [
"debugid", "debugid",
"getrandom",
"hex", "hex",
"rand",
"serde", "serde",
"serde_json", "serde_json",
"thiserror", "thiserror",
@@ -1655,18 +1655,18 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.183" version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.183" version = "1.0.188"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -1915,9 +1915,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.31.0" version = "1.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@@ -1955,9 +1955,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-postgres" name = "tokio-postgres"
version = "0.7.8" version = "0.7.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e89f6234aa8fd43779746012fcf53603cdb91fdd8399aa0de868c2d56b6dde1" checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"byteorder", "byteorder",
@@ -1972,9 +1972,11 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
"postgres-protocol", "postgres-protocol",
"postgres-types", "postgres-types",
"rand",
"socket2 0.5.3", "socket2 0.5.3",
"tokio", "tokio",
"tokio-util", "tokio-util",
"whoami",
] ]
[[package]] [[package]]
@@ -2276,6 +2278,16 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "whoami"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
dependencies = [
"wasm-bindgen",
"web-sys",
]
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.3.9" version = "0.3.9"

14
Cargo.toml
View File

@@ -6,14 +6,14 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
tokio = { version = "1.28.2", features = ["full"] } tokio = { version = "1.32.0", features = ["full"] }
axum = "0.6.18" axum = "0.6.20"
sentry = { version = "0.31.3", features = ["debug-images"] } sentry = { version = "0.31.7", features = ["debug-images"] }
lazy_static = "1.4.0" lazy_static = "1.4.0"
log = "0.4.18" log = "0.4.20"
env_logger = "0.10.0" env_logger = "0.10.0"
tokio-postgres = { version = "0.7.8", features = ["with-chrono-0_4"] } tokio-postgres = { version = "0.7.10", features = ["with-chrono-0_4"] }
deadpool-postgres = "0.10.5" deadpool-postgres = "0.10.5"
meilisearch-sdk = "0.24.1" meilisearch-sdk = "0.24.2"
futures = "0.3.28" futures = "0.3.28"
serde = { version = "1.0.163", features = ["derive"] } serde = { version = "1.0.188", features = ["derive"] }

10
src/models.rs
View File

@@ -5,7 +5,7 @@ pub trait UpdateModel {
fn get_index() -> String; fn get_index() -> String;
fn get_query() -> String; fn get_query() -> String;
fn from_row(row: Row) -> Self; fn from_row(row: Row) -> Self;
fn get_searchanble_attributes() -> Vec<String>; fn get_searchable_attributes() -> Vec<String>;
fn get_filterable_attributes() -> Vec<String>; fn get_filterable_attributes() -> Vec<String>;
fn get_ranking_rules() -> Vec<String>; fn get_ranking_rules() -> Vec<String>;
} }
@@ -36,7 +36,7 @@ impl UpdateModel for Book {
} }
} }
fn get_searchanble_attributes() -> Vec<String> { fn get_searchable_attributes() -> Vec<String> {
vec!["title".to_string()] vec!["title".to_string()]
} }
@@ -114,7 +114,7 @@ impl UpdateModel for Author {
} }
} }
fn get_searchanble_attributes() -> Vec<String> { fn get_searchable_attributes() -> Vec<String> {
vec![ vec![
"first_name".to_string(), "first_name".to_string(),
"last_name".to_string(), "last_name".to_string(),
@@ -179,7 +179,7 @@ impl UpdateModel for Sequence {
} }
} }
fn get_searchanble_attributes() -> Vec<String> { fn get_searchable_attributes() -> Vec<String> {
vec!["name".to_string()] vec!["name".to_string()]
} }
@@ -244,7 +244,7 @@ impl UpdateModel for Genre {
} }
} }
fn get_searchanble_attributes() -> Vec<String> { fn get_searchable_attributes() -> Vec<String> {
vec!["description".to_string()] vec!["description".to_string()]
} }

2
src/updater.rs
View File

@@ -68,7 +68,7 @@ where
}; };
} }
if let Err(err) = index.set_searchable_attributes(T::get_searchanble_attributes()).await { if let Err(err) = index.set_searchable_attributes(T::get_searchable_attributes()).await {
return Err(Box::new(err)); return Err(Box::new(err));
}; };