forkless/NotAlterra
1
0
Fork 0
mirror of https://github.com/forkless/NotAlterra.git synced 2026-08-22 18:49:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

human-readable backup labels, Backup Types README section, clippy fixes

Browse Source
This commit is contained in:
forkless
2026-06-09 13:08:13 +02:00
parent e490460851
commit cead318a4b
5 changed files with 143 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.rs
+76 -2
View File
@@ -143,6 +143,9 @@ fn refresh_stats(tui_state: &mut tui::AppState, save_folder: Option<&Path>) {
tui_state.live_save_count = live;
tui_state.backup_count = bak;
tui_state.has_ini_backup = ini;
tui_state.context_path = Some(
crate::config::get_backup_root().display().to_string(),
);
}
// ── main loop ──────────────────────────────────────────────────────────────
@@ -239,6 +242,20 @@ fn run_app<B: Backend>(terminal: &mut Terminal<B>) -> Result<()> {
let mut menu_state = ListState::default().with_selected(Some(0));
loop {
// Main menu: show path based on highlighted item
{
let sel = menu_state.selected().unwrap_or(0);
let br = crate::config::get_backup_root().to_string_lossy().to_string();
let ini_path_str = app.save_folder.as_ref().and_then(|sf| {
discovery::derive_ini_path(sf).map(|p| p.to_string_lossy().to_string())
});
app.tui_state.context_path = match sel {
0 | 1 => None, // save path (fallback)
3..=5 => Some(br), // backup root
7 => ini_path_str, // ini Config\Windows path
_ => Some(String::new()), // blank / disclaimer / exit → no path
};
}
terminal.draw(|f| {
let cols = f.area().width;
let rows = f.area().height;
@@ -696,6 +713,8 @@ fn action_recover_bak<B: Backend>(terminal: &mut Terminal<B>, app: &mut App) ->
Vec::new()
};
// Recover picker: browsing .bak files in the live save folder → show save path
app.tui_state.context_path = None;
terminal.draw(|f| {
tui::draw_picker_split(
f,
@@ -911,7 +930,7 @@ fn action_restore_backup<B: Backend>(terminal: &mut Terminal<B>, app: &mut App)
.iter()
.map(|p| {
let name = p.file_name().unwrap().to_string_lossy();
format!(" {name}")
format!(" {}", format_backup_label(&name))
})
.collect();
let item_refs: Vec<&str> = items.iter().map(|s| s.as_str()).collect();
@@ -919,6 +938,10 @@ fn action_restore_backup<B: Backend>(terminal: &mut Terminal<B>, app: &mut App)
let mut state = ListState::default().with_selected(Some(0));
loop {
// Restore picker: show backup root in header
app.tui_state.context_path = Some(
crate::config::get_backup_root().to_string_lossy().to_string(),
);
terminal.draw(|f| {
tui::draw_picker(f, &app.tui_state, &item_refs, &descs, &mut state);
})?;
@@ -1021,7 +1044,20 @@ fn run_ini_submenu<B: Backend>(terminal: &mut Terminal<B>, app: &mut App) -> Res
const INI_SKIP: &[usize] = &[3];
let ini_max = 4usize;
let ini_path_str = app.save_folder.as_ref().and_then(|sf| {
discovery::derive_ini_path(sf).map(|p| p.to_string_lossy().to_string())
});
loop {
// Ini submenu: show path based on highlighted item
{
let sel = state.selected().unwrap_or(0);
let br = crate::config::get_backup_root().to_string_lossy().to_string();
app.tui_state.context_path = match sel {
0 | 1 => Some(br), // backup root (backup/restore)
2 => ini_path_str.clone(), // Config\Windows path (delete)
_ => Some(String::new()), // blank / back → nothing
};
}
terminal.draw(|f| {
tui::draw_sub_menu(
f,
@@ -1142,7 +1178,7 @@ fn ini_restore_action<B: Backend>(
.iter()
.map(|p| {
let name = p.file_name().unwrap().to_string_lossy();
format!(" {name}")
format!(" {}", format_backup_label(&name))
})
.collect();
let item_refs: Vec<&str> = items.iter().map(|s| s.as_str()).collect();
@@ -1150,6 +1186,10 @@ fn ini_restore_action<B: Backend>(
let mut state = ListState::default().with_selected(Some(0));
loop {
// Restore picker: show backup root in header
app.tui_state.context_path = Some(
crate::config::get_backup_root().to_string_lossy().to_string(),
);
terminal.draw(|f| {
tui::draw_picker(f, &app.tui_state, &item_refs, &descs, &mut state);
})?;
@@ -1584,6 +1624,40 @@ fn confirm_modal<B: Backend>(
}
}
/// Format a backup archive filename into a human-readable label.
/// `snapshot_2026-06-09_125430_001.tar.gz` → `Full Backup — 2026-Jun-09 12:54`
fn format_backup_label(filename: &str) -> String {
let stripped = filename.strip_suffix(".tar.gz").unwrap_or(filename);
let (prefix, rest) = match stripped.split_once('_') {
Some((p, r)) => (p, r),
None => return filename.to_string(),
};
let label = match prefix {
"snapshot" => "Full Backup",
"pre" if stripped.contains("pre_restore") => "Pre-restore",
"ini" => "INI Backup",
"migrated" => "Migrated",
_ => prefix,
};
// rest looks like: "2026-06-09_125430_001" or "notalterra_copy_..."
// Try to parse the timestamp portion (first YYYY-MM-DD_HHMMSS segment)
let date_str = if let Some(pos) = rest.find(|c: char| c.is_ascii_digit()) {
let slice = &rest[pos..];
if slice.len() >= 17 {
let date_part = &slice[..10]; // 2026-06-09
let time_part = &slice[11..17]; // 125430
let h = &time_part[..2];
let m = &time_part[2..4];
format!("{date_part} {h}:{m}")
} else {
rest.to_string()
}
} else {
rest.to_string()
};
format!("{label} — {date_str}")
}
/// Create a rectangle centered in the parent area by percentage.
fn centered_rect(percent_x: u16, percent_y: u16, r: Rect) -> Rect {
let popup_layout = Layout::default()
src/tui.rs
+33 -11
View File
@@ -34,6 +34,9 @@ pub struct AppState {
pub backup_count: usize,
/// Whether a .ini backup exists
pub has_ini_backup: bool,
/// Context-specific path shown on the right side of the header bar.
/// When `None`, falls back to `save_path`.
pub context_path: Option<String>,
/// Version string for the header
pub version: String,
/// Last operation result (for the status bar)
@@ -63,6 +66,7 @@ impl Default for AppState {
live_save_count: 0,
backup_count: 0,
has_ini_backup: false,
context_path: None,
version: String::new(),
status_message: None,
status_style: StatusStyle::Neutral,
@@ -594,17 +598,35 @@ fn draw_header(f: &mut Frame, area: Rect, app: &AppState) {
]);
f.render_widget(Paragraph::new(title_line), chunks[0]);
let path_line = if let Some(ref path) = app.save_path {
let max_w = chunks[1].width.saturating_sub(2) as usize;
let display = truncate_path_tail(path, max_w);
Paragraph::new(Span::styled(display, Style::default().fg(Color::Gray)))
.alignment(Alignment::Right)
} else {
Paragraph::new(Span::styled(
"no save folder selected",
Style::default().fg(Color::DarkGray),
))
.alignment(Alignment::Right)
// Header path priority:
// 1. context_path = Some("path") → show that path
// 2. context_path = Some("") → show nothing (blank/disclaimer/exit)
// 3. context_path = None → fall back to save_path
let max_w = chunks[1].width.saturating_sub(2) as usize;
let path_line = match &app.context_path {
Some(p) if p.is_empty() => {
// Show nothing — blank line, disclaimer, or exit
Paragraph::new(Span::raw(""))
}
Some(p) => {
let display = truncate_path_tail(p, max_w);
Paragraph::new(Span::styled(display, Style::default().fg(Color::Gray)))
.alignment(Alignment::Right)
}
None => {
// Fall back to save_path
if let Some(ref save) = app.save_path {
let display = truncate_path_tail(save, max_w);
Paragraph::new(Span::styled(display, Style::default().fg(Color::Gray)))
.alignment(Alignment::Right)
} else {
Paragraph::new(Span::styled(
"no save folder selected",
Style::default().fg(Color::DarkGray),
))
.alignment(Alignment::Right)
}
}
};
f.render_widget(path_line, chunks[1]);
f.render_widget(header_block, area);