Block building after all rendering finished (#201)

Author: Folyd

src/build.rs

@@ -21,12 +21,6 @@ pub async fn watch_build<P: AsRef<Path>>(
     data::load(&source);
 
     let source_path = source.clone();
-    tokio::spawn(async move {
-        tokio::signal::ctrl_c().await.unwrap();
-        // Save zine data only when the process gonna exist
-        data::export(source_path).unwrap();
-        std::process::exit(0);
-    });
 
     let mut engine = ZineEngine::new(source, dest, zine)?;
     // Spawn the build process as a blocking task, avoid starving other tasks.
@@ -39,6 +33,13 @@ pub async fn watch_build<P: AsRef<Path>>(
         }
 
         if watch {
+            tokio::spawn(async move {
+                tokio::signal::ctrl_c().await.unwrap();
+                // Save zine data only when the process gonna exist
+                data::export(source_path).unwrap();
+                std::process::exit(0);
+            });
+
             println!("Watching...");
             let (tx, rx) = mpsc::channel();
             let mut debouncer = new_debouncer(Duration::from_millis(500), None, tx)?;
@@ -80,6 +81,8 @@ pub async fn watch_build<P: AsRef<Path>>(
                     Err(err) => println!("watch error: {:?}", &err),
                 }
             }
+        } else {
+            data::export(source_path).unwrap();
         }
         anyhow::Ok(())
     })

src/code_blocks/mod.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use anyhow::{bail, Result};
-use tokio::{runtime::Handle, task};
 
 mod author;
 mod callout;
