refined display for building

This commit is contained in:
2023-01-25 22:03:49 +01:00
parent 6153df1474
commit 90955bdc40
4 changed files with 82 additions and 47 deletions

View File

@@ -1,4 +1,4 @@
use std::{collections::HashMap, path::Path};
use std::{collections::HashMap, path::Path, fs};
use crate::app::{
builder::{
@@ -19,11 +19,11 @@ impl Command for Build {
fn execute(&self, _args: &HashMap<String, String>) -> Result<(), String> {
let path = "./docs/".to_string();
if !Self::docs_directory_exists(&path) {
if !Self::directory_exists(&path) {
return Self::docs_directory_missing();
}
let result = fs_util::fetch_paths_recursive(&path, ".adoc");
let result = fs_util::fetch_paths_recursive(&path);
let Ok(paths) = result else {
return Err(result.unwrap_err())
@@ -31,14 +31,17 @@ impl Command for Build {
for (index, path) in paths.iter().enumerate() {
let progress = index + 1;
if path.starts_with("./docs/slides") {
if self.build_slide(&path).is_ok() {
Self::display_status(paths.len(), progress, &path, "slide")
}
let goal = paths.len();
if path.ends_with(".adoc") && path.starts_with("./docs/slides") {
let out_path = path.clone().replace("adoc", "html").replace("/docs/", "/dist/");
self.build_slide(&path, &out_path, goal, progress)
} else if path.ends_with(".adoc") {
let out_path = path.clone().replace("adoc", "html").replace("/docs/", "/dist/");
self.build_doc(&path, &out_path, goal, progress)
} else {
if self.build_doc(&path).is_ok() {
Self::display_status(paths.len(), progress, &path, "doc")
}
let out_path = path.clone().replace("/docs/", "/dist/");
self.copy(&path, &out_path, goal, progress)
}
}
@@ -57,35 +60,73 @@ impl Command for Build {
}
impl Build {
fn build_file(&self, builder: &Box<dyn Builder>, path: &str) -> Result<(), String> {
let out_path = path
.clone()
.replace("docs", "dist")
.replace(".adoc", ".html");
return builder.build(&path, &out_path);
fn build_file(&self, builder: &Box<dyn Builder>, in_path: &str, out_path: &str) -> Result<(), String> {
return builder.build(&in_path, &out_path);
}
fn display_status(goal: usize, progress: usize, path: &str, conversion_type: &str) -> () {
fn build_file_and_status(
&self,
builder: &Box<dyn Builder>,
in_path: &str,
out_path: &str,
goal: usize,
progress: usize,
conversion_type: &str,
) {
let result = self.build_file(builder, in_path, out_path);
if result.is_ok() {
Self::display_status(goal, progress, in_path, out_path, conversion_type)
} else {
Self::display_status(goal, progress, in_path, out_path, "error");
let error = result.unwrap_err();
println!("{error}");
}
}
fn copy(&self, in_path: &str, out_path: &str, goal: usize, progress: usize) {
let segments: &Vec<&str> = &out_path.split("/").collect();
let parent_dir = &segments[0..segments.len() - 1].join("/");
Self::create_dir_recursive(parent_dir);
let result = fs::copy(in_path, out_path);
if result.is_ok() {
Self::display_status(goal, progress, in_path, out_path, "copy")
} else {
Self::display_status(goal, progress, in_path, out_path, "error");
let error = result.unwrap_err();
println!("{error}");
}
}
fn create_dir_recursive(path: &str) {
let mut validated_path = "./".to_string();
for segment in path.split("/") {
validated_path.push_str(format!("{segment}/").as_str());
if !Self::directory_exists(&validated_path) {
fs::create_dir(&validated_path).unwrap()
}
}
}
fn display_status(goal: usize, progress: usize, in_path: &str, out_path: &str, conversion_type: &str) -> () {
println!(
"({} / {}) [{}] {} -> {}",
progress,
goal,
conversion_type,
path,
path.replace(".adoc", ".html")
in_path,
out_path
);
}
fn build_doc(&self, path: &str) -> Result<(), String> {
return self.build_file(&self.docs_builder, path);
fn build_doc(&self, in_path: &str, out_path: &str, goal: usize, progress: usize) {
self.build_file_and_status(&self.docs_builder, in_path, out_path, goal, progress, "doc");
}
fn build_slide(&self, path: &str) -> Result<(), String> {
return self.build_file(&self.slides_builder, path);
fn build_slide(&self, path: &str, out_path: &str, goal: usize, progress: usize) {
return self.build_file_and_status(&self.slides_builder, path, out_path, goal, progress, "slide");
}
fn docs_directory_exists(path: &String) -> bool {
fn directory_exists(path: &String) -> bool {
Path::new(path).is_dir()
}