image generation is now always wanted

src/filters/markdown.rs

@@ -69,17 +69,18 @@ pub fn parse_markdown(markdown: &str) -> ::askama::Result<String> {
             );
 
             // Place image into the content with scaled reso to a boundary
-            let picture_markup =
+            let picture_markup = generate_picture_markup(
-                generate_picture_markup(&dest_url, max_width, max_height, &title, None, true)
+                &dest_url, max_width, max_height, &title, None,
-                    .unwrap_or(formatdoc!(
+            )
-                        r#"
+            .unwrap_or(formatdoc!(
+                r#"
                         <img
                           alt="{alt}"
                           src="{src}"
                         />"#,
-                        alt = title,
+                alt = title,
-                        src = dest_url,
+                src = dest_url,
-                    ));
+            ));
             Event::Html(
                 formatdoc!(
                     r#"<figure>
@@ -165,8 +166,5 @@ pub fn parse_markdown(markdown: &str) -> ::askama::Result<String> {
     // Write to String buffer
     let mut html = String::new();
     pulldown_cmark::html::push_html(&mut html, parser);
-    // filters::safe(Html, html)
-    // filters::escape(Text, html)
-    // Ok(html)
     Ok(html)
 }

src/picture_generator/image_src_generator.rs

@@ -13,7 +13,6 @@ pub fn generate_image_with_src(
     width: u32,
     height: u32,
     suffix: &str,
-    generate_image: bool,
 ) -> Result<String, anyhow::Error> {
     let path_to_generated = get_generated_file_name(orig_img_path);
     let file_stem = path_to_generated.file_stem().unwrap().to_str().unwrap();
@@ -29,27 +28,26 @@ pub fn generate_image_with_src(
     let path_to_generated_arc = Arc::new(path_to_generated);
     let path_to_generated_clone = Arc::clone(&path_to_generated_arc);
 
-    if generate_image {
+    rayon::spawn(move || {
-        rayon::spawn(move || {
+        let orig_img = ImageReader::open(&disk_img_path)
-            let orig_img = ImageReader::open(&disk_img_path)
+            .with_context(|| format!("Failed to read instrs from {:?}", &disk_img_path))
-                .with_context(|| format!("Failed to read instrs from {:?}", &disk_img_path))
+            .unwrap()
-                .unwrap()
+            .decode()
-                .decode()
+            .unwrap();
-                .unwrap();
+        let path_to_generated = path_to_generated_clone.as_ref();
-            let path_to_generated = path_to_generated_clone.as_ref();
+
+        let result = generate_images(
+            &orig_img,
+            path_to_generated,
+            &resolutions,
+            &[exported_format],
+        )
+        .with_context(|| "Failed to generate images".to_string());
+        if let Err(e) = result {
+            tracing::error!("Error: {}", e);
+        }
+    });
 
-            let result = generate_images(
-                &orig_img,
-                path_to_generated,
-                &resolutions,
-                &[exported_format],
-            )
-            .with_context(|| "Failed to generate images".to_string());
-            if let Err(e) = result {
-                tracing::error!("Error: {}", e);
-            }
-        });
-    }
     let path_to_generated = Arc::clone(&path_to_generated_arc);
 
     let image_path = get_image_path(

src/picture_generator/picture_markup_generator.rs

@@ -20,7 +20,6 @@ pub fn generate_picture_markup(
     height: u32,
     alt_text: &str,
     class_name: Option<&str>,
-    generate_image: bool,
 ) -> Result<String, anyhow::Error> {
     let exported_formats = get_export_formats(orig_img_path);
     let class_attr = if let Some(class) = class_name {
@@ -55,25 +54,22 @@ pub fn generate_picture_markup(
     let exported_formats_arc = Arc::new(exported_formats);
     let exported_formats_clone = Arc::clone(&exported_formats_arc);
 
-    if generate_image {
+    rayon::spawn(move || {
-        rayon::spawn(move || {
+        let orig_img = ImageReader::open(&disk_img_path)
-            let orig_img = ImageReader::open(&disk_img_path)
+            .with_context(|| format!("Failed to read instrs from {:?}", &disk_img_path))
-                .with_context(|| format!("Failed to read instrs from {:?}", &disk_img_path))
+            .unwrap()
-                .unwrap()
+            .decode()
-                .decode()
+            .unwrap();
-                .unwrap();
+        let path_to_generated = path_to_generated_clone.as_ref();
-            let path_to_generated = path_to_generated_clone.as_ref();
+        let resolutions = resolutions_clone.as_ref();
-            let resolutions = resolutions_clone.as_ref();
+        let exported_formats = exported_formats_clone.as_ref();
-            let exported_formats = exported_formats_clone.as_ref();
 
-            let result =
+        let result = generate_images(&orig_img, path_to_generated, resolutions, exported_formats)
-                generate_images(&orig_img, path_to_generated, resolutions, exported_formats)
+            .with_context(|| "Failed to generate images".to_string());
-                    .with_context(|| "Failed to generate images".to_string());
+        if let Err(e) = result {
-            if let Err(e) = result {
+            tracing::error!("Error: {}", e);
-                tracing::error!("Error: {}", e);
+        }
-            }
+    });
-        });
-    }
 
     let exported_formats = Arc::clone(&exported_formats_arc);
     let path_to_generated = Arc::clone(&path_to_generated_arc);
@@ -314,15 +310,8 @@ fn test_generate_picture_markup() {
         </picture>"#,
     };
     assert_eq!(
-        generate_picture_markup(
+        generate_picture_markup(orig_img_path, width, height, "Testing image alt", None,)
-            orig_img_path,
+            .expect("picture markup has to be generated"),
-            width,
-            height,
-            "Testing image alt",
-            None,
-            false
-        )
-        .expect("picture markup has to be generated"),
         result
     );
 }

templates/blog_post.html

@@ -6,7 +6,7 @@
 <meta property="og:url" content="https://michalvanko.dev/{{segment}}/{{slug}}" />
 {% match thumbnail %}
 {% when Some with (img) %}
-{% let src = crate::picture_generator::image_src_generator::generate_image_with_src(img, 1200, 630, "_og", true).unwrap_or("thumbnail not found".to_string())|safe %}
+{% let src = crate::picture_generator::image_src_generator::generate_image_with_src(img, 1200, 630, "_og").unwrap_or("thumbnail not found".to_string())|safe %}
 <meta property="og:image" content="https://michalvanko.dev{{src}}" />
 {% when None %}
 <meta property="og:image" content="https://michalvanko.dev/images/m-logo.svg" />
@@ -28,7 +28,7 @@
 </header>
 
   <section class="article-body">
-    {{body|parse_markdown|escape("none")}}
+    {{body|parse_markdown|safe}}
   </section>
 </article>
 

templates/components/blog_post_preview.html

@@ -2,7 +2,7 @@
 	<aside class="row-span-3 self-center float-start sm:float-none mr-3 mb-3 sm:ml-0 sm:mb-0">
 		{% match post.metadata.thumbnail %}
 		{% when Some with (orig_path) %}
-		{{ crate::picture_generator::picture_markup_generator::generate_picture_markup(orig_path, 180, 240, "Article thumbnail", None, true).unwrap_or("thumbnail not found".to_string())|safe }}
+		{{ crate::picture_generator::picture_markup_generator::generate_picture_markup(orig_path, 180, 240, "Article thumbnail", None).unwrap_or("thumbnail not found".to_string())|safe }}
 		{% when None %}
 		<div> 
 			{% include "components/blog_post_default_thumbnail.html" %}
@@ -14,7 +14,7 @@
 		  <a rel="prefetch" href="/{{segment}}/{{post.slug}}" class="text-blue-950 visited:text-purple-700 no-underline">{{post.metadata.title}}</a>
 		</h3>
 	</header>
-	<section class="text-base leading-5 text-slate-800 md:text-xl text-justify">{{post.body|truncate_md(2)|parse_markdown|escape("none")}}</section>
+	<section class="text-base leading-5 text-slate-800 md:text-xl text-justify">{{post.body|truncate_md(2)|parse_markdown|safe}}</section>
 	<footer class="text-sm md:text-base lg:text-lg mt-3 sm:mt-0 clear-both sm:clear-none">
     <ul class="inline-block">
      {% for tag in post.metadata.tags %}

templates/components/project_preview_card.html

@@ -11,14 +11,14 @@
       {% endmatch %}
     </h2>
     <section class="description text-slate-800 my-2 md:text-xl text-justify">
-      {{project.body|parse_markdown|escape("none")}}
+      {{project.body|parse_markdown|safe}}
     </section>
   </header>
   <!-- <hr class="border-blue-950 my-5"> -->
 
   {% match project.metadata.cover_image %}
   {% when Some with (source) %}
-  {% let picture = crate::picture_generator::picture_markup_generator::generate_picture_markup(source, 420, 236, "Project cover", Some("max-h-[236px]"), true).unwrap_or("cover not found".to_string()) %}
+  {% let picture = crate::picture_generator::picture_markup_generator::generate_picture_markup(source, 420, 236, "Project cover", Some("max-h-[236px]")).unwrap_or("cover not found".to_string()) %}
   <figure class="mx-4 my-2 flex justify-center">
       {% match project.metadata.link %}
       {% when Some with (href) %}
@@ -28,7 +28,6 @@
       {% when None %}
        {{picture|safe}}
       {% endmatch %}
-		<!-- TODO <figure> generate_image -->
   </figure>
   {% when None %}
   {% endmatch %}

templates/components/social_card.html

@@ -9,6 +9,6 @@
 	</header>
 	{% let alt_text = format!("{svg} thumbnail") %}
 
-	{{ crate::picture_generator::picture_markup_generator::generate_picture_markup(img, 360, 128, alt_text, Some("h-auto mx-auto rounded-sm"), true).unwrap_or("thumbnail not found".to_string())|safe }}
+	{{ crate::picture_generator::picture_markup_generator::generate_picture_markup(img, 360, 128, alt_text, Some("h-auto mx-auto rounded-sm")).unwrap_or("thumbnail not found".to_string())|safe }}
 </a>
 {% endmacro %}