Changes log & update
Build Successful The build was successful
Gitea/epoch_forge/pipeline/head This commit looks good Details

This commit is contained in:
Dandaedre 2025-12-16 06:05:32 +01:00
parent a3d64bd3ec
commit 1a15be3d2a
9 changed files with 66 additions and 20 deletions

View File

@ -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

View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="122" height="18" role="img" aria-label="test-coverage: 50%"><title>test-coverage: 50%</title><linearGradient id="bms-8fc2dc264327201c" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-color="#000" stop-opacity=".3"/><stop offset="1" stop-color="#000" stop-opacity=".5"/></linearGradient><clipPath id="bmr-8fc2dc264327201c"><rect width="122" height="18" rx="4" fill="#fff"/></clipPath><g clip-path="url(#bmr-8fc2dc264327201c)"><rect width="87" height="18" fill="#555"/><rect x="87" width="35" height="18" fill="#97ca00"/><rect width="122" height="18" fill="url(#bms-8fc2dc264327201c)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="445" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="770">test-coverage</text><text x="445" y="130" transform="scale(.1)" fill="#fff" textLength="770">test-coverage</text><text aria-hidden="true" x="1035" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">50%</text><text x="1035" y="130" transform="scale(.1)" fill="#fff" textLength="250">50%</text></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="122" height="18" role="img" aria-label="test-coverage: 49%"><title>test-coverage: 49%</title><linearGradient id="bms-8b2d5b6821598c64" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-color="#000" stop-opacity=".3"/><stop offset="1" stop-color="#000" stop-opacity=".5"/></linearGradient><clipPath id="bmr-8b2d5b6821598c64"><rect width="122" height="18" rx="4" fill="#fff"/></clipPath><g clip-path="url(#bmr-8b2d5b6821598c64)"><rect width="87" height="18" fill="#555"/><rect x="87" width="35" height="18" fill="#97ca00"/><rect width="122" height="18" fill="url(#bms-8b2d5b6821598c64)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="445" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="770">test-coverage</text><text x="445" y="130" transform="scale(.1)" fill="#fff" textLength="770">test-coverage</text><text aria-hidden="true" x="1035" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">49%</text><text x="1035" y="130" transform="scale(.1)" fill="#fff" textLength="250">49%</text></g></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -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)?;

View File

@ -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<EpochId> = main_epoch
.list_existing_epochs
.iter()
.filter(|(id, _)| id <= &start_id)
.map(|(id, _)| *id)
.collect();
let mut list_id: Vec<EpochId> = 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(())
}

View File

@ -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,

View File

@ -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<EntityIdentifier>) -> bool {
match entity_identifier {

View File

@ -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(())
}
}

View File

@ -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)
}
}

View File

@ -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();