Merge branch 'canary' into wf/tidy_and_add_lint_jobs

Signed-off-by: Shigure Kurosaki <[email protected]>

.gitignore

@@ -33,5 +33,7 @@ Session.vim
 \#*
 \#*\#
 .#*
+tmp/**
+!tmp/.gitkeep
 
 # Before adding new lines, see the comment at the top.

Cargo.toml

@@ -25,7 +25,7 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tarpaulin_include)'] }
 [dependencies]
 anyhow = "1.0.95"
 chrono = "0.4.39"
-clap = { version = "4.5.24", features = ["derive", "env"] }
+clap = { version = "4.5.26", features = ["derive", "env"] }
 glob = "0.3.2"
 inquire = "0.7.5"
 rss = "2.0.11"
@@ -38,9 +38,10 @@ tokio = { version = "1.42.0", features = [
   "macros",
   "rt-multi-thread",
 ] }
+thiserror = "2.0.11"
+tokio = { version = "1.43.0", features = ["fs", "io-util", "macros", "rt-multi-thread"] }
 toml = "0.8.19"
 url = { version = "2.5.4", features = ["serde"] }
 
 [dev-dependencies]
 tokio-test = "0.4.4"
-tempfile = "3.15.0"

src/arg/handle.rs

@@ -216,20 +216,16 @@ pub async fn builder(config_path: &PathBuf) -> Result<Channel, Errors> {
             });
         }
 
-        if rss.output.as_os_str().is_empty() {
-            Ok(channel_builder(rss, items))
-        } else {
-            println!("- create: {}", rss.output.to_string_lossy());
+        println!("- create: {}", rss.output.to_string_lossy());
 
-            let mut rss_file = File::create(&rss.output).await?;
-            let channel = channel_builder(rss, items);
+        let mut rss_file = File::create(&rss.output).await?;
+        let channel = channel_builder(rss, items);
 
-            rss_file.write_all(channel.to_string().as_ref()).await?;
+        rss_file.write_all(channel.to_string().as_ref()).await?;
 
-            Ok(channel)
-        }
+        Ok(channel)
     } else {
-        eprintln!("- {}", config_path.to_string_lossy());
+        eprintln!("- config: {}", config_path.to_string_lossy());
 
         Err(Errors::FileNotExistError)
     }

src/cmd/handle.rs

@@ -2,18 +2,7 @@ use crate::error::app::Errors;
 use anyhow::Result;
 use inquire::Select;
 use std::path::PathBuf;
-use tokio::fs::File;
-use tokio::io::AsyncWriteExt;
-
-async fn create_config_file(path: &PathBuf) -> Result<(), Errors> {
-    let mut config_file = File::create(path).await?;
-
-    config_file
-        .write_all(include_bytes!("katharsis.config.toml"))
-        .await?;
-
-    Ok(())
-}
+use tokio::fs;
 
 /// Generate a config file.
 ///
@@ -41,15 +30,17 @@ async fn create_config_file(path: &PathBuf) -> Result<(), Errors> {
 /// - When the options cannot be displayed.
 /// - When the file cannot be written to.
 pub async fn init(path: &PathBuf) -> Result<(), Errors> {
+    let config_bytes = include_bytes!("katharsis.config.toml");
+
     if path.try_exists()? {
         let options: Vec<&str> = vec!["Yes", "No"];
         let ans: &str = Select::new("A katharsis.config.toml already exists in the current directory. Do you want to overwrite it?", options).prompt()?;
 
         if ans == "yes" {
-            create_config_file(path).await?;
+            fs::write(path, config_bytes).await?;
         }
     } else {
-        create_config_file(path).await?;
+        fs::write(path, config_bytes).await?;
     }
 
     Ok(())

tests/arg.rs

@@ -2,6 +2,7 @@ use chrono::DateTime;
 use katharsis::arg;
 use rss::{Enclosure, Guid, Image};
 use std::path::PathBuf;
+use tokio::fs;
 use tokio_test::assert_ok;
 
 #[tokio::test]
@@ -67,4 +68,6 @@ async fn builder() {
     } else {
         panic!("lastBuildDate not found")
     }
+
+    assert_ok!(fs::remove_file(PathBuf::from("tmp/rss.xml")).await);
 }

tests/cmd.rs

@@ -1,5 +1,6 @@
 use katharsis::cmd;
 use serde::Deserialize;
+use std::path::PathBuf;
 use tokio::fs;
 use tokio_test::assert_ok;
 
@@ -41,12 +42,11 @@ struct Config {
 
 #[tokio::test]
 async fn init() {
-    let temp_dir = tempfile::tempdir().expect("failed to create temporary folder");
-    let path = temp_dir.path().join("katharsis.config.toml");
+    let path = PathBuf::from("tmp/katharsis.config.toml");
 
     assert_ok!(cmd::handle::init(&path).await);
 
-    let content = assert_ok!(fs::read_to_string(path).await);
+    let content = assert_ok!(fs::read_to_string(&path).await);
     let config: Config = assert_ok!(toml::from_str(&content));
     let Config { rss, article } = config;
 
@@ -67,4 +67,6 @@ async fn init() {
     assert_eq!(article.date, "time");
     assert_eq!(article.image, "articles/**/image.png");
     assert!(article.sort);
+
+    assert_ok!(fs::remove_file(path).await);
 }

tests/katharsis.config.toml

@@ -7,7 +7,7 @@ site_url = "https://nextjs.org"
 image = "favicon.png"
 copyright = "© 2024 Vercel Inc"
 language = "en"
-output = ""
+output = "tmp/rss.xml"
 
 [article]
 title = "h1"