src:migrate:intermediate:working

Author: RandyMcMillan

src/lib.rs

@@ -2,8 +2,8 @@
 //!   cargo run --example scrollable
 //!
 use clap::Parser;
-use pulldown_cmark::{html, Parser as HTMLParser};
 use pulldown_cmark::Options;
+use pulldown_cmark::{html, Parser as HTMLParser};
 use rust_embed::Embed;
 
 use std::io;
@@ -22,8 +22,6 @@ use tokio::fs;
 use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
 
-
-
 pub mod path;
 
 #[derive(Embed)]
@@ -94,7 +92,6 @@ pub struct Args {
     pub export_path: Option<PathBuf>,
 }
 
-
 pub async fn extract(filename: &str, output_dir: &Path) -> io::Result<()> {
     match Template::get(filename) {
         Some(embedded_file) => {
@@ -118,7 +115,7 @@ pub async fn extract(filename: &str, output_dir: &Path) -> io::Result<()> {
     }
 }
 
-async fn extract_html(filename: &str, output_dir: &Path) -> io::Result<()> {
+pub async fn extract_html(filename: &str, output_dir: &Path) -> io::Result<()> {
     match Template::get(filename) {
         Some(embedded_file) => {
             let output_path = output_dir
@@ -133,9 +130,12 @@ async fn extract_html(filename: &str, output_dir: &Path) -> io::Result<()> {
 
             //std::str::from_utf8(embedded_file_data)
             //outfile.write_all(markdown_to_html(&std::str::from_utf8(embedded_file_data).expect("")).as_bytes())?;
-            outfile.write_all(
-                markdown_to_html(&std::str::from_utf8(&embedded_file_data).expect("")).as_bytes(),
-            ).await?;
+            outfile
+                .write_all(
+                    markdown_to_html(&std::str::from_utf8(&embedded_file_data).expect(""))
+                        .as_bytes(),
+                )
+                .await?;
 
             //outfile.write_all(markdown_to_html(embedded_file_data[0..5]));
             tracing::debug!(
@@ -152,7 +152,7 @@ async fn extract_html(filename: &str, output_dir: &Path) -> io::Result<()> {
     }
 }
 
-fn view_area() -> Area {
+pub fn view_area() -> Area {
     let mut area = Area::full_screen();
     area.pad_for_max_width(120); // we don't want a too wide text column
     area

src/main.rs

@@ -1,18 +1,19 @@
 use axum::response::Redirect;
-use nips::{Args, Template};
-use nips::*;
-use nips::path::canonicalize_path;
 use nips::extract;
+use nips::extract_html;
 use nips::markdown_to_html;
+use nips::path::canonicalize_path;
+use nips::*;
+use nips::{Args, Template};
 //use tower_http::services::Redirect;
-use std::env;
 use axum::{
     extract::Request, /*handler::HandlerWithoutStateExt, http::StatusCode, */ routing::get,
     Router,
 };
 use clap::Parser;
 use pulldown_cmark::Options;
 use pulldown_cmark::{html, Parser as HTMLParser};
+use std::env;
 //use rust_embed::RustEmbed;
 use sha2::{Digest, Sha256};
 use std::fs::File;
@@ -31,13 +32,13 @@ use termimad::crossterm::{
     terminal::{self, Clear, ClearType, EnterAlternateScreen, LeaveAlternateScreen},
 };
 use termimad::*;
+use tokio::fs;
 use tower::ServiceExt;
 use tower_http::{
     services::{ServeDir, ServeFile},
     trace::TraceLayer,
 };
 use tracing_subscriber::{fmt, layer::SubscriberExt, EnvFilter, Registry};
-use tokio::fs;
 //fn _make_executable(script_path: &Path) -> io::Result<()> {
 //    let mut permissions = fs::metadata(script_path)?.permissions();
 //    permissions.set_mode(permissions.mode() | 0o111);
@@ -74,51 +75,6 @@ use tokio::fs;
 //    }
 //}
 
-
-fn remove_md_extension(filename: &str) -> &str {
-    filename.strip_suffix(".md").unwrap_or(filename)
-}
-
-async fn extract_html(filename: &str, output_dir: &Path) -> io::Result<()> {
-    match Template::get(filename) {
-        Some(embedded_file) => {
-            let output_path = output_dir
-                .join("docs")
-                .join(remove_md_extension(filename).to_owned() + ".html");
-            if let Some(parent) = output_path.parent() {
-                fs::create_dir_all(parent).await.expect("");
-            }
-            let mut outfile = File::create(&output_path)?;
-            //            let embedded_file_data: &'static [u8] = embedded_file.data.as_ref();
-            let embedded_file_data: Vec<u8> = embedded_file.data.as_ref().to_vec(); // Create an owned Vec
-
-            //std::str::from_utf8(embedded_file_data)
-            //outfile.write_all(markdown_to_html(&std::str::from_utf8(embedded_file_data).expect("")).as_bytes())?;
-            outfile.write_all(
-                markdown_to_html(&std::str::from_utf8(&embedded_file_data).expect("")).as_bytes(),
-            )?;
-
-            //outfile.write_all(markdown_to_html(embedded_file_data[0..5]));
-            tracing::debug!(
-                "Successfully exported '{}' to '{}'",
-                filename,
-                output_path.display()
-            );
-            Ok(())
-        }
-        None => Err(io::Error::new(
-            io::ErrorKind::NotFound,
-            format!("Embedded file '{}' not found!", filename),
-        )),
-    }
-}
-
-fn view_area() -> Area {
-    let mut area = Area::full_screen();
-    area.pad_for_max_width(120);
-    area
-}
-
 #[allow(unused_variables)]
 fn run_app(skin: MadSkin, nip: String) -> Result<(), Error> {
     let res = markdown_to_html(&nip);
@@ -157,7 +113,6 @@ fn run_app(skin: MadSkin, nip: String) -> Result<(), Error> {
     Ok(())
 }
 
-
 fn calculate_sha256(data: &[u8]) -> String {
     let mut hasher = Sha256::new();
     hasher.update(data);
@@ -313,7 +268,9 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     tracing::debug!(
         "Canonical path of '{}': {}",
         absolute_path_str,
-        canonicalize_path(Path::new(absolute_path_str)).await?.display()
+        canonicalize_path(Path::new(absolute_path_str))
+            .await?
+            .display()
     );
 
     if args.serve {