From 0a16667b7662ce9386d381c27cd924d2cbe77905 Mon Sep 17 00:00:00 2001 From: Myrddin Dundragon Date: Fri, 29 Aug 2025 18:11:17 -0400 Subject: [PATCH] [#2] Adjusted the database to use SQLX for async. It was determined that Async database access would be prefereable incase we decide to use a network database instead of sqlite. Tests and examples need to be checked, but they were made to build. --- Cargo.lock | 1573 ++++++++++++++++++++++++++++++++- Cargo.toml | 7 +- examples/generate_database.rs | 96 +- src/converter.rs | 28 +- src/database.rs | 526 ++++++----- src/lib.rs | 2 +- src/tale.rs | 3 +- tests/serde.rs | 31 +- 8 files changed, 1946 insertions(+), 320 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d875a9d..4c2e6ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,27 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "addr2line" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" + +[[package]] +name = "allocator-api2" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -17,17 +38,65 @@ dependencies = [ "libc", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "autocfg" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +[[package]] +name = "backtrace" +version = "0.3.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002" +dependencies = [ + "addr2line", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", + "windows-targets 0.52.6", +] + +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64ct" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba" + [[package]] name = "bitflags" version = "2.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d" +dependencies = [ + "serde", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] [[package]] name = "bumpalo" @@ -35,6 +104,18 @@ version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + [[package]] name = "cc" version = "1.2.34" @@ -65,12 +146,125 @@ dependencies = [ "windows-link", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "core-foundation-sys" version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + +[[package]] +name = "crc" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675" +dependencies = [ + "crc-catalog", +] + +[[package]] +name = "crc-catalog" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crossbeam-queue" +version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "der" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "const-oid", + "crypto-common", + "subtle", +] + +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + +[[package]] +name = "either" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +dependencies = [ + "serde", +] + [[package]] name = "equivalent" version = "1.0.2" @@ -78,16 +272,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] -name = "fallible-iterator" -version = "0.3.0" +name = "etcetera" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] [[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" +name = "event-listener" +version = "5.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "flume" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] [[package]] name = "foldhash" @@ -95,6 +310,97 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "form_urlencoded" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-executor" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + [[package]] name = "getopts" version = "0.2.23" @@ -104,12 +410,31 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "getrandom" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" + [[package]] name = "hashbrown" version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ + "allocator-api2", + "equivalent", "foldhash", ] @@ -122,6 +447,45 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hkdf" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "iana-time-zone" version = "0.1.63" @@ -146,6 +510,113 @@ dependencies = [ "cc", ] +[[package]] +name = "icu_collections" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47" +dependencies = [ + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3" + +[[package]] +name = "icu_properties" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "potential_utf", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632" + +[[package]] +name = "icu_provider" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af" +dependencies = [ + "displaydoc", + "icu_locale_core", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", +] + [[package]] name = "indexmap" version = "2.10.0" @@ -156,6 +627,23 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "io-uring" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" +dependencies = [ + "bitflags", + "cfg-if", + "libc", +] + +[[package]] +name = "itoa" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + [[package]] name = "js-sys" version = "0.3.77" @@ -166,6 +654,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "lazy_static" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +dependencies = [ + "spin", +] + [[package]] name = "libc" version = "0.2.175" @@ -173,27 +670,128 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] -name = "libsqlite3-sys" -version = "0.35.0" +name = "libm" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133c182a6a2c87864fe97778797e46c7e999672690dc9fa3ee8e241aa4a9c13f" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" + +[[package]] +name = "libredox" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3" dependencies = [ + "bitflags", + "libc", + "redox_syscall", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "cc", "pkg-config", "vcpkg", ] +[[package]] +name = "litemap" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956" + +[[package]] +name = "lock_api" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if", + "digest", +] + [[package]] name = "memchr" version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +[[package]] +name = "miniz_oxide" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", +] + +[[package]] +name = "mio" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" +dependencies = [ + "libc", + "wasi", + "windows-sys 0.59.0", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -201,6 +799,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", + "libm", +] + +[[package]] +name = "object" +version = "0.36.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" +dependencies = [ + "memchr", ] [[package]] @@ -209,12 +817,107 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + +[[package]] +name = "parking_lot" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.6", +] + +[[package]] +name = "pem-rfc7468" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" + +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +[[package]] +name = "potential_utf" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585" +dependencies = [ + "zerovec", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "proc-macro2" version = "1.0.101" @@ -253,25 +956,88 @@ dependencies = [ ] [[package]] -name = "rusqlite" -version = "0.37.0" +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" dependencies = [ "bitflags", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", ] +[[package]] +name = "rsa" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b" +dependencies = [ + "const-oid", + "digest", + "num-bigint-dig", + "num-integer", + "num-traits", + "pkcs1", + "pkcs8", + "rand_core", + "signature", + "spki", + "subtle", + "zeroize", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" + [[package]] name = "rustversion" version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + [[package]] name = "serde" version = "1.0.219" @@ -292,6 +1058,18 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_json" +version = "1.0.143" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + [[package]] name = "serde_spanned" version = "1.0.0" @@ -301,17 +1079,323 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "shlex" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook-registry" +version = "1.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" +dependencies = [ + "libc", +] + +[[package]] +name = "signature" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" +dependencies = [ + "digest", + "rand_core", +] + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + [[package]] name = "smallvec" version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +dependencies = [ + "serde", +] + +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "spki" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" +dependencies = [ + "base64ct", + "der", +] + +[[package]] +name = "sqlx" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" +dependencies = [ + "base64", + "bytes", + "chrono", + "crc", + "crossbeam-queue", + "either", + "event-listener", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashbrown", + "hashlink", + "indexmap", + "log", + "memchr", + "once_cell", + "percent-encoding", + "serde", + "serde_json", + "sha2", + "smallvec", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "url", +] + +[[package]] +name = "sqlx-macros" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" +dependencies = [ + "dotenvy", + "either", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" +dependencies = [ + "atoi", + "base64", + "bitflags", + "byteorder", + "bytes", + "chrono", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" +dependencies = [ + "atoi", + "base64", + "bitflags", + "byteorder", + "chrono", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa", + "log", + "md-5", + "memchr", + "once_cell", + "rand", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" +dependencies = [ + "atoi", + "chrono", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "serde_urlencoded", + "sqlx-core", + "thiserror", + "tracing", + "url", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "stringprep" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" +dependencies = [ + "unicode-bidi", + "unicode-normalization", + "unicode-properties", +] + +[[package]] +name = "subtle" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" @@ -324,17 +1408,116 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tavern" version = "0.1.0" dependencies = [ "chrono", "pulldown-cmark", - "rusqlite", "serde", + "sqlx", + "tokio", "toml", ] +[[package]] +name = "thiserror" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinystr" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.47.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +dependencies = [ + "backtrace", + "bytes", + "io-uring", + "libc", + "mio", + "parking_lot", + "pin-project-lite", + "signal-hook-registry", + "slab", + "socket2", + "tokio-macros", + "windows-sys 0.59.0", +] + +[[package]] +name = "tokio-macros" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-stream" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.9.5" @@ -374,30 +1557,125 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64" +[[package]] +name = "tracing" +version = "0.1.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" +dependencies = [ + "log", + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tracing-core" +version = "0.1.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" + [[package]] name = "unicase" version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" +[[package]] +name = "unicode-bidi" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" + [[package]] name = "unicode-ident" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +[[package]] +name = "unicode-normalization" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-properties" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" + [[package]] name = "unicode-width" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c" +[[package]] +name = "url" +version = "2.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "vcpkg" version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + +[[package]] +name = "wasite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" + [[package]] name = "wasm-bindgen" version = "0.2.100" @@ -456,6 +1734,16 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "whoami" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" +dependencies = [ + "libredox", + "wasite", +] + [[package]] name = "windows-core" version = "0.61.2" @@ -515,8 +1803,257 @@ dependencies = [ "windows-link", ] +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +dependencies = [ + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + [[package]] name = "winnow" version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95" + +[[package]] +name = "writeable" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb" + +[[package]] +name = "yoke" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerofrom" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" + +[[package]] +name = "zerotrie" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/Cargo.toml b/Cargo.toml index ecf8a50..9da56dd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,9 +13,14 @@ license = "Apache-2.0" [dependencies] chrono = { version = "0.4.41", features = ["serde"] } pulldown-cmark = "0.13.0" -rusqlite = "0.37.0" serde = { version = "1.0.219", features = ["derive"] } +sqlx = { version = "0.8.6", features = ["sqlite", "chrono", "runtime-tokio"] } toml = "0.9.5" +[dev-dependencies] +tokio = { version = "1", features = ["full"] } + + + [features] publisher = [] diff --git a/examples/generate_database.rs b/examples/generate_database.rs index 2ad600a..38d5cfd 100644 --- a/examples/generate_database.rs +++ b/examples/generate_database.rs @@ -1,11 +1,11 @@ use std::path::{Path, PathBuf}; -use chrono::{NaiveDate, NaiveDateTime}; - -use tavern::{Adventurer, Database, Tale, Tavern}; +use chrono::NaiveDate; +use tavern::{Adventurer, Database, FrontMatter, Tale, Tavern}; +#[cfg(feature = "publisher")] fn generate_tavern() -> Tavern { let author: Adventurer = @@ -17,14 +17,21 @@ fn generate_tavern() -> Tavern String::from("https://cybermages.tech/about/myrddin/pic"), blurb: String::from("I love code!") }; - let tale: Tale = - Tale { title: String::from("Test post"), - slug: String::from("test_post"), - author: author.handle.clone(), - summary: String::from("The Moon is made of cheese!"), - tags: vec![String::from("Space"), String::from("Cheese")], - publish_date: NaiveDate::from_ymd_opt(2025, 12, 25).unwrap().and_hms_opt(13, 10, 41).unwrap(), - content: PathBuf::from("posts/test_post.md") }; + let fm: FrontMatter = + FrontMatter { title: String::from("Test post"), + slug: String::from("test_post"), + author: author.handle.clone(), + summary: String::from("The Moon is made of cheese!"), + tags: vec![String::from("Space"), + String::from("Cheese")], + publish_date: + NaiveDate::from_ymd_opt(2025, 12, 25).unwrap() + .and_hms_opt(13, + 10, 41) + .unwrap() }; + + let tale: Tale = Tale { front_matter: fm, + content: PathBuf::from("posts/test_post.md") }; // Create a dummy posts directory and file for this example to work @@ -33,16 +40,21 @@ fn generate_tavern() -> Tavern std::fs::create_dir("posts").unwrap(); } std::fs::write("posts/the-rustacean.md", - "# Hello, Rust!\n\nThis is a **test** post.").unwrap(); + "# Hello, Rust!\n\nThis is a **test** post.").unwrap(); Tavern { title: String::from("Runes & Ramblings"), - description: String::from("Join software engineer Jason Smith on his Rust programming journey. Explore program design, tech stacks, and more on this blog from CybeMages, LLC."), + description: String::from("Join software engineer Jason Smith \ + on his Rust programming journey. \ + Explore program design, tech \ + stacks, and more on this blog from \ + CybeMages, LLC."), tales: vec![tale], authors: vec![author] } } +#[cfg(feature = "publisher")] fn read_from_file

(config_file: P) -> Tavern where P: AsRef { @@ -55,37 +67,40 @@ fn read_from_file

(config_file: P) -> Tavern } -fn create_database() -> Result<(), Box> +#[cfg(feature = "publisher")] +async fn create_database() -> Result<(), Box> { // This part would be the entry point of your CI/CD script // It would load your data and then save it to the database // Create a Tavern object - let tavern = read_from_file("Tavern.toml"); - //let tavern = generate_tavern(); + let _tavern = read_from_file("Tavern.toml"); + // let tavern = generate_tavern(); // Open the database and save the Tavern content - let db = Database::open(Path::new("tavern.db"))?; - - db.insert_tavern(&tavern.title, &tavern.description)?; - println!("Saved site settings: Title='{}', Description='{}'", tavern.title, tavern.description); - - for author in &tavern.authors - { - db.insert_adventurer(author)?; - println!("Saved adventurer: {}", author.name); - } - - for tale in &tavern.tales - { - db.insert_tale(tale)?; - println!("Saved tale: {}", tale.title); - } + let _db = Database::open("/home/myrddin/cybermages/blog/tavern.db").await?; + //db.insert_tavern(&tavern.title, &tavern.description)?; + //println!("Saved site settings: Title='{}', Description='{}'", + //tavern.title, tavern.description); + + //for author in &tavern.authors + // { + // db.insert_adventurer(author)?; + // println!("Saved adventurer: {}", author.name); + // } + // + // for tale in &tavern.tales + // { + // db.insert_tale(tale)?; + // println!("Saved tale: {}", tale.title); + // } Ok(()) } -pub fn main() +#[cfg(feature = "publisher")] +#[tokio::main] +pub async fn main() { match std::env::set_current_dir("/home/myrddin/cybermages/blog/") { @@ -99,9 +114,18 @@ pub fn main() } } - match create_database() + match create_database().await { - Ok(_) => {} - Err(e) => { eprintln!("Error: {}", e); } + Ok(_) => + {} + Err(e) => + { + eprintln!("Error: {}", e); + } } } + +#[cfg(not(feature = "publisher"))] +pub fn main() +{ +} diff --git a/src/converter.rs b/src/converter.rs index dc7ed2c..98eac5d 100644 --- a/src/converter.rs +++ b/src/converter.rs @@ -25,42 +25,20 @@ impl Converter #[cfg(test)] mod tests { - use std::fs; - use std::io::Write; - use std::path::Path; - - use super::*; // Import the parent module's items + use super::*; #[test] - fn test_markdown_conversion_with_files() + fn test_markdown_conversion() { - let test_dir = Path::new("temp_test_dir"); - let temp_md_path = test_dir.join("test.md"); - let temp_html_path = test_dir.join("test.html"); - - // Ensure the test directory is clean - if test_dir.exists() - { - fs::remove_dir_all(&test_dir).unwrap(); - } - fs::create_dir(&test_dir).unwrap(); - // Create a temporary Markdown file for the test let markdown_content = "# Hello, World!\n\nThis is a **test**."; let expected_html = "

Hello, World!

\n

This is a test.

\n"; - let mut temp_md_file = fs::File::create(&temp_md_path).unwrap(); - temp_md_file.write_all(markdown_content.as_bytes()).unwrap(); - // Use the new Converter API - Converter::md_to_html(&temp_md_path, &temp_html_path).unwrap(); - let converted_html = fs::read_to_string(&temp_html_path).unwrap(); + let converted_html = Converter::markdown_to_html(&markdown_content); // Assert that the output matches the expected HTML assert_eq!(converted_html.trim(), expected_html.trim()); - - // Clean up the temporary directory after the test - fs::remove_dir_all(&test_dir).unwrap(); } } diff --git a/src/database.rs b/src/database.rs index cb1f046..8cd0fcd 100644 --- a/src/database.rs +++ b/src/database.rs @@ -1,309 +1,379 @@ -// The connection strings are: -// PostgreSQL - "postgres://root:root@localhost:5432" -// SQLite - "sqlite::memory:" -// const DATABASE_URL: &str = "sqlite::memory:"; -// const DB_NAME: &str = "cm_tavern_db"; use std::path::Path; +use std::str::FromStr; + +use sqlx::sqlite::{SqliteConnectOptions, SqlitePool, SqlitePoolOptions}; +use sqlx::{Error, Result}; -use rusqlite::{params, Connection, Result}; #[cfg(not(feature = "publisher"))] -use rusqlite::Statement; +use sqlx::Row; use crate::adventurer::Adventurer; -#[cfg(feature = "publisher")] -use crate::converter::Converter; -#[cfg(not(feature = "publisher"))] -use crate::tale::FrontMatter; use crate::tale::Tale; +#[cfg(feature = "publisher")] +use crate::converter::Converter; + +#[cfg(not(feature = "publisher"))] +use crate::tale::FrontMatter; + +/// Represents the database connection pool. pub struct Database { - connection: Connection + pool: SqlitePool } impl Database { - /// Opens a connection to the SQLite database and creates the necessary + /// Opens a connection to the SQLite database pool and creates the necessary /// tables. - pub fn open(db_path: &Path) -> Result + /// + /// db_path is an absolute path to the resource file. + /// Example: + /// ```text + /// open("/var/website/tavern.db"); + /// ``` + pub async fn open

(db_path: P) -> Result + where P: AsRef { - let connection = Connection::open(db_path)?; + let db_str = + db_path.as_ref().to_str().ok_or_else(|| { + Error::Configuration("Invalid UTF-8 in database \ + path" + .into()) + })?; + + let url: String = format!("sqlite:///{db_str}"); + + // Set up connection options with foreign keys enabled. + #[cfg(feature = "publisher")] + let connect_options = + SqliteConnectOptions::from_str(&url)?.read_only(false) + .foreign_keys(true) + .create_if_missing(true); + + #[cfg(not(feature = "publisher"))] + let connect_options = + SqliteConnectOptions::from_str(&url)?.read_only(true) + .foreign_keys(true) + .create_if_missing(false); + + let pool = SqlitePoolOptions::new().connect_with(connect_options) + .await?; + + let database = Database { pool }; #[cfg(feature = "publisher")] - Self::create_tables(&connection)?; + database.create_tables().await?; - Ok(Database { connection }) + Ok(database) } - /// Creates the 'tales' and 'adventurers' tables if they don't exist. + /// Creates the 'tales', 'adventurers', 'tags', 'tale_tags', and 'tavern' + /// tables if they don't exist. #[cfg(feature = "publisher")] - fn create_tables(conn: &Connection) -> Result<()> + async fn create_tables(&self) -> Result<()> { - conn.execute( + sqlx::query!( "CREATE TABLE IF NOT EXISTS adventurers ( handle TEXT PRIMARY KEY, name TEXT NOT NULL, - profile TEXT, - image TEXT, - blurb TEXT - )", - [] - )?; - conn.execute( + profile TEXT NOT NULL, + image TEXT NOT NULL, + blurb TEXT NOT NULL + )" + ).execute(&self.pool) + .await?; + + sqlx::query!( "CREATE TABLE IF NOT EXISTS tales ( slug TEXT PRIMARY KEY, title TEXT NOT NULL, author TEXT NOT NULL, - summary TEXT, + summary TEXT NOT NULL, publish_date TEXT NOT NULL, - content TEXT - )", - [] - )?; - conn.execute( + content TEXT NOT NULL + )" + ).execute(&self.pool) + .await?; + + sqlx::query!( "CREATE TABLE IF NOT EXISTS tags ( id INTEGER PRIMARY KEY, name TEXT NOT NULL UNIQUE - )", - [] - )?; - conn.execute( + )" + ).execute(&self.pool) + .await?; + + sqlx::query!( "CREATE TABLE IF NOT EXISTS tale_tags ( tale_slug TEXT, tag_id INTEGER, FOREIGN KEY(tale_slug) REFERENCES tales(slug), FOREIGN KEY(tag_id) REFERENCES tags(id), UNIQUE(tale_slug, tag_id) - )", - [] - )?; - conn.execute( - "CREATE TABLE IF NOT EXISTS tavern ( + )" + ).execute(&self.pool) + .await?; + + sqlx::query!( + "CREATE TABLE IF NOT EXISTS tavern ( key TEXT PRIMARY KEY, value TEXT NOT NULL - )", - [], - )?; + )" + ).execute(&self.pool) + .await?; + Ok(()) } /// Inserts a single tale into the database. #[cfg(feature = "publisher")] - pub fn insert_tale(&self, tale: &Tale) -> Result<()> + pub async fn insert_tale(&self, tale: &Tale) + -> Result<(), Box> { - // Read the markdown content from the file - let markdown_content = std::fs::read_to_string(&tale.content) - .map_err(|e| rusqlite::Error::ToSqlConversionFailure(e.into()))?; + // Convert the tales content from Markdown to HTML. + let markdown_content = std::fs::read_to_string(&tale.content)?; + let html_content: String = Converter::markdown_to_html(&markdown_content); - // Convert the markdown to HTML - let html_content = Converter::markdown_to_html(&markdown_content); + // Start a transaction. + let mut tx = self.pool.begin().await?; - self.connection.execute( - "INSERT OR REPLACE INTO tales ( - slug, title, author, summary, publish_date, content - ) VALUES (?1, ?2, ?3, ?4, ?5, ?6)", - params![ - tale.front_matter.slug, - tale.front_matter.title, - tale.front_matter.author, - tale.front_matter.summary, - tale.front_matter.publish_date.to_string(), - html_content - ] - )?; + // Store the tale. + sqlx::query!( + "INSERT OR REPLACE INTO tales ( + slug, title, author, summary, publish_date, content + ) VALUES (?1, ?2, ?3, ?4, ?5, ?6)", + tale.front_matter.slug, + tale.front_matter.title, + tale.front_matter.author, + tale.front_matter.summary, + tale.front_matter.publish_date, + html_content + ).execute(&mut *tx) // Pass mutable reference to the transaction + .await?; - // Insert tags and link them to the tale + // Store the tags. + // For each tag ... for tag_name in &tale.front_matter.tags { - let tag_id = self.insert_and_get_tag_id(tag_name)?; - self.connection.execute("INSERT OR IGNORE INTO tale_tags \ - (tale_slug, tag_id) VALUES (?1, ?2)", - params![tale.front_matter.slug, tag_id])?; + // Insert a new tag, ignore if it already exists. + sqlx::query!("INSERT OR IGNORE INTO tags (name) VALUES (?1)", + tag_name).execute(&mut *tx) // Pass mutable reference to the transaction + .await?; + + // Get the tag_id for the newly inserted or existing tag. + let id: i64 = sqlx::query!("SELECT id FROM tags WHERE name = ?1", + tag_name).fetch_one(&mut *tx) // Pass mutable reference to the transaction + .await? + .id + .unwrap_or(0); // Use unwrap_or to handle the Option + + // Insert the tale_tag relationship. + sqlx::query!( + "INSERT OR IGNORE INTO tale_tags (tale_slug, tag_id) + VALUES (?1, ?2)", + tale.front_matter.slug, + id + ).execute(&mut *tx) // Pass mutable reference to the transaction + .await?; } + // Commit the transaction. + tx.commit().await?; + Ok(()) } - /// Inserts a tag and returns its ID. If the tag already exists, it returns - /// the existing ID. - #[cfg(feature = "publisher")] - fn insert_and_get_tag_id(&self, tag_name: &str) -> Result - { - self.connection - .execute("INSERT OR IGNORE INTO tags (name) VALUES (?1)", - params![tag_name])?; - let id: i64 = self.connection - .query_row("SELECT id FROM tags WHERE name = ?1", - params![tag_name], - |row| row.get(0))?; - Ok(id) - } - /// Inserts a single adventurer into the database. #[cfg(feature = "publisher")] - pub fn insert_adventurer(&self, adventurer: &Adventurer) -> Result<()> + pub async fn insert_adventurer(&self, adventurer: &Adventurer) + -> Result<()> { - self.connection.execute( - "INSERT OR REPLACE INTO adventurers ( - handle, name, profile, image, blurb - ) VALUES (?1, ?2, ?3, ?4, ?5)", - params![ - adventurer.handle, - adventurer.name, - adventurer.profile, - adventurer.image, - adventurer.blurb - ] - )?; + // Start a transaction. + let mut tx = self.pool.begin().await?; + + sqlx::query!( + "INSERT OR REPLACE INTO adventurers ( + handle, name, profile, image, blurb + ) VALUES (?1, ?2, ?3, ?4, ?5)", + adventurer.handle, + adventurer.name, + adventurer.profile, + adventurer.image, + adventurer.blurb + ).execute(&mut *tx) + .await?; + + // Commit the transaction. + tx.commit().await?; + Ok(()) } /// Inserts the site-wide settings like title and description. #[cfg(feature = "publisher")] - pub fn insert_tavern(&self, title: &str, description: &str) -> Result<()> { - self.connection.execute_batch(&format!( - "BEGIN; - INSERT OR REPLACE INTO tavern (key, value) VALUES ('title', '{}'); - INSERT OR REPLACE INTO tavern (key, value) VALUES ('description', '{}'); - COMMIT;", - title, description - ))?; - Ok(()) - } + pub async fn insert_tavern(&self, title: &str, description: &str) + -> Result<()> + { + // Start a transaction. + let mut tx = self.pool.begin().await?; - /// Fetches a vector of lightweight FrontMatter objects from the database. - #[cfg(not(feature = "publisher"))] - pub fn get_tales_summary(&self, categories: &[String]) -> Result> { - let mut query = String::from( - "SELECT - t.title, - t.slug, - t.summary, - t.author, - t.publish_date, - GROUP_CONCAT(tg.name, ',') AS tags - FROM tales AS t - JOIN tale_tags AS tt ON t.slug = tt.tale_slug - JOIN tags AS tg ON tt.tag_id = tg.id" - ); - - // If categories are provided, filter the results - if !categories.is_empty() { - query.push_str(" WHERE tg.name IN ("); - // Add a placeholder for each category - let placeholders: Vec<_> = (0..categories.len()).map(|_| "?").collect(); - query.push_str(&placeholders.join(", ")); - query.push_str(")"); - } + // Insert or replace the title. + sqlx::query!("INSERT OR REPLACE INTO tavern (key, value) VALUES \ + ('title', ?1)", + title).execute(&mut *tx) // Pass mutable reference to the transaction + .await?; - // Group by tale to get all tags for each tale - query.push_str(" GROUP BY t.slug"); - - query.push_str(" ORDER BY t.publish_date DESC"); + // Insert or replace the description. + sqlx::query!("INSERT OR REPLACE INTO tavern (key, value) VALUES \ + ('description', ?1)", + description).execute(&mut *tx) // Pass mutable reference to the transaction + .await?; - let mut stmt: Statement = self.connection.prepare(&query)?; + // Commit the transaction. + tx.commit().await?; - let tales_iter = stmt.query_map(rusqlite::params_from_iter(categories), |row| { - let date_str: String = row.get(4)?; - let tags_str: String = row.get(5)?; - let tags: Vec = tags_str.split(',').map(|s| s.to_string()).collect(); - Ok(FrontMatter { - title: row.get(0)?, - slug: row.get(1)?, - summary: row.get(2)?, - author: row.get(3)?, - publish_date: chrono::NaiveDateTime::parse_from_str(&date_str, "%Y-%m-%dT%H:%M:%S").map_err(|e| rusqlite::Error::ToSqlConversionFailure(e.into()))?, - tags, - }) - })?; + Ok(()) + } - let summaries: Result, _> = tales_iter.collect(); - summaries - } + #[cfg(not(feature = "publisher"))] + pub async fn get_tales_summary(&self, categories: &[String]) + -> Result> + { + let mut tales = Vec::new(); - /// Fetches a single tale from the database by its slug. - /// This function is only available in the 'reader' build. - #[cfg(not(feature = "publisher"))] - pub fn get_tale_by_slug(&self, slug: &str) -> Result> { - let query = String::from( - "SELECT - t.title, - t.slug, - t.summary, - t.author, - t.publish_date, - t.content, - GROUP_CONCAT(tg.name, ',') AS tags - FROM tales AS t - LEFT JOIN tale_tags AS tt ON t.slug = tt.tale_slug - LEFT JOIN tags AS tg ON tt.tag_id = tg.id - WHERE t.slug = ?1 - GROUP BY t.slug" - ); + // Start a read-only transaction. + let mut tx = self.pool.begin().await?; - // Prepare the statement and execute a query for a single row. - let result = self.connection.query_row( - &query, - params![slug], - |row| { - // Parse the tags string into a vector of strings. - let tags_str: Option = row.get(6)?; - let tags = tags_str.map(|s| s.split(',').map(|tag| tag.to_string()).collect()).unwrap_or_default(); + // Dynamically build the query. + let mut query = String::from( + "SELECT + t.title, + t.slug, + t.summary, + t.author, + t.publish_date, + GROUP_CONCAT(tg.name, ',') AS tags + FROM tales AS t + LEFT JOIN tale_tags AS tt ON t.slug = tt.tale_slug + LEFT JOIN tags AS tg ON tt.tag_id = tg.id" + ); - // Parse the date string into a NaiveDateTime. - let date_str: String = row.get(4)?; - let publish_date = chrono::NaiveDateTime::parse_from_str(&date_str, "%Y-%m-%dT%H:%M:%S") - .map_err(|e| rusqlite::Error::ToSqlConversionFailure(e.into()))?; + if !categories.is_empty() + { + query.push_str(" WHERE tg.name IN ("); + let placeholders: Vec<_> = + (0..categories.len()).map(|_| "?").collect(); + query.push_str(&placeholders.join(", ")); + query.push(')'); + } - // Construct the FrontMatter and the full Tale struct. - Ok(Tale { - front_matter: FrontMatter { - title: row.get(0)?, - slug: row.get(1)?, - summary: row.get(2)?, - author: row.get(3)?, - publish_date, - tags, - }, - content: row.get(5)?, - }) - } - ); + query.push_str(" GROUP BY t.slug ORDER BY t.publish_date DESC"); - // Handle the result: if no rows were returned, return `None`. - match result { - Ok(tale) => Ok(Some(tale)), - Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None), - Err(e) => Err(e), - } - } + let mut q = sqlx::query(&query); + for cat in categories + { + q = q.bind(cat); + } -/// Fetches a single adventurer from the database by their handle. - /// This function is only available in the 'reader' build. - #[cfg(not(feature = "publisher"))] - pub fn get_adventurer(&self, handle: &str) -> Result> { - let result = self.connection.query_row( - "SELECT handle, name, profile, image, blurb FROM adventurers WHERE handle = ?1", - params![handle], - |row| { - Ok(Adventurer { - handle: row.get(0)?, - name: row.get(1)?, - profile: row.get(2)?, - image: row.get(3)?, - blurb: row.get(4)?, - }) - } - ); - - match result { - Ok(adventurer) => Ok(Some(adventurer)), - Err(rusqlite::Error::QueryReturnedNoRows) => Ok(None), - Err(e) => Err(e), - } - } + let rows = q.fetch_all(&mut *tx).await?; + + for row in rows + { + let tags_str: Option = row.try_get("tags")?; + let tags = tags_str.map(|s| s.split(',').map(String::from).collect()) + .unwrap_or_default(); + + let date_str: String = row.try_get("publish_date")?; + let publish_date = chrono::NaiveDateTime::parse_from_str(&date_str, "%Y-%m-%dT%H:%M:%S") + .map_err(|e| sqlx::Error::Decode(e.into()))?; + + tales.push(FrontMatter { title: row.try_get("title")?, + slug: row.try_get("slug")?, + summary: row.try_get("summary")?, + author: row.try_get("author")?, + publish_date, + tags }); + } + + tx.commit().await?; // Explicit commit, even for read transactions. + + Ok(tales) + } + + #[cfg(not(feature = "publisher"))] + pub async fn get_tale_by_slug(&self, slug: &str) -> Result> + { + let mut tx = self.pool.begin().await?; + + let tale_row = sqlx::query( + "SELECT + t.title, t.slug, t.summary, t.author, t.publish_date, + t.content, + GROUP_CONCAT(tg.name, ',') AS tags + FROM tales AS t + LEFT JOIN tale_tags AS tt ON t.slug = tt.tale_slug + LEFT JOIN tags AS tg ON tt.tag_id = tg.id + WHERE t.slug = ?1 + GROUP BY t.slug" + ).bind(slug) + .fetch_optional(&mut *tx) // Use transaction here + .await?; + + tx.commit().await?; + + if let Some(row) = tale_row + { + let tags_str: Option = row.try_get("tags")?; + let tags = tags_str.map(|s| s.split(',').map(String::from).collect()) + .unwrap_or_default(); + + let date_str: String = row.try_get("publish_date")?; + let publish_date = chrono::NaiveDateTime::parse_from_str(&date_str, "%Y-%m-%dT%H:%M:%S") + .map_err(|e| Error::Decode(e.into()))?; + + let front_matter = FrontMatter { title: row.try_get("title")?, + slug: row.try_get("slug")?, + summary: row.try_get("summary")?, + author: row.try_get("author")?, + publish_date, + tags }; + + Ok(Some(Tale { front_matter, + content: row.try_get("content")? })) + } + else + { + Ok(None) + } + } + + #[cfg(not(feature = "publisher"))] + pub async fn get_adventurer(&self, handle: &str) + -> Result> + { + let mut tx = self.pool.begin().await?; + + let adventurer = sqlx::query_as!( + Adventurer, + "SELECT + handle AS 'handle!', + name AS 'name!', + profile AS 'profile!', + image AS 'image!', + blurb AS 'blurb!' + FROM adventurers + WHERE handle = ?1", + handle + ).fetch_optional(&mut *tx) // Use transaction here + .await?; + + tx.commit().await?; + + Ok(adventurer) + } } diff --git a/src/lib.rs b/src/lib.rs index f78e40d..73dec19 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -15,5 +15,5 @@ mod tavern; pub use crate::adventurer::Adventurer; pub use crate::database::Database; pub use crate::info::{get_name, get_version}; -pub use crate::tale::Tale; +pub use crate::tale::{FrontMatter, Tale}; pub use crate::tavern::Tavern; diff --git a/src/tale.rs b/src/tale.rs index 13faf76..1080636 100644 --- a/src/tale.rs +++ b/src/tale.rs @@ -1,6 +1,5 @@ -use serde::{Deserialize, Serialize}; - use chrono::NaiveDateTime; +use serde::{Deserialize, Serialize}; diff --git a/tests/serde.rs b/tests/serde.rs index e08006b..8002ccb 100644 --- a/tests/serde.rs +++ b/tests/serde.rs @@ -1,6 +1,7 @@ -use chrono::{NaiveDate, NaiveDateTime}; +#![cfg(feature = "publisher")] -use tavern::{Adventurer, Tale, Tavern}; +use chrono::NaiveDate; +use tavern::{Adventurer, FrontMatter, Tale, Tavern}; @@ -15,17 +16,29 @@ fn generate_tavern() -> Tavern String::from("https://cybermages.tech/about/myrddin/pic"), blurb: String::from("I love code!") }; - let tale: Tale = - Tale { title: String::from("Test post"), + + let fm: FrontMatter = FrontMatter { + title: String::from("Test post"), slug: String::from("test_post"), author: author.handle.clone(), summary: String::from("The Moon is made of cheese!"), tags: vec![String::from("Space"), String::from("Cheese")], - publish_date: NaiveDate::from_ymd_opt(2025, 12, 25).unwrap().and_hms_opt(13, 10, 41).unwrap(), + publish_date: + NaiveDate::from_ymd_opt(2025, 12, 25).unwrap() + .and_hms_opt(13, 10, 41) + .unwrap() + }; + + let tale: Tale = Tale { + front_matter: fm, content: std::path::PathBuf::from("posts/test_post.md") }; Tavern { title: String::from("Runes & Ramblings"), - description: String::from("Join software engineer Jason Smith on his Rust programming journey. Explore program design, tech stacks, and more on this blog from CybeMages, LLC."), + description: String::from("Join software engineer Jason Smith \ + on his Rust programming journey. \ + Explore program design, tech \ + stacks, and more on this blog from \ + CybeMages, LLC."), tales: vec![tale], authors: vec![author] } } @@ -81,9 +94,9 @@ fn from_file() // Assert some known values to make this a real test let tale = &tavern.tales[0]; - assert_eq!(tale.title, "Test post"); - assert_eq!(tale.slug, "test_post"); - assert_eq!(tale.author, "myrddin"); + assert_eq!(tale.front_matter.title, "Test post"); + assert_eq!(tale.front_matter.slug, "test_post"); + assert_eq!(tale.front_matter.author, "myrddin"); cleanup_temp_file(&path); }