root/ncdu-zig
1
0
Fork 0
mirror of https://code.blicky.net/yorhel/ncdu.git synced 2026-01-13 01:08:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

scan: Add UI message when counting hard links

Browse source 
That *usually* doesn't take longer than a few milliseconds, but it can
take a few seconds for some extremely large dirs, on very slow computers
or with optimizations disabled. Better display a message than make it
seem as if ncdu has stopped doing anything.
This commit is contained in:
Yorhel 2022-02-05 09:19:11 +01:00
parent 7d2905952d
commit e42db579a0
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/scan.zig
View file

@ -309,7 +309,12 @@ const Context = struct {
} }
fn final(self: *Self) void { fn final(self: *Self) void {
if (self.parents) |_| model.inodes.addAllStats(); if (self.parents) |_| {
counting_hardlinks = true;
defer counting_hardlinks = false;
main.handleEvent(false, true);
model.inodes.addAllStats();
}
if (self.wr) |wr| { if (self.wr) |wr| {
wr.writer().writeByte(']') catch |e| writeErr(e); wr.writer().writeByte(']') catch |e| writeErr(e);
wr.flush() catch |e| writeErr(e); wr.flush() catch |e| writeErr(e);
@ -977,6 +982,7 @@ pub fn importRoot(path: [:0]const u8, out: ?std.fs.File) void {
} }
var animation_pos: u32 = 0; var animation_pos: u32 = 0;
var counting_hardlinks: bool = false;
var need_confirm_quit = false; var need_confirm_quit = false;
fn drawError(err: anyerror) void { fn drawError(err: anyerror) void {
@ -995,10 +1001,17 @@ fn drawError(err: anyerror) void {
ui.addstr("Press any key to continue"); ui.addstr("Press any key to continue");
} }
fn drawCounting() void {
const box = ui.Box.create(4, 25, "Finalizing");
box.move(2, 2);
ui.addstr("Counting hardlinks...");
}
fn drawBox() void { fn drawBox() void {
ui.init(); ui.init();
const ctx = active_context; const ctx = active_context;
if (ctx.fatal_error) |err| return drawError(err); if (ctx.fatal_error) |err| return drawError(err);
if (counting_hardlinks) return drawCounting();
const width = ui.cols -| 5; const width = ui.cols -| 5;
const box = ui.Box.create(10, width, "Scanning..."); const box = ui.Box.create(10, width, "Scanning...");
box.move(2, 2); box.move(2, 2);
@ -1069,7 +1082,9 @@ pub fn draw() void {
.line => { .line => {
var buf: [256]u8 = undefined; var buf: [256]u8 = undefined;
var line: []const u8 = undefined; var line: []const u8 = undefined;
if (active_context.parents == null) { if (counting_hardlinks) {
line = "\x1b7\x1b[JCounting hardlinks...\x1b8";
} else if (active_context.parents == null) {
line = std.fmt.bufPrint(&buf, "\x1b7\x1b[J{s: <63} {d:>9} files\x1b8", line = std.fmt.bufPrint(&buf, "\x1b7\x1b[J{s: <63} {d:>9} files\x1b8",
.{ ui.shorten(active_context.pathZ(), 63), active_context.items_seen } .{ ui.shorten(active_context.pathZ(), 63), active_context.items_seen }
) catch return; ) catch return;