fix: update some dependencies into the code

Phosphorus-M · Phosphorus-M · commit fc9fd78e9ccc · 2024-02-03T23:17:10.000-03:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,6 +26,7 @@ env_logger = "0.10.0"
 handlebars = "5.0"
 http = "0.2.4"
 log = "0.4.17"
+lazy_static = "1.0"
 memchr = "2.5.0"
 opener = "0.6.1"
 pulldown-cmark = { version = "0.9.3", default-features = false }
diff --git a/guide/src/en/guide/creating.md b/guide/src/en/guide/creating.md
@@ -0,0 +1 @@
+# Creating a Book
diff --git a/guide/src/en/guide/installation.md b/guide/src/en/guide/installation.md
@@ -0,0 +1 @@
+# Installation
diff --git a/guide/src/en/guide/reading.md b/guide/src/en/guide/reading.md
@@ -0,0 +1 @@
+# Reading Books
diff --git a/src/book/mod.rs b/src/book/mod.rs
@@ -346,19 +346,11 @@ impl MDBook {
                     _ => continue,
                 };
 
-                if let Some(chapter) = chapter {
-                    if ch.name != chapter && chapter_path.to_str() != Some(chapter) {
-                        if chapter == "?" {
-                            info!("Skipping chapter '{}'...", ch.name);
-                        }
-                        continue;
-                    }
-                }
-                chapter_found = true;
-                info!("Testing chapter '{}': {:?}", ch.name, chapter_path);
+                let path = self.source_dir().join(&chapter_path);
+                info!("Testing file: {:?}", path);
 
                 // write preprocessed file to tempdir
-                let path = temp_dir.path().join(chapter_path);
+                let path = temp_dir.path().join(&chapter_path);
                 let mut tmpf = utils::fs::create_file(&path)?;
                 tmpf.write_all(ch.content.as_bytes())?;
 
