Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions arbiter-core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,46 @@ pub mod presence;
pub mod signet;

pub mod filter;

pub fn normalize_windows_path(path: &str) -> String {
fn is_drive_root(p: &str) -> bool {
let b = p.as_bytes();
b.len() == 3 && b[1] == b':' && b[2] == b'\\'
}
let mut out = path.trim().replace('/', "\\");

while out.ends_with('\\') && !is_drive_root(&out) {
out.pop();
}
out
}

#[cfg(test)]
mod test {
use super::normalize_windows_path;

#[test]
fn removes_trailing_slash() {
assert_eq!(
normalize_windows_path(r"C\:temp\folder\"),
r"C\:temp\folder"
);
}

#[test]
fn preserve_drive_root() {
assert_eq!(normalize_windows_path(r"C:\"), r"C:\");
}
#[test]
fn normalizes_forward_slashes() {
assert_eq!(normalize_windows_path("C:/temp/test/ "), r"C:\temp\test");
}
#[test]
fn trim_whitespace() {
assert_eq!(normalize_windows_path(" C:/temp/test/ "), r"C:\temp\test");
}
#[test]
fn preserve_drive_root_after_normalization() {
assert_eq!(normalize_windows_path("C:/"), r"C:\");
}
}
14 changes: 1 addition & 13 deletions arbiter-forge/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use arbiter_core::decree::{
Action, ActionType, DecreeId, DecreeNode, NodeId, NodeKind, PresenceConfig,
};
use arbiter_core::ledger::SummonsDef;
use arbiter_core::normalize_windows_path;
use arbiter_core::protocol::ForgeCommand;

thread_local! {
Expand Down Expand Up @@ -54,19 +55,6 @@ fn generate_step_id() -> String {
format!("step-{epoch}-{n}")
}

fn normalize_windows_path(path: &str) -> String {
fn is_drive_root(p: &str) -> bool {
let b = p.as_bytes();
b.len() == 3 && b[1] == b':' && b[2] == b'\\'
}

let mut out = path.trim().replace('/', "\\");
while out.ends_with('\\') && !is_drive_root(&out) {
out.pop();
}
out
}

fn collect_decree_from_ui(ui: &ArbiterForge) -> arbiter_core::ledger::DecreeDef {
let label = ui.get_active_decree_label().to_string();
let id_str = ui.get_active_decree_id().to_string();
Expand Down
Loading