Prepare for Lockfile saving; Clean up.

This commit is contained in:
Olivia Brooks
2025-10-15 12:42:21 -04:00
parent eb0237792c
commit 5247a52497
4 changed files with 102 additions and 5 deletions

77
Cargo.lock generated
View File

@@ -156,8 +156,15 @@ dependencies = [
"markdown", "markdown",
"ron", "ron",
"serde", "serde",
"toml",
] ]
[[package]]
name = "equivalent"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
[[package]] [[package]]
name = "fdeflate" name = "fdeflate"
version = "0.3.7" version = "0.3.7"
@@ -189,6 +196,12 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
[[package]]
name = "hashbrown"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.5.0" version = "0.5.0"
@@ -245,6 +258,16 @@ dependencies = [
"quick-error", "quick-error",
] ]
[[package]]
name = "indexmap"
version = "2.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
dependencies = [
"equivalent",
"hashbrown",
]
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.81" version = "0.3.81"
@@ -406,6 +429,15 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "serde_spanned"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
dependencies = [
"serde_core",
]
[[package]] [[package]]
name = "shlex" name = "shlex"
version = "1.3.0" version = "1.3.0"
@@ -435,6 +467,45 @@ dependencies = [
"unicode-ident", "unicode-ident",
] ]
[[package]]
name = "toml"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
dependencies = [
"indexmap",
"serde_core",
"serde_spanned",
"toml_datetime",
"toml_parser",
"toml_writer",
"winnow",
]
[[package]]
name = "toml_datetime"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
dependencies = [
"serde_core",
]
[[package]]
name = "toml_parser"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
dependencies = [
"winnow",
]
[[package]]
name = "toml_writer"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
[[package]] [[package]]
name = "unicode-id" name = "unicode-id"
version = "0.3.6" version = "0.3.6"
@@ -565,6 +636,12 @@ dependencies = [
"windows-link", "windows-link",
] ]
[[package]]
name = "winnow"
version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
[[package]] [[package]]
name = "zune-core" name = "zune-core"
version = "0.4.12" version = "0.4.12"

View File

@@ -9,6 +9,7 @@ chrono = "0.4"
glob = "0.3.3" glob = "0.3.3"
markdown = "1.0.0" markdown = "1.0.0"
ron = "0.11" ron = "0.11"
toml = "0.9.8"
[dependencies.clap] [dependencies.clap]
version = "4.5" version = "4.5"

View File

@@ -8,11 +8,23 @@ pub struct Cli {
#[command(subcommand)] #[command(subcommand)]
pub command: Commands, pub command: Commands,
#[arg(value_hint = clap::ValueHint::DirPath, default_value = format!("./target"))] #[arg(value_hint = clap::ValueHint::DirPath, default_value = "./target")]
target_dir: PathBuf, target_dir: PathBuf,
} }
#[derive(Debug, Subcommand)] impl Cli {
fn get_target_dir(&self) -> PathBuf {
match self.command.clone() {
Commands::Clean => self.target_dir.to_owned(),
Commands::Build { lockfile, .. } => lockfile.into(),
Commands::Refresh { lockfile, .. } => lockfile.into(),
Commands::Update { lockfile } => lockfile.into(),
_ => panic!("New cli::Commands variant not accounted for."),
}
}
}
#[derive(Debug, Subcommand, Clone, PartialEq)]
pub enum Commands { pub enum Commands {
#[command(arg_required_else_help = true)] #[command(arg_required_else_help = true)]
Build { Build {
@@ -60,13 +72,13 @@ pub enum RefreshScope {
All, // Both of the above All, // Both of the above
} }
#[derive(Debug, Args)] #[derive(Debug, Args, Clone, PartialEq)]
pub struct LockfileAccess { pub struct LockfileAccess {
/// Path to blog root for batch updating. /// Path to blog root for batch updating.
#[arg( #[arg(
long, long,
value_hint = clap::ValueHint::DirPath, value_hint = clap::ValueHint::DirPath,
default_value = format!("./") default_value = "./"
)] )]
post_tree: PathBuf, post_tree: PathBuf,
@@ -75,7 +87,13 @@ pub struct LockfileAccess {
short, short,
long, long,
value_hint = clap::ValueHint::DirPath, value_hint = clap::ValueHint::DirPath,
default_value = format!("cutinews.lock") default_value = "cutinews.lock"
)] )]
lock_file: PathBuf, lock_file: PathBuf,
} }
impl Into<PathBuf> for LockfileAccess {
fn into(self) -> PathBuf {
return PathBuf::from(format!("{:?}{:?}", self.post_tree, self.lock_file));
}
}

1
src/lock.rs Normal file
View File

@@ -0,0 +1 @@
pub struct LockFile {}