From 1a15be3d2a41671dbdd397d8da5c243205370a5a Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 16 Dec 2025 06:05:32 +0100 Subject: [PATCH 1/2] Changes log & update --- .run_status.toml | 4 +-- badges/coverage.svg | 2 +- bin_efo/src/commands/entity_generic.rs | 4 ++- bin_efo/src/commands/epoch.rs | 19 +++++----- bin_efo/src/commands/epoch/cli_epoch.rs | 4 +-- .../src/entity/implementations/accesors.rs | 5 +++ lib_efo/src/epoch/epoch_config.rs | 36 +++++++++++++++++-- lib_efo/src/epoch/epoch_info.rs | 8 ++++- lib_efo/src/stats.rs | 4 +-- 9 files changed, 66 insertions(+), 20 deletions(-) diff --git a/.run_status.toml b/.run_status.toml index bb2f884..2488011 100644 --- a/.run_status.toml +++ b/.run_status.toml @@ -1,8 +1,8 @@ [last_run_clean] run_status = "Success" lines_parsed = 110 -coverage = 49.76 +coverage = 48.89 [last_run_clean.run_duration] secs = 26 -nanos = 637749582 +nanos = 63691553 diff --git a/badges/coverage.svg b/badges/coverage.svg index d697e70..0db759b 100644 --- a/badges/coverage.svg +++ b/badges/coverage.svg @@ -1 +1 @@ -test-coverage: 50%test-coverage50% \ No newline at end of file +test-coverage: 49%test-coverage49% \ No newline at end of file diff --git a/bin_efo/src/commands/entity_generic.rs b/bin_efo/src/commands/entity_generic.rs index a85cb2c..18c109f 100644 --- a/bin_efo/src/commands/entity_generic.rs +++ b/bin_efo/src/commands/entity_generic.rs @@ -365,7 +365,8 @@ pub(crate) fn handle_create_entity( entity.entity_type.to_shortest(), entity.id.to_string(), ); - // TODO: Rather bad + entity.update_metastats(); + // TODO: Rather bad but faster that reloading without hashmaps vec_entities.push(entity.clone()); entity.print_full(epoch_info); @@ -495,6 +496,7 @@ fn handle_edit_entity( }; helper_functions::update_common_values(&entity_args.common_args, position, &mut entity); helper_functions::update_advanced_values(&entity_args.common_args, &mut entity, epoch_info)?; + entity.update_metastats(); entity.print_full(epoch_info); // Only swap if a swap is needed epoch_info.swap_entity(entity)?; diff --git a/bin_efo/src/commands/epoch.rs b/bin_efo/src/commands/epoch.rs index 1602f3c..e6d9daa 100644 --- a/bin_efo/src/commands/epoch.rs +++ b/bin_efo/src/commands/epoch.rs @@ -151,17 +151,20 @@ fn handle_diff(args: &cli_epoch::Diff) -> Result<(), AppError> { /// /// This helper is internal to the `epoch` sub-command. fn handle_log(args: &cli_epoch::Log, main_epoch: &mut EpochConfig) -> Result<(), AppError> { - let limit = args.limit; + let context = args.context; let start_id = &main_epoch.epoch_id; - let mut list_id: Vec = main_epoch - .list_existing_epochs - .iter() - .filter(|(id, _)| id <= &start_id) - .map(|(id, _)| *id) - .collect(); + let mut list_id: Vec = main_epoch.list_existing_epochs.keys().copied().collect(); list_id.sort(); - main_epoch.log_elements(&list_id[..std::cmp::min(list_id.len(), limit)])?; + // list_id.reverse(); + let pos = **list_id + .iter() + .find(|id| id == &start_id) + .ok_or(EpochError::EpochNotFound(start_id.to_string()))? as usize; + + main_epoch.log_elements( + &list_id[(pos.saturating_sub(context))..std::cmp::min(pos + context + 1, list_id.len())], + )?; Ok(()) } diff --git a/bin_efo/src/commands/epoch/cli_epoch.rs b/bin_efo/src/commands/epoch/cli_epoch.rs index 74f5c60..033f034 100644 --- a/bin_efo/src/commands/epoch/cli_epoch.rs +++ b/bin_efo/src/commands/epoch/cli_epoch.rs @@ -57,8 +57,8 @@ pub enum EpochCmd { #[derive(Args, Debug)] pub struct Log { /// (Optional) Limit the number of entries shown. - #[arg(short, long, default_value = "50")] - pub limit: usize, + #[arg(short, long, default_value = "20")] + pub context: usize, } /// Switches to the specified epoch. The target can be an integer, diff --git a/lib_efo/src/entity/implementations/accesors.rs b/lib_efo/src/entity/implementations/accesors.rs index c5f1ccd..413d9bf 100644 --- a/lib_efo/src/entity/implementations/accesors.rs +++ b/lib_efo/src/entity/implementations/accesors.rs @@ -250,6 +250,11 @@ impl Entity { &self.metadata.position } + /// Defer the update of all stats + pub fn update_metastats(&mut self) { + self.stats.update(); + } + /// Returns whether the entity match an optionnal identifier pub fn match_identifier(&self, entity_identifier: &Option) -> bool { match entity_identifier { diff --git a/lib_efo/src/epoch/epoch_config.rs b/lib_efo/src/epoch/epoch_config.rs index b5067d5..841a68f 100644 --- a/lib_efo/src/epoch/epoch_config.rs +++ b/lib_efo/src/epoch/epoch_config.rs @@ -15,8 +15,9 @@ use crate::{ EpochId, EpochIdentifier, EpochInfo, MAIN_NAME, SUBFOLDER_NAMING, SaveMode, TagList, epoch_traits::ConfigWritable, }, - stats, + stats::{self, Symbols}, }; +use colored::*; use std::{ collections::HashMap, fs::{read_to_string, remove_dir_all}, @@ -26,7 +27,7 @@ use std::{ use log::{info, warn}; use serde::{Deserialize, Serialize}; -use crate::{epoch::epoch_traits::Prettiable, error::EpochError}; +use crate::error::EpochError; /// The file written to *.epochconfig* that tells the CLI which /// epoch folder is the “current” one. @@ -421,7 +422,36 @@ impl EpochConfig { items_to_log.push(info); } } - println!("{}", EpochInfo::as_table(items_to_log)?); + + // TODO: Have this in a message and return a string + println!( + "{}", + "List of epoch, most recent shown first".bright_green() + ); + // TODO: Make a method for this + for elt in items_to_log.iter() { + let star = if elt.epoch_id == self.epoch_id { + " " + } else { + " " + }; + println!( + "{} {:>4} - {}{}{:10} {:50}", + star.green(), + elt.epoch_id.to_symbol().blue(), + "󰬌 ".yellow(), + (elt.events.len() + + elt.characters.len() + + elt.towns.len() + + elt.calamities.len() + + elt.blockers.len()) + .to_string() + .yellow(), + elt.tags.join(","), + elt.summary + ) + } + // println!("{}", EpochInfo::as_table(items_to_log)?); Ok(()) } } diff --git a/lib_efo/src/epoch/epoch_info.rs b/lib_efo/src/epoch/epoch_info.rs index 8a2db4a..ce48a66 100644 --- a/lib_efo/src/epoch/epoch_info.rs +++ b/lib_efo/src/epoch/epoch_info.rs @@ -19,7 +19,7 @@ use crate::{ epoch_traits::{ConfigWritable, Prettiable}, }, error::EpochError, - stats::{EntityType, Position, PositionIdentifier, TypedLink}, + stats::{EntityType, Position, PositionIdentifier, Symbols, TypedLink}, }; /// The metadata file stored inside each epoch directory @@ -378,3 +378,9 @@ impl EpochInfo { } } } + +impl Symbols for EpochId { + fn to_symbol(&self) -> String { + format!("[󰹻 {:<2}]", self) + } +} diff --git a/lib_efo/src/stats.rs b/lib_efo/src/stats.rs index 52cb12c..0275474 100644 --- a/lib_efo/src/stats.rs +++ b/lib_efo/src/stats.rs @@ -252,7 +252,6 @@ fn color_cell_categories(cell: CellStruct, value: &GenericStat) -> CellStruct { impl OverallStats { /// Create Stats with a given rng distribution - // TODO(6): Use an iterator over the stat enum pub(crate) fn create_rng( rng: &RngLevel, mut rng_t: &mut ThreadRng, @@ -285,7 +284,8 @@ impl OverallStats { } /// Updates the inner meta values - fn update(&mut self) { + // TODO: Force the use of this ? + pub fn update(&mut self) { self.demographics = (*(self.population + self.growth_rate + self.happiness - self.crime) / 4).into(); self.economy = (*(self.food + self.industry + self.trade + self.science) / 4).into(); -- 2.45.1 From 28a20c6920be5eee2d5d00aa961ad34eacf6dd60 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Tue, 16 Dec 2025 20:58:14 +0100 Subject: [PATCH 2/2] Adds a build, stops work --- .ignore | 1 + .run_status.toml | 6 +-- Cargo.toml | 1 - badges/version.svg | 2 +- bin_efo/build.rs | 66 +++++++++++++++++++++++++++++++ bin_efo/src/main.rs | 9 +++++ lib_efo/build.rs | 66 +++++++++++++++++++++++++++++++ lib_efo/src/epoch/epoch_config.rs | 20 ++++++++-- lib_efo/src/epoch/epoch_traits.rs | 2 +- lib_efo/src/error.rs | 6 +-- 10 files changed, 167 insertions(+), 12 deletions(-) create mode 100644 bin_efo/build.rs create mode 100644 lib_efo/build.rs diff --git a/.ignore b/.ignore index 73f8d72..3b623db 100644 --- a/.ignore +++ b/.ignore @@ -1,2 +1,3 @@ snapshots *.svg +build.rs diff --git a/.run_status.toml b/.run_status.toml index 2488011..e67f0d2 100644 --- a/.run_status.toml +++ b/.run_status.toml @@ -1,8 +1,8 @@ [last_run_clean] run_status = "Success" lines_parsed = 110 -coverage = 48.89 +coverage = 48.83 [last_run_clean.run_duration] -secs = 26 -nanos = 63691553 +secs = 27 +nanos = 30003945 diff --git a/Cargo.toml b/Cargo.toml index 37fd960..0f1839e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,6 @@ [workspace] resolver = "3" members = ["bin_efo", "lib_efo"] -version = "0.1" [workspace.dependencies] serde = { version = "1.0.228", features = ["derive"] } diff --git a/badges/version.svg b/badges/version.svg index c835340..d9c9825 100644 --- a/badges/version.svg +++ b/badges/version.svg @@ -1 +1 @@ -version: 0.1version0.1 \ No newline at end of file +version: 1.0.228version1.0.228 \ No newline at end of file diff --git a/bin_efo/build.rs b/bin_efo/build.rs new file mode 100644 index 0000000..c815c22 --- /dev/null +++ b/bin_efo/build.rs @@ -0,0 +1,66 @@ +// build.rs +use std::process::Command; +use std::str; + +/// Helper that runs a command and returns its stdout as a trimmed UTF‑8 string. +fn run_cmd(cmd: &mut Command) -> String { + let out = cmd.output().expect("failed to run command"); + if !out.status.success() { + panic!( + "command {:?} failed with status {:?}\nstderr: {}", + cmd, + out.status, + String::from_utf8_lossy(&out.stderr) + ); + } + + str::from_utf8(&out.stdout) + .expect("command produced non‑UTF8 output") + .trim() + .to_owned() +} + +fn main() { + let git_hash = run_cmd(Command::new("git").args(["rev-parse", "--short", "HEAD"])); + println!("cargo:rustc-env=GIT_HASH={}", git_hash); + + let args = &["rev-parse", "--abbrev-ref", "HEAD"]; + let git_branch = run_cmd(Command::new("git").args(args)); + println!("cargo:rustc-env=GIT_BRANCH={}", git_branch); + + // Prefer the explicit env var – it mirrors the real user choice + let toolchain = std::env::var("RUSTUP_TOOLCHAIN") + .map(|v| v.trim().to_owned()) + .unwrap_or_else(|_| { + // Try rustup first; if that fails, fall back to rustc + let raw = run_cmd(Command::new("rustup").args(["show", "active-toolchain"])); + + // rustup output may look like: + // stable-x86_64-unknown-linux-gnu (overridden by environment variable) + // We only want the part before the first '(' + raw.split('(').next().unwrap().trim().to_owned() + }); + + println!("cargo:rustc-env=TOOLCHAIN={}", toolchain); + + let rustc_version = run_cmd(Command::new("rustc").args(["--version"])); + println!("cargo:rustc-env=RUSTC_VERSION={}", rustc_version); + println!( + "cargo:rustc-env=EFO_SHORT_VERSION={} ({}{})", + env!("CARGO_PKG_VERSION"), + git_branch, + git_hash, + ); + println!( + "cargo:rustc-env=EFO_FULL_VERSION={} ({}{})  {}  {}", + env!("CARGO_PKG_VERSION"), + git_branch, + git_hash, + toolchain, + rustc_version, + ); + + // println!("cargo:rerun-if-changed=.git/HEAD"); + // println!("cargo:rerun-if-changed=.git/refs/heads"); + // println!("cargo:rerun-if-changed=.git/refs/remotes"); +} diff --git a/bin_efo/src/main.rs b/bin_efo/src/main.rs index e01f5aa..47eed3c 100644 --- a/bin_efo/src/main.rs +++ b/bin_efo/src/main.rs @@ -43,6 +43,7 @@ mod success; /// It uses `clap` to parse the top-level sub-commands (`init`, `epoch`, …) /// and stores them in the `command` field. #[derive(Parser, Debug)] +#[command(version = env!("EFO_SHORT_VERSION"))] #[command(name = "efo")] #[command(about = "Epoch Forge - manage organisations over time")] struct Cli { @@ -101,6 +102,14 @@ enum TopLevelCmd { fn main() -> miette::Result<()> { env_logger::init(); + log::trace!( + "System version: {} ({}{}) {} {}", + env!("CARGO_PKG_VERSION"), + env!("GIT_BRANCH"), + env!("GIT_HASH"), + env!("TOOLCHAIN"), + env!("RUSTC_VERSION"), + ); let cli = Cli::parse(); if let Err(e) = exec_dispatch(cli) { diff --git a/lib_efo/build.rs b/lib_efo/build.rs new file mode 100644 index 0000000..c815c22 --- /dev/null +++ b/lib_efo/build.rs @@ -0,0 +1,66 @@ +// build.rs +use std::process::Command; +use std::str; + +/// Helper that runs a command and returns its stdout as a trimmed UTF‑8 string. +fn run_cmd(cmd: &mut Command) -> String { + let out = cmd.output().expect("failed to run command"); + if !out.status.success() { + panic!( + "command {:?} failed with status {:?}\nstderr: {}", + cmd, + out.status, + String::from_utf8_lossy(&out.stderr) + ); + } + + str::from_utf8(&out.stdout) + .expect("command produced non‑UTF8 output") + .trim() + .to_owned() +} + +fn main() { + let git_hash = run_cmd(Command::new("git").args(["rev-parse", "--short", "HEAD"])); + println!("cargo:rustc-env=GIT_HASH={}", git_hash); + + let args = &["rev-parse", "--abbrev-ref", "HEAD"]; + let git_branch = run_cmd(Command::new("git").args(args)); + println!("cargo:rustc-env=GIT_BRANCH={}", git_branch); + + // Prefer the explicit env var – it mirrors the real user choice + let toolchain = std::env::var("RUSTUP_TOOLCHAIN") + .map(|v| v.trim().to_owned()) + .unwrap_or_else(|_| { + // Try rustup first; if that fails, fall back to rustc + let raw = run_cmd(Command::new("rustup").args(["show", "active-toolchain"])); + + // rustup output may look like: + // stable-x86_64-unknown-linux-gnu (overridden by environment variable) + // We only want the part before the first '(' + raw.split('(').next().unwrap().trim().to_owned() + }); + + println!("cargo:rustc-env=TOOLCHAIN={}", toolchain); + + let rustc_version = run_cmd(Command::new("rustc").args(["--version"])); + println!("cargo:rustc-env=RUSTC_VERSION={}", rustc_version); + println!( + "cargo:rustc-env=EFO_SHORT_VERSION={} ({}{})", + env!("CARGO_PKG_VERSION"), + git_branch, + git_hash, + ); + println!( + "cargo:rustc-env=EFO_FULL_VERSION={} ({}{})  {}  {}", + env!("CARGO_PKG_VERSION"), + git_branch, + git_hash, + toolchain, + rustc_version, + ); + + // println!("cargo:rerun-if-changed=.git/HEAD"); + // println!("cargo:rerun-if-changed=.git/refs/heads"); + // println!("cargo:rerun-if-changed=.git/refs/remotes"); +} diff --git a/lib_efo/src/epoch/epoch_config.rs b/lib_efo/src/epoch/epoch_config.rs index 841a68f..5b9d611 100644 --- a/lib_efo/src/epoch/epoch_config.rs +++ b/lib_efo/src/epoch/epoch_config.rs @@ -43,6 +43,9 @@ pub struct EpochConfig { /// The epoch ID that the binary should consider “current”. pub epoch_id: EpochId, + /// The version of the file loaded, and hopefully of all the project + pub version: String, + /// Optional human-friendly tags (e.g. `"winter-B"`, `"post-war"`). pub tags: HashMap, // TODO(6): Can become important @@ -61,6 +64,7 @@ impl Default for EpochConfig { epoch_id: EpochId::new(0), tags: HashMap::new(), list_existing_epochs: HashMap::new(), + version: env!("EFO_SHORT_VERSION").to_string(), } } } @@ -80,7 +84,7 @@ impl EpochConfig { .map_err(|e| EpochError::Serde { source: e, file_name: path.to_string_lossy().to_string(), - help: None, + version: format!("Current version: {}", env!("EFO_SHORT_VERSION")), })?; Ok(config.initialize()?) } else { @@ -90,6 +94,15 @@ impl EpochConfig { } } + /// Output the current version vs the filesystem version + pub fn version(&self) -> String { + format!( + "Program version {}.\nFilesystem version: {}.", + self.version, + env!("EFO_SHORT_VERSION") + ) + } + /// Initialize the epoch structure in depth. /// /// Scans the default configuration folder for sub-directories that are @@ -127,6 +140,7 @@ impl EpochConfig { /// * `Err(EpochError::Io { .. })` if the file could not be read. pub fn try_load(&mut self, epoch_id: &EpochId) -> Result<(), EpochError> { // Preload the epoch + let version = self.version(); let value = self .list_existing_epochs .get_mut(epoch_id) @@ -141,7 +155,7 @@ impl EpochConfig { serde_json::from_str(&read_to_string?).map_err(|e| EpochError::Serde { source: e, file_name: path.to_string(), - help: None, + version, })?; log::info!("Fully loaded Epoch {:?}", epoch_id); @@ -429,7 +443,7 @@ impl EpochConfig { "List of epoch, most recent shown first".bright_green() ); // TODO: Make a method for this - for elt in items_to_log.iter() { + for elt in items_to_log.iter().rev() { let star = if elt.epoch_id == self.epoch_id { " " } else { diff --git a/lib_efo/src/epoch/epoch_traits.rs b/lib_efo/src/epoch/epoch_traits.rs index ce48cd6..4e6384d 100644 --- a/lib_efo/src/epoch/epoch_traits.rs +++ b/lib_efo/src/epoch/epoch_traits.rs @@ -69,7 +69,7 @@ pub trait ConfigWritable: Serialize { serde_json::to_string_pretty(self).map_err(|e| EpochError::Serde { source: e, file_name: action, - help: None, + version: format!("Current Version:{}", env!("EFO_SHORT_VERSION")), }) } diff --git a/lib_efo/src/error.rs b/lib_efo/src/error.rs index 693793d..ecb5e0d 100644 --- a/lib_efo/src/error.rs +++ b/lib_efo/src/error.rs @@ -180,15 +180,15 @@ pub enum EpochError { /// Serialization / deserialization errors that are not caught above. #[error("Serialization error from {file_name}")] #[diagnostic(code(EpochError::SerdeError))] + #[diagnostic(help("You may have updated efo to an incompatible version.\n{version}"))] Serde { /// The source error #[source] source: serde_json::Error, /// The file that was being written file_name: String, - /// An optionnal help message - #[help] - help: Option, + /// A version number vs file version number + version: String, }, /// The epoch tree is in an incorrect state. -- 2.45.1