@@ -46,48 +45,44 @@ impl<'a> Fenced<'a> {
     /// otherwise return URL preview error HTML string to remind user we have error.
     ///
     /// If the fenced is unsupported, we simply return `None`.
-    pub fn render_code_block(self, block: &'a str) -> Option<String> {
+    #[tokio::main(flavor = "current_thread")]
+    pub async fn render_code_block(self, block: &'a str) -> Option<String> {
         match self.name {
             URL_PREVIEW => {
                 let url = block.trim();
 
-                // Block in place to execute async task
-                task::block_in_place(|| {
-                    Handle::current().block_on(async {
-                        let (first_preview, mut rx) = {
-                            // parking_lot RwLock guard isn't async-aware,
-                            // we should keep this guard drop in this scope.
-                            let data = data::read();
-                            if let Some(info) = data.get_preview(url) {
-                                let html = UrlPreviewBlock::new(self.options, url, info)
-                                    .render()
-                                    .unwrap();
-                                return Some(html);
-                            }
-
-                            data.preview_url(url)
-                        };
-                        rx.changed()
-                            .await
-                            .expect("URL preview watch channel receive failed.");
-                        let event = rx.borrow();
-                        match event.to_owned().expect("Url preview didn't initialized.") {
-                            PreviewEvent::Finished(info) => {
-                                let html = UrlPreviewBlock::new(self.options, url, info)
-                                    .render()
-                                    .unwrap();
-                                if first_preview {
-                                    println!("URL previewed: {url}");
-                                }
-                                Some(html)
-                            }
-                            PreviewEvent::Failed(err) => {
-                                // Return a preview error block.
-                                Some(UrlPreviewError(url, &err).render().unwrap())
-                            }
+                let (first_preview, mut rx) = {
+                    // parking_lot RwLock guard isn't async-aware,
+                    // we should keep this guard drop in this scope.
+                    let data = data::read();
+                    if let Some(info) = data.get_preview(url) {
+                        let html = UrlPreviewBlock::new(self.options, url, info)
+                            .render()
+                            .unwrap();
+                        return Some(html);
+                    }
+
+                    data.preview_url(url)
+                };
+                rx.changed()
+                    .await
+                    .expect("URL preview watch channel receive failed.");
+                let event = rx.borrow();
+                match event.to_owned().expect("Url preview didn't initialized.") {
+                    PreviewEvent::Finished(info) => {
+                        let html = UrlPreviewBlock::new(self.options, url, info)
+                            .render()
+                            .unwrap();
+                        if first_preview {
+                            println!("URL previewed: {url}");
                         }
-                    })
-                })
+                        Some(html)
+                    }
+                    PreviewEvent::Failed(err) => {
+                        // Return a preview error block.
+                        Some(UrlPreviewError(url, &err).render().unwrap())
+                    }
+                }
             }
             CALLOUT => {
                 let html = CalloutBlock::new(self.options, block).render().unwrap();

src/entity/article.rs

@@ -1,6 +1,7 @@
 use std::{borrow::Cow, collections::HashMap, fs, path::Path};
 
 use anyhow::{ensure, Context as _, Result};
+use rayon::prelude::{ParallelBridge, ParallelIterator};
 use serde::{Deserialize, Serialize};
 use tera::Context;
 use time::Date;
@@ -260,9 +261,10 @@ impl Entity for Article {
     fn render(&self, mut context: Context, dest: &Path) -> Result<()> {
         context.insert("i18n", &self.get_translations());
         Article::render(self, context.clone(), dest)?;
-        for article in self.i18n.values() {
-            Article::render(article, context.clone(), dest)?;
-        }
+
+        self.i18n.values().par_bridge().for_each(|article| {
+            Article::render(article, context.clone(), dest).expect("Failed to render article");
+        });
 
         Ok(())
     }

src/entity/issue.rs

@@ -1,7 +1,10 @@
 use std::{borrow::Cow, fs, path::Path};
 
 use anyhow::{Context as _, Result};
-use rayon::slice::ParallelSliceMut;
+use rayon::{
+    prelude::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator},
+    slice::ParallelSliceMut,
+};
 use serde::{Deserialize, Serialize};
 use tera::Context;
 use time::Date;
@@ -158,19 +161,20 @@ impl Entity for Issue {
             .filter(|article| article.need_publish())
             .collect::<Vec<_>>();
         // Render articles with number context.
-        for (index, article) in articles.iter().enumerate() {
-            let mut context = context.clone();
-            context.insert("siblings", &self.sibling_articles(index));
-            context.insert("number", &(index + 1));
-
-            let dest = issue_dir.clone();
-            let article = (*article).clone();
-            tokio::task::spawn_blocking(move || {
+        articles
+            .par_iter()
+            .enumerate()
+            .for_each(|(index, article)| {
+                let mut context = context.clone();
+                context.insert("siblings", &self.sibling_articles(index));
+                context.insert("number", &(index + 1));
+
+                let dest = issue_dir.clone();
+                let article = (*article).clone();
                 article
                     .render(context, &dest)
                     .expect("Render article failed.");
             });
-        }
 
         context.insert("articles", &articles);
         context.insert(

src/entity/mod.rs

@@ -1,5 +1,8 @@
 use anyhow::Result;
-use rayon::iter::{IntoParallelRefMutIterator, ParallelIterator};
+use rayon::{
+    iter::{IntoParallelRefMutIterator, ParallelIterator},
+    prelude::IntoParallelRefIterator,
+};
 use std::path::Path;
 use tera::Context;
 
@@ -66,14 +69,11 @@ impl<T: Entity + Sync + Send + Clone + 'static> Entity for Vec<T> {
     }
 
     fn render(&self, context: Context, dest: &Path) -> Result<()> {
-        for entity in self {
+        self.par_iter().try_for_each(|entity| {
             let entity = entity.clone();
             let context = context.clone();
             let dest = dest.to_path_buf();
-            tokio::task::spawn_blocking(move || {
-                entity.render(context, &dest).expect("Render failed.")
-            });
-        }
-        Ok(())
+            entity.render(context, &dest)
+        })
     }
 }

src/entity/zine.rs

@@ -1,6 +1,7 @@
 use anyhow::{Context as _, Result};
 use rayon::{
     iter::{IntoParallelRefIterator, ParallelBridge, ParallelExtend, ParallelIterator},
+    prelude::IntoParallelRefMutIterator,
     slice::ParallelSliceMut,
 };
 use serde::{Deserialize, Serialize};
@@ -311,7 +312,7 @@ impl Entity for Zine {
     fn parse(&mut self, source: &Path) -> Result<()> {
         self.theme.parse(source)?;
 
-        self.topics.iter_mut().try_for_each(|(id, topic)| {
+        self.topics.par_iter_mut().try_for_each(|(id, topic)| {
             topic.id = id.clone();
             topic.parse(source)
         })?;
@@ -334,7 +335,7 @@ impl Entity for Zine {
         if self.authors.is_empty() {
             println!("Warning: no author specified in [authors] of root `zine.toml`.");
         } else {
-            self.authors.iter_mut().try_for_each(|(id, author)| {
+            self.authors.par_iter_mut().try_for_each(|(id, author)| {
                 author.id = id.clone();
                 // Fallback to default zine avatar if neccessary.
                 if author.avatar.is_none()
@@ -439,13 +440,13 @@ impl Entity for Zine {
         // Render home page.
         let issues = self
             .issues
-            .iter()
+            .par_iter()
             .filter(|issue| issue.need_publish())
             .collect::<Vec<_>>();
         context.insert("issues", &issues);
         // `article_map` is the issue number and issue's featured articles map.
         let article_map = issues
-            .iter()
+            .par_iter()
             .map(|issue| (issue.number, issue.featured_articles()))
             .collect::<HashMap<u32, Vec<_>>>();
         context.insert("article_map", &article_map);