kirbylife
/
codigocomentado
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace lazy_Static with Tokio OnceCell

master
kirbylife 2024-06-18 00:15:36 -06:00
parent ad519d80f7
commit 42b4285ae9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -15,4 +15,4 @@ serde = { version = "1.0", features = ["derive"] }
comrak = "0.24.1" comrak = "0.24.1"
tera = "1.19.1" tera = "1.19.1"
isbot = "0.1.3" isbot = "0.1.3"
lazy_static = "1.4.0" once_cell = "1.19.0"

13
src/main.rs
View File

@ -14,17 +14,20 @@ use comrak::{markdown_to_html, Options};
use controllers::posts; use controllers::posts;
use dotenv::dotenv; use dotenv::dotenv;
use isbot::Bots; use isbot::Bots;
use lazy_static::lazy_static;
use rocket::fs::{FileServer, NamedFile}; use rocket::fs::{FileServer, NamedFile};
use rocket::http::Status; use rocket::http::Status;
use rocket::request::{FromRequest, Outcome, Request}; use rocket::request::{FromRequest, Outcome, Request};
use rocket::response::content::RawXml; use rocket::response::content::RawXml;
use rocket::tokio::sync::OnceCell;
use rocket_dyn_templates::Template; use rocket_dyn_templates::Template;
use std::path::Path; use std::path::Path;
use std::vec::Vec; use std::vec::Vec;
lazy_static! { static BOTS: OnceCell<Bots> = OnceCell::const_new();
static ref ISBOT: Bots = Bots::default();
async fn is_bot(ua: &String) -> bool {
let bots = BOTS.get_or_init(|| async { Bots::default() }).await;
bots.is_bot(ua)
} }
struct Headers { struct Headers {
@ -98,13 +101,13 @@ fn atom_feed() -> RawXml<Template> {
} }
#[get("/post/<title>")] #[get("/post/<title>")]
fn show_post(title: String, headers: Headers) -> Template { async fn show_post(title: &str, headers: Headers) -> Template {
let title_splited: Vec<&str> = title.split('-').collect(); let title_splited: Vec<&str> = title.split('-').collect();
let id = title_splited.last().unwrap().parse().unwrap_or(-1); let id = title_splited.last().unwrap().parse().unwrap_or(-1);
match posts::get_post(id) { match posts::get_post(id) {
Ok(mut post) => { Ok(mut post) => {
if !ISBOT.is_bot(&headers.user_agent) { if !is_bot(&headers.user_agent).await {
posts::add_visit(id); posts::add_visit(id);
} }