cadey/xesite
cadey
/
xesite
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

use less ram 

Signed-off-by: Christine Dodrill <me@christine.website>
This commit is contained in:
Cadey Ratio 2021-09-29 08:36:49 -04:00
parent 4e0d107228
commit ec3ca6841c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/post/mod.rs
View File

@ -2,7 +2,7 @@ use chrono::prelude::*;
use color_eyre::eyre::{eyre, Result, WrapErr}; use color_eyre::eyre::{eyre, Result, WrapErr};
use glob::glob; use glob::glob;
use serde::Serialize; use serde::Serialize;
use std::{cmp::Ordering, path::PathBuf}; use std::{borrow::Borrow, cmp::Ordering, path::PathBuf};
use tokio::fs; use tokio::fs;
pub mod frontmatter; pub mod frontmatter;
@ -81,7 +81,7 @@ impl Post {
} }
} }
async fn read_post(dir: &str, fname: PathBuf) -> Result<Post> { async fn read_post(dir: &str, fname: PathBuf, cli: &Option<mi::Client>) -> Result<Post> {
let body = fs::read_to_string(fname.clone()) let body = fs::read_to_string(fname.clone())
.await .await
.wrap_err_with(|| format!("can't read {:?}", fname))?; .wrap_err_with(|| format!("can't read {:?}", fname))?;
@ -98,8 +98,8 @@ async fn read_post(dir: &str, fname: PathBuf) -> Result<Post> {
.with_timezone(&Utc) .with_timezone(&Utc)
.into(); .into();
let mentions: Vec<mi::WebMention> = match std::env::var("MI_TOKEN") { let mentions: Vec<mi::WebMention> = match cli {
Ok(token) => mi::Client::new(token.to_string(), crate::APPLICATION_NAME.to_string())? Some(cli) => cli
.mentioners(format!("https://christine.website/{}", link)) .mentioners(format!("https://christine.website/{}", link))
.await .await
.map_err(|why| tracing::error!("error: can't load mentions for {}: {}", link, why)) .map_err(|why| tracing::error!("error: can't load mentions for {}: {}", link, why))
@ -109,7 +109,7 @@ async fn read_post(dir: &str, fname: PathBuf) -> Result<Post> {
wm.title.as_ref().unwrap_or(&"".to_string()) != &"Bridgy Response".to_string() wm.title.as_ref().unwrap_or(&"".to_string()) != &"Bridgy Response".to_string()
}) })
.collect(), .collect(),
Err(_) => vec![], None => vec![],
}; };
let time_taken = estimated_read_time::text( let time_taken = estimated_read_time::text(
@ -140,9 +140,14 @@ async fn read_post(dir: &str, fname: PathBuf) -> Result<Post> {
} }
pub async fn load(dir: &str) -> Result<Vec<Post>> { pub async fn load(dir: &str) -> Result<Vec<Post>> {
let cli = match std::env::var("MI_TOKEN") {
Ok(token) => mi::Client::new(token.to_string(), crate::APPLICATION_NAME.to_string()).ok(),
Err(_) => None,
};
let futs = glob(&format!("{}/*.markdown", dir))? let futs = glob(&format!("{}/*.markdown", dir))?
.filter_map(Result::ok) .filter_map(Result::ok)
.map(|fname| read_post(dir, fname)); .map(|fname| read_post(dir, fname, cli.borrow()));
let mut result: Vec<Post> = futures::future::join_all(futs) let mut result: Vec<Post> = futures::future::join_all(futs)
.await .await