@@ -368,18 +360,17 @@ impl MDBook {
                 if let Some(edition) = self.config.rust.edition {
                     match edition {
                         RustEdition::E2015 => {
-                            cmd.args(["--edition", "2015"]);
+                            cmd.args(&["--edition", "2015"]);
                         }
                         RustEdition::E2018 => {
-                            cmd.args(["--edition", "2018"]);
+                            cmd.args(&["--edition", "2018"]);
                         }
                         RustEdition::E2021 => {
-                            cmd.args(["--edition", "2021"]);
+                            cmd.args(&["--edition", "2021"]);
                         }
                     }
                 }
 
-                debug!("running {:?}", cmd);
                 let output = cmd.output()?;
 
                 if !output.status.success() {
@@ -396,11 +387,6 @@ impl MDBook {
         if failed {
             bail!("One or more tests failed");
         }
-        if let Some(chapter) = chapter {
-            if !chapter_found {
-                bail!("Chapter not found: {}", chapter);
-            }
-        }
         Ok(())
     }
 
diff --git a/src/build_opts.rs b/src/build_opts.rs
@@ -1,5 +1,7 @@
 //! Build options.
 
+use serde::{Deserialize, Serialize};
+
 /// Build options passed from the frontend to control how the book is built.
 /// Separate from `Config`, which is global to all book languages.
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
diff --git a/src/cmd/build.rs b/src/cmd/build.rs
@@ -11,17 +11,16 @@ pub fn make_subcommand() -> Command {
         .arg_dest_dir()
         .arg_root_dir()
         .arg_open()
-        .arg_from_usage(
-            "-l, --language=[language] 'Language to render the compiled book in.{n}\
-                         Only valid if the [language] table in the config is not empty.{n}\
-                         If omitted, builds all translations and provides a menu in the generated output for switching between them.'",
-        )
+        .arg(Arg::new("language").short('l').long("language").num_args(1).value_parser(clap::value_parser!(String)).help("Language to render the compiled book in.{n}\
+        Only valid if the [language] table in the config is not empty.{n}\
+        If omitted, builds all translations and provides a menu in the generated output for switching between them."))
 }
 
 // Build command implementation
 pub fn execute(args: &ArgMatches) -> Result<()> {
     let book_dir = get_book_dir(args);
     let opts = get_build_opts(args);
+    println!("llegan {:?}", opts.language_ident);
     let mut book = MDBook::load_with_build_opts(&book_dir, opts)?;
 
     if let Some(dest_dir) = args.get_one::<PathBuf>("dest-dir") {
diff --git a/src/cmd/clean.rs b/src/cmd/clean.rs
@@ -11,11 +11,9 @@ pub fn make_subcommand() -> Command {
         .about("Deletes a built book")
         .arg_dest_dir()
         .arg_root_dir()
-        .arg_from_usage(
-            "-l, --language=[language] 'Language to render the compiled book in.{n}\
-                         Only valid if the [language] table in the config is not empty.{n}\
-                         If omitted, builds all translations and provides a menu in the generated output for switching between them.'",
-        )
+        .arg(Arg::new("language").short('l').long("language").num_args(1).value_parser(clap::value_parser!(String)).help("Language to render the compiled book in.{n}\
+        Only valid if the [language] table in the config is not empty.{n}\
+        If omitted, builds all translations and provides a menu in the generated output for switching between them."))
 }
 
 // Clean command implementation
diff --git a/src/cmd/serve.rs b/src/cmd/serve.rs
@@ -44,11 +44,9 @@ pub fn make_subcommand() -> Command {
                 .help("Port to use for HTTP connections"),
         )
         .arg_open()
-        .arg_from_usage(
-            "-l, --language=[language] 'Language to render the compiled book in.{n}\
-                         Only valid if the [language] table in the config is not empty.{n}\
-                         If omitted, builds all translations and provides a menu in the generated output for switching between them.'",
-        )
+        .arg(Arg::new("language").short('l').long("language").num_args(1).value_parser(clap::value_parser!(String)).help("Language to render the compiled book in.{n}\
+        Only valid if the [language] table in the config is not empty.{n}\
+        If omitted, builds all translations and provides a menu in the generated output for switching between them."))
 }
 
 // Serve command implementation
diff --git a/src/cmd/test.rs b/src/cmd/test.rs
@@ -32,9 +32,9 @@ pub fn make_subcommand() -> Command {
                     search path when building tests",
                 ),
         )
-        .arg_from_usage("-l, --language=[language] 'Language to render the compiled book in.{n}\
+        .arg(arg!(-l --language "Language to render the compiled book in.{n}\
                          Only valid if the [language] table in the config is not empty.{n}\
-                         If omitted, builds all translations and provides a menu in the generated output for switching between them.'")
+                         If omitted, builds all translations and provides a menu in the generated output for switching between them."))
 }
 
 // test command implementation
@@ -44,19 +44,16 @@ pub fn execute(args: &ArgMatches) -> Result<()> {
         .map(|it| it.map(String::as_str).collect())
         .unwrap_or_default();
 
-    let chapter: Option<&str> = args.get_one::<String>("chapter").map(|s| s.as_str());
-
     let book_dir = get_book_dir(args);
     let build_opts = get_build_opts(args);
     let mut book = MDBook::load_with_build_opts(&book_dir, build_opts)?;
 
     if let Some(dest_dir) = args.get_one::<PathBuf>("dest-dir") {
         book.config.build.build_dir = dest_dir.to_path_buf();
     }
-    match chapter {
-        Some(_) => book.test_chapter(library_paths, chapter),
-        None => book.test(library_paths),
-    }?;
+
+    book.test(library_paths)?;
+
 
     Ok(())
 }
diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
@@ -17,10 +17,10 @@ pub fn make_subcommand() -> Command {
         .arg_dest_dir()
         .arg_root_dir()
         .arg_open()
-        .arg_from_usage(
-            "-l, --language=[language] 'Language to render the compiled book in.{n}\
+        .arg(arg!(
+            -l --language "Language to render the compiled book in.{n}\
                          Only valid if the [language] table in the config is not empty.{n}\
-                         If omitted, builds all translations and provides a menu in the generated output for switching between them.'",
+                         If omitted, builds all translations and provides a menu in the generated output for switching between them.")
         )
 }
 
diff --git a/src/main.rs b/src/main.rs
@@ -135,10 +135,16 @@ fn get_book_dir(args: &ArgMatches) -> PathBuf {
 }
 
 fn get_build_opts(args: &ArgMatches) -> BuildOpts {
-    let language = args.value_of("language");
+
+    let language = if args.contains_id("language") {
+        args.get_one::<String>("language").map(String::from)
+    } else {
+        println!("No tiene lenguaje");
+        Some("no tiene".to_string())
+    };
 
     BuildOpts {
-        language_ident: language.map(String::from),
+        language_ident: language,
     }
 }
 
diff --git a/src/preprocess/links.rs b/src/preprocess/links.rs
@@ -10,7 +10,7 @@ use std::path::{Path, PathBuf};
 
 use super::{Preprocessor, PreprocessorContext};
 use crate::book::{Book, BookItem};
-use log::{error, warn};
+use log::{debug, error, warn};
 use once_cell::sync::Lazy;
 
 const ESCAPE_CHAR: char = '\\';
diff --git a/src/renderer/html_handlebars/hbs_renderer.rs b/src/renderer/html_handlebars/hbs_renderer.rs
@@ -149,7 +149,7 @@ impl HtmlHandlebars {
             let rendered = handlebars.render("index", &data)?;
 
             let rendered =
-                self.post_process(rendered, &html_config.playground, ctx.config.rust.edition);
+                self.post_process(rendered, &html_config.playground, &html_config.code, ctx.config.rust.edition);
 
             utils::fs::write_file(destination, "print.html", rendered.as_bytes())?;
             debug!("Creating print.html ✓");
diff --git a/src/renderer/html_handlebars/helpers/language.rs b/src/renderer/html_handlebars/helpers/language.rs
@@ -1,9 +1,10 @@
 use crate::config::LanguageConfig;
 use handlebars::{Context, Handlebars, Helper, Output, RenderContext, RenderError};
+use log::trace;
 use std::path::Path;
 
 pub fn language_option(
-    h: &Helper<'_, '_>,
+    h: &Helper<'_>,
     _r: &Handlebars<'_>,
     ctx: &Context,
     rc: &mut RenderContext<'_, '_>,
diff --git a/src/utils/mod.rs b/src/utils/mod.rs
@@ -4,7 +4,8 @@ pub mod fs;
 mod string;
 pub(crate) mod toml_ext;
 use crate::errors::Error;
-use log::error;
+use lazy_static::lazy_static;
+use log::{debug, error};
 use once_cell::sync::Lazy;
 use pulldown_cmark::{html, CodeBlockKind, CowStr, Event, Options, Parser, Tag};
 use regex::Regex;
@@ -506,6 +507,7 @@ more text with spaces
         use std::fs::File;
         use std::io::Write;
         use std::path::PathBuf;
+        use log::debug;
         use tempfile;
 
         #[test]

Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,9 @@ pub fn make_subcommand() -> Command {`
`44`	`44`	`.help("Port to use for HTTP connections"),`
`45`	`45`	`)`
`46`	`46`	`.arg_open()`
`47`		`- .arg_from_usage(`
`48`		`- "-l, --language=[language] 'Language to render the compiled book in.{n}\`
`49`		`- Only valid if the [language] table in the config is not empty.{n}\`
`50`		`- If omitted, builds all translations and provides a menu in the generated output for switching between them.'",`
`51`		`- )`
	`47`	`+ .arg(Arg::new("language").short('l').long("language").num_args(1).value_parser(clap::value_parser!(String)).help("Language to render the compiled book in.{n}\`
	`48`	`+ Only valid if the [language] table in the config is not empty.{n}\`
	`49`	`+ If omitted, builds all translations and provides a menu in the generated output for switching between them."))`
`52`	`50`	`}`
`53`	`51`
`54`	`52`	`// Serve command implementation`