adamf/tour
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Adam French
2026-03-07 14:50:09 +00:00
parent e648b86c93
commit aced95a845
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/utils.rs
View File

@@ -17,8 +17,8 @@ pub fn get_current_step() -> Option<u32> {
fs::read_to_string(SESSION_PATH) fs::read_to_string(SESSION_PATH)
.ok() .ok()
.and_then(|s| { .and_then(|s| {
s.split("STEP=") s.lines()
.nth(1) .find_map(|l| l.strip_prefix("STEP="))
.and_then(|v| v.trim().parse::<u32>().ok()) .and_then(|v| v.trim().parse::<u32>().ok())
}) })
} }
@@ -53,7 +53,12 @@ pub fn get_tour_step() -> Result<u32, TourError> {
pub fn copy_path(src: &Path, dest_dir: &Path) -> Result<(), io::Error> { pub fn copy_path(src: &Path, dest_dir: &Path) -> Result<(), io::Error> {
let relative_src = if src.is_absolute() { let relative_src = if src.is_absolute() {
let cwd = std::env::current_dir()?; let cwd = std::env::current_dir()?;
src.strip_prefix(&cwd).unwrap_or(src).to_path_buf() src.strip_prefix(&cwd)
.map_err(|_| io::Error::new(
io::ErrorKind::InvalidInput,
format!("path '{}' is not under the current directory", src.display()),
))?
.to_path_buf()
} else { } else {
src.to_path_buf() src.to_path_buf()
}; };