p
/
sdn
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Use SI units, slight refactor

This commit is contained in:
Přemysl Eric Janouch 2017-06-30 07:37:03 +02:00
parent 182ba280dd
commit be77f6fa46
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
sdn.cpp
View File

@ -186,23 +186,33 @@ static struct {
wstring editor_line; // Current user input wstring editor_line; // Current user input
} g; } g;
fun make_row (const entry &entry) -> vector<ncstring> { // TODO: this should probably be cached within `struct entry`
vector<ncstring> result; struct row {
enum { MODES, USER, GROUP, SIZE, MTIME, FILENAME, COLUMNS };
ncstring cols[COLUMNS];
};
fun make_row (const entry &entry) -> row {
row r;
const auto &info = entry.info; const auto &info = entry.info;
result.push_back (apply_attrs (decode_mode (info.st_mode), 0)); r.cols[row::MODES] = apply_attrs (decode_mode (info.st_mode), 0);
auto user = to_wstring (info.st_uid);
if (auto u = getpwuid (info.st_uid)) if (auto u = getpwuid (info.st_uid))
result.push_back (apply_attrs (to_wide (u->pw_name), 0)); user = to_wide (u->pw_name);
else r.cols[row::USER] = apply_attrs (user, 0);
result.push_back (apply_attrs (to_wstring (info.st_uid), 0));
auto group = to_wstring (info.st_gid);
if (auto g = getgrgid (info.st_gid)) if (auto g = getgrgid (info.st_gid))
result.push_back (apply_attrs (to_wide (g->gr_name), 0)); group = to_wide (g->gr_name);
else r.cols[row::GROUP] = apply_attrs (group, 0);
result.push_back (apply_attrs (to_wstring (info.st_gid), 0));
// TODO: human-readable auto size = to_wstring (info.st_size);
result.push_back (apply_attrs (to_wstring (info.st_size), 0)); if (info.st_size >> 40) size = to_wstring (info.st_size >> 40) + L"T";
else if (info.st_size >> 30) size = to_wstring (info.st_size >> 30) + L"G";
else if (info.st_size >> 20) size = to_wstring (info.st_size >> 20) + L"M";
else if (info.st_size >> 10) size = to_wstring (info.st_size >> 10) + L"K";
r.cols[row::SIZE] = apply_attrs (size, 0);
auto now = time (NULL); auto now = time (NULL);
auto now_year = localtime (&now)->tm_year; auto now_year = localtime (&now)->tm_year;
@ -211,11 +221,11 @@ fun make_row (const entry &entry) -> vector<ncstring> {
auto tm = localtime (&info.st_mtime); auto tm = localtime (&info.st_mtime);
strftime (buf, sizeof buf, strftime (buf, sizeof buf,
(tm->tm_year == now_year) ? "%b %e %H:%M" : "%b %e %Y", tm); (tm->tm_year == now_year) ? "%b %e %H:%M" : "%b %e %Y", tm);
result.push_back (apply_attrs (to_wide (buf), 0)); r.cols[row::MTIME] = apply_attrs (to_wide (buf), 0);
// TODO: symlink target and whatever formatting // TODO: symlink target and whatever formatting
result.push_back (apply_attrs (to_wide (entry.filename), 0)); r.cols[row::FILENAME] = apply_attrs (to_wide (entry.filename), 0);
return result; return r;
} }
fun inline visible_lines () -> int { return max (0, LINES - 2); } fun inline visible_lines () -> int { return max (0, LINES - 2); }
@ -237,7 +247,7 @@ fun update () {
move (available - used + i, 0); move (available - used + i, 0);
auto limit = COLS, used = 0; auto limit = COLS, used = 0;
for (auto &i : row) { for (auto &i : row.cols) {
used += print (i, limit - used); used += print (i, limit - used);
used += print (apply_attrs (L" ", 0), limit - used); used += print (apply_attrs (L" ", 0), limit - used);
} }