83 Commits

Author SHA1 Message Date
utox39
3cfae25a75 build: bump version to 0.20.0 2025-08-26 03:38:47 +02:00
utox39
d841a6a726 docs(README): update README 2025-08-25 03:35:07 +02:00
utox39
7e7d964fd4 build: set minimum zig version to v0.15.1 2025-08-25 03:33:36 +02:00
utox39
a9091f1c93 build: bump version to 0.11.0 2025-08-25 03:32:08 +02:00
utox39
d9ac4e58fc refactor(linux-network): use the new managed array list 2025-08-25 03:18:31 +02:00
utox39
9c4e032c04 refactor(linux-gpu): use the new managed array list 2025-08-25 03:16:45 +02:00
utox39
5730f14897 feat(linux-shell): use process.Child.run 2025-08-25 03:12:56 +02:00
utox39
f57fc5d9ab feat(macos-shell): use process.Child.run 2025-08-25 03:12:29 +02:00
utox39
e7f7205a44 feat(macos-packages): use fmt.bufPrint instead of io.fixedBufferStream and fmt.formatInt 2025-08-25 02:17:42 +02:00
utox39
8768e85b80 refactor(macos-network): use the new managed array list 2025-08-25 02:12:52 +02:00
utox39
27995745e4 refactor(macos-gpu): use the new cfTypeRefToZigString function instead of the old cfStringToZigString 2025-08-25 02:09:52 +02:00
utox39
092171ef7f refactor(macos-utils): converts a CFTypeRef casted to CFStringRef to a Zig string 2025-08-25 02:04:41 +02:00
utox39
84a5edba4c refactor(formatters): use new managed array list 2025-08-25 01:49:45 +02:00
utox39
212e3c3bc8 refactor(config): use new managed array list 2025-08-25 01:47:48 +02:00
utox39
9020345b00 refactor: use new managed array list 2025-08-25 01:46:55 +02:00
utox39
b7ba91d664 build: update build.zig 2025-08-25 01:40:43 +02:00
utox39
1c97ed3685 feat(ascii): add a workaround for alignment that is no longer supported in combination with Unicode 2025-08-25 01:38:37 +02:00
utox39
316238f9ea feat(utils): add a utility function to get the length of the longest ascii art row 2025-08-25 01:25:59 +02:00
utox39
7ad5181381 feat(utils): add a utility function to count the codepoints in a string 2025-08-25 01:23:52 +02:00
utox39
02406a7644 refactor(utils): use new zig stdout implementation 2025-08-25 01:17:16 +02:00
utox39
30970649c2 refactor(ascii): use new managed array list 2025-08-24 22:02:14 +02:00
utox39
981d5ee579 refactor(ascii): use new zig stdout implementation 2025-08-24 22:00:51 +02:00
utox39
8aa0f4972e feat(macos-packages): use new array_list 2025-08-23 00:18:24 +02:00
utox39
da70f9ee06 build: bump version to 0.10.0 2025-08-11 02:35:28 +02:00
utox39
b6628c3135 Merge pull request #12 from utox39/feat-config/config-improvements
Feat config/config improvements
2025-08-11 02:34:16 +02:00
utox39
c66d127c4d feat(formatters): add formatter for the 'custom' module 2025-08-10 00:41:06 +02:00
utox39
f3c9b6e9a6 feat(config): add 'custom' module 2025-08-10 00:38:42 +02:00
utox39
d55af958e7 feat(utils): add workaround for start index greater than length 2025-08-10 00:37:37 +02:00
utox39
3bcfff5bdc build: bump version to 0.9.1 2025-08-06 20:57:27 +02:00
utox39
42edc5c24b fix(utils): fix typo 2025-08-06 20:57:10 +02:00
utox39
537a324275 build: bump version to 0.9.0 2025-08-06 00:03:00 +02:00
utox39
224a7d29d8 Merge pull request #11 from utox39/feat/parse-shell-version
Feat/parse shell version
2025-08-06 00:01:34 +02:00
utox39
eb477e5154 refactor(shell): remove the 'allocator' parameter 2025-08-05 23:13:42 +02:00
utox39
2d1c7506d8 feat(shell): parse bash shell version 2025-08-04 02:37:52 +02:00
utox39
428d882591 Merge pull request #10 from utox39/feat/handle-shell-env-var-not-found
Feat/handle shell env var not found
2025-08-04 00:40:29 +02:00
utox39
a1c62a56ae build: bump version to 0.8.1 2025-08-04 00:38:33 +02:00
utox39
5b423d1cef feat(shell): handle 'SHELL' env var not found 2025-08-04 00:35:09 +02:00
utox39
6574945e56 docs(README): update README 2025-08-02 00:25:25 +02:00
utox39
66bb544c0a build: bump version to 0.8.0 2025-08-02 00:22:06 +02:00
utox39
d90c1d2e9a Merge pull request #9 from utox39/feat/adaptive-print
Feat/adaptive print
2025-08-02 00:20:35 +02:00
utox39
0beec60a8a fix(linux-kernel): fix kernel info parsing by trimming null bytes 2025-08-01 06:25:30 +02:00
utox39
7669da5ae8 refactor(formatters): remove unnecessary spaces in the formatted uptime string 2025-08-01 05:55:11 +02:00
utox39
1267a71250 feat: print the ascii art if the width of the terminal is greater than the left alignment (45) + the longest sys info string length 2025-08-01 04:10:00 +02:00
utox39
2aa90c04ff feat: add a utility function to get the length of the longest sys info string 2025-08-01 03:51:11 +02:00
utox39
f6d1c2dc72 feat: add adaptive printing based on terminal width 2025-07-31 01:47:12 +02:00
utox39
9df0845530 feat: add a utility function to retrieve the terminal size 2025-07-31 01:43:40 +02:00
utox39
3b3c29e22d Merge pull request #8 from utox39/fix-linux-gpu/fix-memory-leak
Fix linux gpu/fix memory leak
2025-07-29 17:08:10 +02:00
utox39
a866952f86 build: bump version to 0.7.4 2025-07-29 17:06:40 +02:00
utox39
5d7bdd8041 fix(linux-gpu): fix memory leak 2025-07-29 17:05:30 +02:00
utox39
635dfe00db Merge pull request #7 from utox39/fix-linux-gpu/fix-double-free
Fix linux gpu/fix double free
2025-07-28 23:40:56 +02:00
utox39
064e8e9597 build: bump version to 0.7.3 2025-07-28 23:39:40 +02:00
utox39
785915d833 fix(linux-gpu): fix double free 2025-07-28 23:38:36 +02:00
utox39
e492443a2c build: bump version to 0.7.2 2025-07-27 14:54:36 +02:00
utox39
f1bebb08e9 Merge pull request #6 from utox39/fix/fix-wrong-used-size
fix: fix wrong used size calculation
2025-07-27 14:52:37 +02:00
utox39
f3af8712d2 Merge pull request #5 from utox39/fix-linux/fix-cpuinfo_max_freq
fix(linux-cpu): fix FileNotFound error
2025-07-27 14:50:18 +02:00
utox39
67a2e19ac4 fix: fix wrong used size calculation 2025-07-27 14:42:52 +02:00
utox39
2de5047eb7 fix(linux-cpu): fix FileNotFound error 2025-07-22 22:32:48 +02:00
utox39
e88586c47a Merge pull request #4 from utox39/feat-linux/gpu-name-parsing
Feat linux/gpu name parsing
2025-07-17 15:39:23 +02:00
utox39
28f94d87ed fix(terminal): fix typo 2025-07-17 15:37:31 +02:00
utox39
0d7f606b7d build: bump to version 0.7.0 2025-07-17 15:35:37 +02:00
utox39
ec0e3ffd18 refactor(linux-gpu): add note and remove debug logs 2025-07-17 15:34:21 +02:00
utox39
f73b1be023 refactor(linux-gpu): use gpu name parser 2025-07-17 15:33:43 +02:00
utox39
3a5a268bbe feat(linux-gpu): parse gpu name 2025-07-17 02:25:26 +02:00
utox39
bdf4a3f7d7 build: bump version to 0.6.2 2025-07-17 02:18:36 +02:00
utox39
68cc541575 refactor(formatters): show the frequency and cores of the GPU only if one of the two is different from zero 2025-07-16 23:57:09 +02:00
utox39
e28a3b96e5 build: bump version to 0.6.1 2025-07-15 02:20:55 +02:00
utox39
01ad39c0b5 fix(config): fix the order of the enum 2025-07-15 02:19:56 +02:00
utox39
a18fd7ade8 style(ascii): add comments 2025-07-15 02:07:07 +02:00
utox39
3e14691e14 docs(README): update README 2025-07-12 02:03:24 +02:00
utox39
4eab0e4487 build: bump to version 0.6.0 2025-07-12 01:58:31 +02:00
utox39
3b737ed4d7 Merge pull request #3 from utox39/feat-linux/gpu-info
Feat linux/gpu info
2025-07-12 01:56:51 +02:00
utox39
073d512b67 docs(README): update README 2025-07-12 01:56:02 +02:00
utox39
707f94bd8b fix(formatters): fix wrong return type 2025-07-12 01:47:53 +02:00
utox39
de214a4a89 feat(formatters): add a tagged union to handle formatters with different signatures 2025-07-12 01:42:15 +02:00
utox39
5b63b30a4f fix(linux-gpu): fix wrong return type 2025-07-12 01:23:33 +02:00
utox39
9af26702cc fix(linux-gpu): fix ignored error union 2025-07-12 01:19:53 +02:00
utox39
c660fc903f feat(linux-gpu): handle multiple gpu 2025-07-11 21:54:17 +02:00
utox39
90abbcb1fd feat(linux-gpu): handle the return value of the pci_fill_info function 2025-07-11 16:27:07 +02:00
utox39
a52dd145da build(linux): link with libpci 2025-07-11 14:22:25 +02:00
utox39
5faf60e53d refactor(formatters): remove gpu information detection behavior based on os 2025-07-11 14:21:37 +02:00
utox39
7993cab4df feat(linux): add gpu name info 2025-07-11 14:16:35 +02:00
utox39
b4ec1b6d2d build: bump version to 0.5.3 2025-06-19 03:24:36 +02:00
utox39
cd40fe34d2 fix(formatters): correct printed total swap size from usage to actual size 2025-06-19 03:23:44 +02:00
17 changed files with 482 additions and 153 deletions

View File

@@ -14,7 +14,11 @@ Zigfetch is a minimal [neofetch](https://github.com/dylanaraps/neofetch)/[fastfe
## Requirements
- [zig v0.14.0](https://ziglang.org/)
- \>= [zig v0.15.1](https://ziglang.org/)
### Linux only
- [libpci](https://github.com/pciutils/pciutils)
## Installation
@@ -65,10 +69,11 @@ $ cp /path/to/zigfetch/config.json ~/.config/zigfetch/config.json
## Roadtrip
- [ ] Add ASCII art for each operating system and Linux distro
- [ ] Add GPU info for Linux
- [x] Add GPU info for Linux
- [ ] Add packages info for Linux
- [x] Add user customization
- [ ] Add support for Windows
## Contributing
If you would like to contribute to this project just create a pull request which I will try to review as soon as possible.

View File

@@ -17,9 +17,11 @@ pub fn build(b: *std.Build) void {
const exe = b.addExecutable(.{
.name = "zigfetch",
.root_module = b.createModule(.{
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
}),
});
if (target.result.os.tag == .macos) {
@@ -29,6 +31,7 @@ pub fn build(b: *std.Build) void {
if (target.result.os.tag == .linux) {
exe.linkLibC();
exe.linkSystemLibrary("pci");
}
// This declares intent for the executable to be installed into the
@@ -60,9 +63,11 @@ pub fn build(b: *std.Build) void {
run_step.dependOn(&run_cmd.step);
const exe_unit_tests = b.addTest(.{
.root_module = b.createModule(.{
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
}),
});
const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);

View File

@@ -10,7 +10,7 @@
// This is a [Semantic Version](https://semver.org/).
// In a future version of Zig it will be used for package deduplication.
.version = "0.5.2",
.version = "0.20.0",
// Together with name, this represents a globally unique package
// identifier. This field is generated by the Zig toolchain when the
@@ -28,7 +28,7 @@
// Tracks the earliest Zig version that the package considers to be a
// supported use case.
.minimum_zig_version = "0.14.0",
.minimum_zig_version = "0.15.1",
// This field is optional.
// Each dependency must either provide a `url` and `hash`, or a `path`.

View File

@@ -1,4 +1,5 @@
const std = @import("std");
const utils = @import("./utils.zig");
pub const Reset = "\x1b[0m";
pub const Bold = "\x1b[1m";
@@ -64,10 +65,10 @@ test "parse ffffff" {
try std.testing.expect((result.r == 255) and (result.g == 255) and (result.b == 255));
}
pub fn printAscii(allocator: std.mem.Allocator, sys_info_list: std.ArrayList([]u8)) !void {
const stdout_file = std.io.getStdOut().writer();
var bw = std.io.bufferedWriter(stdout_file);
const stdout = bw.writer();
pub fn printAscii(allocator: std.mem.Allocator, sys_info_list: std.array_list.Managed([]u8)) !void {
var stdout_buffer: [2048]u8 = undefined;
var stdout_writer = std.fs.File.stdout().writer(&stdout_buffer);
const stdout = &stdout_writer.interface;
// const ascii_art_path = "./assets/ascii/guy_fawks.txt";
// var file = try std.fs.cwd().openFile(ascii_art_path, .{});
@@ -79,7 +80,7 @@ pub fn printAscii(allocator: std.mem.Allocator, sys_info_list: std.ArrayList([]u
var lines = std.mem.splitScalar(u8, ascii_art_data, '\n');
var ascii_art_content_list = std.ArrayList([]const u8).init(allocator);
var ascii_art_content_list = std.array_list.Managed([]const u8).init(allocator);
defer ascii_art_content_list.deinit();
while (lines.next()) |line| {
@@ -89,27 +90,50 @@ pub fn printAscii(allocator: std.mem.Allocator, sys_info_list: std.ArrayList([]u
const ascii_art_items = ascii_art_content_list.items;
const sys_info_items = sys_info_list.items;
const terminal_size = try utils.getTerminalSize();
const terminal_width: usize = @intCast(terminal_size.width);
const spacing: usize = 5;
const longest_ascii_art_row_len: usize = try utils.getLongestAsciiArtRowLen(ascii_art_items);
const longest_sys_info_string_len = utils.getLongestSysInfoStringLen(sys_info_items);
const can_print_ascii_art: bool = terminal_width > longest_ascii_art_row_len + longest_sys_info_string_len + spacing;
const ascii_art_len: usize = ascii_art_items.len;
const sys_info_len: usize = sys_info_items.len;
const max_len: usize = if (ascii_art_len > sys_info_len) ascii_art_len else sys_info_len;
// NOTE: sys_info_len + 3 to be able to print the colors
const max_len: usize = if ((ascii_art_len > sys_info_len) and can_print_ascii_art) ascii_art_len else sys_info_len + 3;
var i: usize = 0;
while (i < max_len) : (i += 1) {
// Print the ascii art if the width of the terminal is greater than the spacing (5) + the longest ascii art row length + the longest sys info string length
if (can_print_ascii_art) {
const alignment_buffer = try allocator.alloc(u8, longest_ascii_art_row_len - (try utils.countCodepoints(ascii_art_items[i])) + spacing);
@memset(alignment_buffer, ' ');
if (i < ascii_art_len) {
try stdout.print("{s:<40} \t", .{ascii_art_items[i]});
try stdout.print("{s}{s}", .{ ascii_art_items[i], alignment_buffer });
} else {
try stdout.print("{s:<40}", .{""});
try stdout.print("{s}", .{alignment_buffer});
}
allocator.free(alignment_buffer);
try stdout.flush();
}
try bw.flush();
if (i < sys_info_len) {
try stdout.print("{s}\n", .{sys_info_items[i]});
} else if (i == sys_info_len + 1) {
// Print the first row of colors
for (0..8) |j| {
try stdout.print("\x1b[48;5;{d}m \x1b[0m", .{j});
}
try stdout.print("\n", .{});
} else if (i == sys_info_len + 2) {
// Print the second row of colors
for (8..16) |j| {
try stdout.print("\x1b[48;5;{d}m \x1b[0m", .{j});
}
@@ -117,7 +141,7 @@ pub fn printAscii(allocator: std.mem.Allocator, sys_info_list: std.ArrayList([]u
} else {
try stdout.print("\n", .{});
}
try bw.flush();
try stdout.flush();
}
for (sys_info_list.items) |item| {

View File

@@ -23,13 +23,14 @@ pub const ModuleType = enum {
ram,
swap,
disk,
net,
terminal,
locale,
net, // It must always be the last element of this array
custom,
};
pub fn getModulesTypes(allocator: std.mem.Allocator, config: ?std.json.Parsed(Config)) !std.ArrayList(ModuleType) {
var modules_list = std.ArrayList(ModuleType).init(allocator);
pub fn getModulesTypes(allocator: std.mem.Allocator, config: ?std.json.Parsed(Config)) !std.array_list.Managed(ModuleType) {
var modules_list = std.array_list.Managed(ModuleType).init(allocator);
if (config) |c| {
for (c.value.modules) |module| {

View File

@@ -3,7 +3,12 @@ const std = @import("std");
const ascii = @import("ascii.zig");
const detection = @import("detection.zig").os_module;
pub const formatters = [_]*const fn (allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) anyerror![]u8{
const Result = union(enum) {
string: []u8,
string_arraylist: std.array_list.Managed([]u8),
};
pub const formatters = [_]*const fn (allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) anyerror!Result{
&getFormattedOsInfo,
&getFormattedKernelInfo,
&getFormattedUptimeInfo,
@@ -14,11 +19,13 @@ pub const formatters = [_]*const fn (allocator: std.mem.Allocator, key: []const
&getFormattedRamInfo,
&getFormattedSwapInfo,
&getFormattedDiskInfo,
&getFormattedNetInfo,
&getFormattedTerminalNameInfo,
&getFormattedLocaleInfo,
&getFormattedCustom,
};
pub const default_formatters = [_]*const fn (allocator: std.mem.Allocator) anyerror![]u8{
pub const default_formatters = [_]*const fn (allocator: std.mem.Allocator) anyerror!Result{
&getDefaultFormattedOsInfo,
&getDefaultFormattedKernelInfo,
&getDefaultFormattedUptimeInfo,
@@ -29,146 +36,167 @@ pub const default_formatters = [_]*const fn (allocator: std.mem.Allocator) anyer
&getDefaultFormattedRamInfo,
&getDefaultFormattedSwapInfo,
&getDefaultFormattedDiskInfo,
&getDefaultFormattedNetInfo,
&getDefaultFormattedTerminalNameInfo,
&getDefaultFormattedLocaleInfo,
};
pub fn getDefaultFormattedKernelInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedKernelInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedKernelInfo(allocator, "Kernel", ascii.Yellow);
}
pub fn getFormattedKernelInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedKernelInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const kernel_info = try detection.system.getKernelInfo(allocator);
defer allocator.free(kernel_info.kernel_name);
defer allocator.free(kernel_info.kernel_release);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s} {s}", .{ key_color, key, ascii.Reset, kernel_info.kernel_name, kernel_info.kernel_release });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s} {s}", .{ key_color, key, ascii.Reset, kernel_info.kernel_name, kernel_info.kernel_release }) };
}
pub fn getDefaultFormattedOsInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedOsInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedOsInfo(allocator, "OS", ascii.Yellow);
}
pub fn getFormattedOsInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedOsInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const os_info = try detection.system.getOsInfo(allocator);
defer allocator.free(os_info);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, os_info });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, os_info }) };
}
pub fn getDefaultFormattedLocaleInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedLocaleInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedLocaleInfo(allocator, "Locale", ascii.Yellow);
}
pub fn getFormattedLocaleInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedLocaleInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const locale = try detection.system.getLocale(allocator);
defer allocator.free(locale);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, locale });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, locale }) };
}
pub fn getDefaultFormattedUptimeInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedUptimeInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedUptimeInfo(allocator, "Uptime", ascii.Yellow);
}
pub fn getFormattedUptimeInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedUptimeInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const uptime = try detection.system.getSystemUptime();
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {} days, {} hours, {} minutes ", .{ key_color, key, ascii.Reset, uptime.days, uptime.hours, uptime.minutes });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {} days, {} hours, {} minutes", .{ key_color, key, ascii.Reset, uptime.days, uptime.hours, uptime.minutes }) };
}
pub fn getDefaultFormattedPackagesInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedPackagesInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedPackagesInfo(allocator, "Packages", ascii.Yellow);
}
pub fn getFormattedPackagesInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedPackagesInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
if (builtin.os.tag == .macos) {
const packages_info = try detection.packages.getPackagesInfo(allocator);
defer allocator.free(packages_info);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s}{s}", .{ key_color, key, ascii.Reset, packages_info });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s}{s}", .{ key_color, key, ascii.Reset, packages_info }) };
} else if (builtin.os.tag == .linux) {
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} WIP", .{ key_color, key, ascii.Reset });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} WIP", .{ key_color, key, ascii.Reset }) };
}
}
pub fn getDefaultFormattedShellInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedShellInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedShellInfo(allocator, "Shell", ascii.Yellow);
}
pub fn getFormattedShellInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedShellInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const shell = try detection.user.getShell(allocator);
defer allocator.free(shell);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, shell[0..(shell.len - 1)] });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, shell[0..(shell.len - 1)] }) };
}
pub fn getDefaultFormattedCpuInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedCpuInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedCpuInfo(allocator, "Cpu", ascii.Yellow);
}
pub fn getFormattedCpuInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedCpuInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const cpu_info = try detection.hardware.getCpuInfo(allocator);
defer allocator.free(cpu_info.cpu_name);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s} ({}) @ {d:.2} GHz", .{ key_color, key, ascii.Reset, cpu_info.cpu_name, cpu_info.cpu_cores, cpu_info.cpu_max_freq });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s} ({}) @ {d:.2} GHz", .{ key_color, key, ascii.Reset, cpu_info.cpu_name, cpu_info.cpu_cores, cpu_info.cpu_max_freq }) };
}
pub fn getDefaultFormattedGpuInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedGpuInfo(allocator: std.mem.Allocator) !Result {
if (builtin.os.tag == .macos) {
return try getFormattedGpuInfo(allocator, "Gpu", ascii.Yellow);
} else if (builtin.os.tag == .linux) {
return try getFormattedGpuInfo(allocator, "Gpu", ascii.Yellow);
}
}
pub fn getFormattedGpuInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedGpuInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
if (builtin.os.tag == .macos) {
const gpu_info = try detection.hardware.getGpuInfo(allocator);
defer allocator.free(gpu_info.gpu_name);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s} ({}) @ {d:.2} GHz", .{ key_color, key, ascii.Reset, gpu_info.gpu_name, gpu_info.gpu_cores, gpu_info.gpu_freq });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s} ({}) @ {d:.2} GHz", .{ key_color, key, ascii.Reset, gpu_info.gpu_name, gpu_info.gpu_cores, gpu_info.gpu_freq }) };
} else if (builtin.os.tag == .linux) {
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} WIP", .{ key_color, key, ascii.Reset });
var formatted_gpu_info_list = std.array_list.Managed([]u8).init(allocator);
const gpu_info_list = try detection.hardware.getGpuInfo(allocator);
for (gpu_info_list.items) |g| {
var formatted_gpu_info: []u8 = undefined;
if ((g.gpu_cores == 0) or (g.gpu_freq == 0.0)) {
formatted_gpu_info = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, g.gpu_name });
} else {
formatted_gpu_info = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s} ({}) @ {d:.2} GHz", .{ key_color, key, ascii.Reset, g.gpu_name, g.gpu_cores, g.gpu_freq });
}
try formatted_gpu_info_list.append(formatted_gpu_info);
allocator.free(g.gpu_name);
}
gpu_info_list.deinit();
return Result{ .string_arraylist = formatted_gpu_info_list };
}
}
pub fn getDefaultFormattedRamInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedRamInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedRamInfo(allocator, "Ram", ascii.Yellow);
}
pub fn getFormattedRamInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedRamInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const ram_info = if (builtin.os.tag == .macos) try detection.hardware.getRamInfo() else if (builtin.os.tag == .linux) try detection.hardware.getRamInfo(allocator);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {d:.2} / {d:.2} GiB ({}%)", .{ key_color, key, ascii.Reset, ram_info.ram_usage, ram_info.ram_size, ram_info.ram_usage_percentage });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {d:.2} / {d:.2} GiB ({}%)", .{ key_color, key, ascii.Reset, ram_info.ram_usage, ram_info.ram_size, ram_info.ram_usage_percentage }) };
}
pub fn getDefaultFormattedSwapInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedSwapInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedSwapInfo(allocator, "Swap", ascii.Yellow);
}
pub fn getFormattedSwapInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedSwapInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const swap_info = if (builtin.os.tag == .macos) try detection.hardware.getSwapInfo() else if (builtin.os.tag == .linux) try detection.hardware.getSwapInfo(allocator);
if (swap_info) |s| {
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {d:.2} / {d:.2} GiB ({}%)", .{ key_color, key, ascii.Reset, s.swap_usage, s.swap_usage, s.swap_usage_percentage });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {d:.2} / {d:.2} GiB ({}%)", .{ key_color, key, ascii.Reset, s.swap_usage, s.swap_size, s.swap_usage_percentage }) };
} else {
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} Disabled", .{ key_color, key, ascii.Reset });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} Disabled", .{ key_color, key, ascii.Reset }) };
}
}
pub fn getDefaultFormattedDiskInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedDiskInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedDiskInfo(allocator, "Disk", ascii.Yellow);
}
pub fn getFormattedDiskInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedDiskInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const disk_info = try detection.hardware.getDiskSize("/");
return try std.fmt.allocPrint(allocator, "{s}{s} ({s}):{s} {d:.2} / {d:.2} GB ({}%)", .{ key_color, key, disk_info.disk_path, ascii.Reset, disk_info.disk_usage, disk_info.disk_size, disk_info.disk_usage_percentage });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s} ({s}):{s} {d:.2} / {d:.2} GB ({}%)", .{ key_color, key, disk_info.disk_path, ascii.Reset, disk_info.disk_usage, disk_info.disk_size, disk_info.disk_usage_percentage }) };
}
pub fn getDefaultFormattedTerminalNameInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedTerminalNameInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedTerminalNameInfo(allocator, "Terminal", ascii.Yellow);
}
pub fn getFormattedTerminalNameInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) ![]u8 {
pub fn getFormattedTerminalNameInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
const terminal_name = try detection.user.getTerminalName(allocator);
defer allocator.free(terminal_name);
return try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, terminal_name });
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}:{s} {s}", .{ key_color, key, ascii.Reset, terminal_name }) };
}
pub fn getDefaultFormattedNetInfo(allocator: std.mem.Allocator) ![]u8 {
pub fn getDefaultFormattedNetInfo(allocator: std.mem.Allocator) !Result {
return try getFormattedNetInfo(allocator, "Local IP", ascii.Yellow);
}
pub fn getFormattedNetInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !std.ArrayList([]u8) {
var formatted_net_info_list = std.ArrayList([]u8).init(allocator);
pub fn getFormattedNetInfo(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
var formatted_net_info_list = std.array_list.Managed([]u8).init(allocator);
var net_info_list = try detection.network.getNetInfo(allocator);
for (net_info_list.items) |n| {
@@ -178,5 +206,9 @@ pub fn getFormattedNetInfo(allocator: std.mem.Allocator, key: []const u8, key_co
}
net_info_list.deinit();
return formatted_net_info_list;
return Result{ .string_arraylist = formatted_net_info_list };
}
pub fn getFormattedCustom(allocator: std.mem.Allocator, key: []const u8, key_color: []const u8) !Result {
return Result{ .string = try std.fmt.allocPrint(allocator, "{s}{s}{s}", .{ key_color, key, ascii.Reset }) };
}

View File

@@ -1,6 +1,7 @@
const std = @import("std");
const c_unistd = @cImport(@cInclude("unistd.h"));
const c_statvfs = @cImport(@cInclude("sys/statvfs.h"));
const c_libpci = @cImport(@cInclude("pci/pci.h"));
/// Struct representing CPU informations
pub const CpuInfo = struct {
@@ -9,6 +10,13 @@ pub const CpuInfo = struct {
cpu_max_freq: f32,
};
/// Struct representing GPU informations
pub const GpuInfo = struct {
gpu_name: []u8,
gpu_cores: i32,
gpu_freq: f64,
};
/// Struct representing RAM usage informations
pub const RamInfo = struct {
ram_size: f64,
@@ -43,6 +51,7 @@ pub fn getCpuInfo(allocator: std.mem.Allocator) !CpuInfo {
// Parsing /proc/cpuinfo
var model_name: ?[]const u8 = null;
var cpu_max_freq_mhz_str: ?[]const u8 = null;
var lines = std.mem.splitScalar(u8, cpuinfo_data, '\n');
while (lines.next()) |line| {
@@ -52,14 +61,36 @@ pub fn getCpuInfo(allocator: std.mem.Allocator) !CpuInfo {
_ = parts.next(); // discards the key
if (parts.next()) |value| {
model_name = std.mem.trim(u8, value, " ");
break;
}
} else if (std.mem.startsWith(u8, trimmed, "cpu MHz") and cpu_max_freq_mhz_str == null) {
var parts = std.mem.splitScalar(u8, trimmed, ':');
_ = parts.next(); // discard the key
if (parts.next()) |value| {
cpu_max_freq_mhz_str = std.mem.trim(u8, value, " ");
}
}
// Reads /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq
if ((model_name != null) and (cpu_max_freq_mhz_str != null)) {
break;
}
}
var cpu_max_freq: f32 = 0.0;
const cpuinfo_max_freq_path = "/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq";
var cmf_exists: bool = true;
// Checks if /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq exists
_ = std.fs.accessAbsolute(cpuinfo_max_freq_path, .{ .mode = .read_only }) catch |err| {
if (err == std.posix.AccessError.FileNotFound) {
cmf_exists = false;
}
};
if (cmf_exists) {
// Reads /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq
var file2 = try std.fs.cwd().openFile(cpuinfo_max_freq_path, .{});
defer file2.close();
const cpuinfo_max_freq_data = try file2.readToEndAlloc(allocator, std.math.maxInt(usize));
defer allocator.free(cpuinfo_max_freq_data);
@@ -67,7 +98,13 @@ pub fn getCpuInfo(allocator: std.mem.Allocator) !CpuInfo {
// Parsing /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq
const trimmed = std.mem.trim(u8, cpuinfo_max_freq_data, " \n\r");
const cpu_max_freq_khz: f32 = try std.fmt.parseFloat(f32, trimmed);
const cpu_max_freq: f32 = cpu_max_freq_khz / 1_000_000;
cpu_max_freq = cpu_max_freq_khz / 1_000_000;
} else {
if (cpu_max_freq_mhz_str != null) {
const cpu_max_freq_mhz: f32 = try std.fmt.parseFloat(f32, cpu_max_freq_mhz_str.?);
cpu_max_freq = cpu_max_freq_mhz / 1_000;
}
}
return CpuInfo{
.cpu_name = try allocator.dupe(u8, model_name orelse "Unknown"),
@@ -76,6 +113,93 @@ pub fn getCpuInfo(allocator: std.mem.Allocator) !CpuInfo {
};
}
pub fn getGpuInfo(allocator: std.mem.Allocator) !std.array_list.Managed(GpuInfo) {
var gpu_info_list = std.array_list.Managed(GpuInfo).init(allocator);
const display_controller = 0x03;
const pacc = c_libpci.pci_alloc();
defer c_libpci.pci_cleanup(pacc);
c_libpci.pci_init(pacc);
c_libpci.pci_scan_bus(pacc);
var devices = pacc.*.devices;
while (devices != null) : (devices = devices.*.next) {
// NOTE: for references: https://github.com/pciutils/pciutils/blob/3ec74c71c01878f92e751f15bb8febe720c3ab40/lib/access.c#L194
const known_fields = c_libpci.pci_fill_info(devices, c_libpci.PCI_FILL_IDENT | c_libpci.PCI_FILL_CLASS);
if (known_fields <= 0) {
return error.NoLibpciFieldsFound;
}
if ((devices.*.device_class >> 8) == display_controller) {
var name_buffer: [256]u8 = undefined;
const name = c_libpci.pci_lookup_name(
pacc,
&name_buffer,
name_buffer.len,
c_libpci.PCI_LOOKUP_VENDOR | c_libpci.PCI_LOOKUP_DEVICE,
devices.*.vendor_id,
devices.*.device_id,
);
const gpu_name = try allocator.dupe(u8, std.mem.span(name));
const maybe_parsed_gpu_name = try parseGpuName(allocator, gpu_name);
var parsed_gpu_name: []u8 = undefined;
if (maybe_parsed_gpu_name != null) {
allocator.free(gpu_name);
parsed_gpu_name = maybe_parsed_gpu_name.?;
} else {
parsed_gpu_name = gpu_name;
}
try gpu_info_list.append(GpuInfo{
.gpu_name = parsed_gpu_name,
.gpu_cores = 0,
.gpu_freq = 0.0,
});
}
}
if (gpu_info_list.items.len == 0) {
try gpu_info_list.append(GpuInfo{
.gpu_name = try allocator.dupe(u8, "Unknown"),
.gpu_cores = 0,
.gpu_freq = 0.0,
});
}
return gpu_info_list;
}
fn parseGpuName(allocator: std.mem.Allocator, name: []u8) !?[]u8 {
// NOTE: for references: https://github.com/pciutils/pciutils/blob/master/pci.ids
if (std.mem.startsWith(u8, name, "Advanced Micro Devices, Inc. [AMD/ATI]")) {
const size = std.mem.replacementSize(u8, name, "Advanced Micro Devices, Inc. [AMD/ATI]", "AMD");
const parsed_gpu_name = try allocator.alloc(u8, size);
_ = std.mem.replace(u8, name, "Advanced Micro Devices, Inc. [AMD/ATI]", "AMD", parsed_gpu_name);
return parsed_gpu_name;
} else if (std.mem.startsWith(u8, name, "Intel Corporation")) {
const size = std.mem.replacementSize(u8, name, "Intel Corporation", "Intel");
const parsed_gpu_name = try allocator.alloc(u8, size);
_ = std.mem.replace(u8, name, "Intel Corporation", "Intel", parsed_gpu_name);
return parsed_gpu_name;
} else if (std.mem.startsWith(u8, name, "NVIDIA Corporation")) {
const size = std.mem.replacementSize(u8, name, "NVIDIA Corporation", "NVIDIA");
const parsed_gpu_name = try allocator.alloc(u8, size);
_ = std.mem.replace(u8, name, "NVIDIA Corporation", "NVIDIA", parsed_gpu_name);
return parsed_gpu_name;
}
return null;
}
pub fn getRamInfo(allocator: std.mem.Allocator) !RamInfo {
// Reads /proc/meminfo
const meminfo_path = "/proc/meminfo";
@@ -203,7 +327,7 @@ pub fn getDiskSize(disk_path: []const u8) !DiskInfo {
}
const total_size = stat.f_blocks * stat.f_frsize;
const free_size = stat.f_bavail * stat.f_frsize;
const free_size = stat.f_bfree * stat.f_frsize;
const used_size = total_size - free_size;
const used_size_percentage = (used_size * 100) / total_size;

View File

@@ -11,8 +11,8 @@ pub const NetInfo = struct {
ipv4_addr: []u8,
};
pub fn getNetInfo(allocator: std.mem.Allocator) !std.ArrayList(NetInfo) {
var net_info_list = std.ArrayList(NetInfo).init(allocator);
pub fn getNetInfo(allocator: std.mem.Allocator) !std.array_list.Managed(NetInfo) {
var net_info_list = std.array_list.Managed(NetInfo).init(allocator);
var ifap: ?*c_ifaddrs.ifaddrs = null;
if (c_ifaddrs.getifaddrs(&ifap) != 0) {

View File

@@ -70,8 +70,8 @@ pub fn getKernelInfo(allocator: std.mem.Allocator) !KernelInfo {
}
return KernelInfo{
.kernel_name = try allocator.dupe(u8, &uts.sysname),
.kernel_release = try allocator.dupe(u8, &uts.release),
.kernel_name = try allocator.dupe(u8, std.mem.sliceTo(&uts.sysname, 0)),
.kernel_release = try allocator.dupe(u8, std.mem.sliceTo(&uts.release, 0)),
};
}

View File

@@ -6,26 +6,38 @@ pub fn getUsername(allocator: std.mem.Allocator) ![]u8 {
}
pub fn getShell(allocator: std.mem.Allocator) ![]u8 {
const shell = try std.process.getEnvVarOwned(allocator, "SHELL");
const shell = std.process.getEnvVarOwned(allocator, "SHELL") catch |err| if (err == error.EnvironmentVariableNotFound) {
return allocator.dupe(u8, "Unknown");
} else return err;
var child = std.process.Child.init(&[_][]const u8{ shell, "--version" }, allocator);
defer allocator.free(shell);
child.stdout_behavior = .Pipe;
child.stderr_behavior = .Pipe;
const result = try std.process.Child.run(.{ .allocator = allocator, .argv = &[_][]const u8{ shell, "--version" } });
const result_stdout = result.stdout;
try child.spawn();
if (std.mem.indexOf(u8, shell, "bash") != null) {
const bash_version = parseBashVersion(result_stdout);
defer allocator.free(result_stdout);
return try std.fmt.allocPrint(allocator, "{s} {s}", .{ "bash", bash_version.? });
}
const output = try child.stdout.?.reader().readAllAlloc(allocator, 1024 * 1024);
return result_stdout;
}
_ = try child.wait();
fn parseBashVersion(shell_version_output: []u8) ?[]u8 {
const end_index = std.mem.indexOf(u8, shell_version_output, "(");
if (end_index == null) return null;
return output;
const version_keyword = "version ";
const version_keyword_index = std.mem.indexOf(u8, shell_version_output[0..end_index.?], version_keyword);
if (version_keyword_index == null) return null;
return shell_version_output[version_keyword_index.? + version_keyword.len .. end_index.?];
}
pub fn getTerminalName(allocator: std.mem.Allocator) ![]u8 {
const term_progrm = std.process.getEnvVarOwned(allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
const term_program = std.process.getEnvVarOwned(allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
return allocator.dupe(u8, "Unknown");
} else return err;
return term_progrm;
return term_program;
}

View File

@@ -236,7 +236,7 @@ pub fn getGpuInfo(allocator: std.mem.Allocator) !GpuInfo {
if (c_iokit.CFDictionaryGetValueIfPresent(@as(c_iokit.CFDictionaryRef, @ptrCast(properties_ptr)), model_key, &name_ref) == c_iokit.TRUE) {
if (c_iokit.CFGetTypeID(name_ref) == c_iokit.CFStringGetTypeID()) {
const accel_name = utils.cfStringToZigString(allocator, @as(c_iokit.CFStringRef, @ptrCast(name_ref))) catch {
const accel_name = utils.cfTypeRefToZigString(allocator, name_ref) catch {
return gpu_info;
};
@@ -418,7 +418,7 @@ pub fn getDiskSize(disk_path: []const u8) !DiskInfo {
}
const total_size = stat.f_blocks * stat.f_frsize;
const free_size = stat.f_bavail * stat.f_frsize;
const free_size = stat.f_bfree * stat.f_frsize;
const used_size = total_size - free_size;
const used_size_percentage = (used_size * 100) / total_size;

View File

@@ -11,8 +11,8 @@ pub const NetInfo = struct {
ipv4_addr: []u8,
};
pub fn getNetInfo(allocator: std.mem.Allocator) !std.ArrayList(NetInfo) {
var net_info_list = std.ArrayList(NetInfo).init(allocator);
pub fn getNetInfo(allocator: std.mem.Allocator) !std.array_list.Managed(NetInfo) {
var net_info_list = std.array_list.Managed(NetInfo).init(allocator);
var ifap: ?*c_ifaddrs.ifaddrs = null;
if (c_ifaddrs.getifaddrs(&ifap) != 0) {

View File

@@ -2,34 +2,25 @@ const std = @import("std");
const utils = @import("utils.zig");
pub fn getPackagesInfo(allocator: std.mem.Allocator) ![]const u8 {
var packages_info = std.ArrayList(u8).init(allocator);
var packages_info = std.array_list.Managed(u8).init(allocator);
defer packages_info.deinit();
const homebrew_packages = countHomebrewPackages() catch |err| if (err == error.FileNotFound) 0 else return err;
const homebrew_casks = countHomebrewCasks() catch |err| if (err == error.FileNotFound) 0 else return err;
const macports_packages = countMacportPackages() catch |err| if (err == error.FileNotFound) 0 else return err;
var buffer: [10]u8 = undefined;
var fbs = std.io.fixedBufferStream(&buffer);
var buffer: [32]u8 = undefined;
if (homebrew_packages > 0) {
try std.fmt.formatInt(homebrew_packages, 10, .lower, .{}, fbs.writer());
try packages_info.appendSlice(" brew: ");
try packages_info.appendSlice(fbs.getWritten());
try packages_info.appendSlice(try std.fmt.bufPrint(&buffer, " brew: {d}", .{homebrew_packages}));
}
if (homebrew_casks > 0) {
fbs.reset();
try std.fmt.formatInt(homebrew_casks, 10, .lower, .{}, fbs.writer());
try packages_info.appendSlice(" brew-cask: ");
try packages_info.appendSlice(fbs.getWritten());
try packages_info.appendSlice(try std.fmt.bufPrint(&buffer, " brew-cask: {d}", .{homebrew_casks}));
}
if (macports_packages > 0) {
fbs.reset();
try std.fmt.formatInt(macports_packages, 10, .lower, .{}, fbs.writer());
try packages_info.appendSlice(" macports: ");
try packages_info.appendSlice(fbs.getWritten());
try packages_info.appendSlice(try std.fmt.bufPrint(&buffer, " macports: {d}", .{macports_packages}));
}
return try allocator.dupe(u8, packages_info.items);

View File

@@ -9,26 +9,38 @@ pub fn getUsername(allocator: std.mem.Allocator) ![]u8 {
}
pub fn getShell(allocator: std.mem.Allocator) ![]u8 {
const shell = try std.process.getEnvVarOwned(allocator, "SHELL");
const shell = std.process.getEnvVarOwned(allocator, "SHELL") catch |err| if (err == error.EnvironmentVariableNotFound) {
return allocator.dupe(u8, "Unknown");
} else return err;
var child = std.process.Child.init(&[_][]const u8{ shell, "--version" }, allocator);
defer allocator.free(shell);
child.stdout_behavior = .Pipe;
child.stderr_behavior = .Pipe;
const result = try std.process.Child.run(.{ .allocator = allocator, .argv = &[_][]const u8{ shell, "--version" } });
const result_stdout = result.stdout;
try child.spawn();
if (std.mem.indexOf(u8, shell, "bash") != null) {
const bash_version = parseBashVersion(result_stdout);
defer allocator.free(result_stdout);
return try std.fmt.allocPrint(allocator, "{s} {s}", .{ "bash", bash_version.? });
}
const output = try child.stdout.?.reader().readAllAlloc(allocator, 1024 * 1024);
return result_stdout;
}
_ = try child.wait();
fn parseBashVersion(shell_version_output: []u8) ?[]u8 {
const end_index = std.mem.indexOf(u8, shell_version_output, "(");
if (end_index == null) return null;
return output;
const version_keyword = "version ";
const version_keyword_index = std.mem.indexOf(u8, shell_version_output[0..end_index.?], version_keyword);
if (version_keyword_index == null) return null;
return shell_version_output[version_keyword_index.? + version_keyword.len .. end_index.?];
}
pub fn getTerminalName(allocator: std.mem.Allocator) ![]u8 {
const term_progrm = std.process.getEnvVarOwned(allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
const term_program = std.process.getEnvVarOwned(allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
return allocator.dupe(u8, "Unknown");
} else return err;
return term_progrm;
return term_program;
}

View File

@@ -1,8 +1,10 @@
const std = @import("std");
const c_iokit = @cImport(@cInclude("IOKit/IOKitLib.h"));
/// Converts a CFString to a Zig string.
pub fn cfStringToZigString(allocator: std.mem.Allocator, cf_string: c_iokit.CFStringRef) ![]u8 {
/// Converts a CFTypeRef casted to CFStringRef to a Zig string.
pub fn cfTypeRefToZigString(allocator: std.mem.Allocator, cf_type_ref: c_iokit.CFTypeRef) ![]u8 {
const cf_string: c_iokit.CFStringRef = @ptrFromInt(@intFromPtr(cf_type_ref));
const length = c_iokit.CFStringGetLength(cf_string);
const max_size = c_iokit.CFStringGetMaximumSizeForEncoding(length, c_iokit.kCFStringEncodingUTF8) + 1;
const max_size_usize = @as(usize, @intCast(max_size));

View File

@@ -10,7 +10,7 @@ pub fn main() !void {
const allocator = gpa.allocator();
defer _ = gpa.deinit();
var sys_info_list = std.ArrayList([]u8).init(allocator);
var sys_info_list = std.array_list.Managed([]u8).init(allocator);
defer sys_info_list.deinit();
errdefer {
@@ -43,8 +43,15 @@ pub fn main() !void {
try sys_info_list.append(separtor_buffer);
if (modules_types.items.len == 0) {
inline for (0..formatters.formatters.len) |i| {
try sys_info_list.append(try formatters.default_formatters[i](allocator));
inline for (0..formatters.default_formatters.len) |i| {
const result = try formatters.default_formatters[i](allocator);
switch (result) {
.string => |r| try sys_info_list.append(r),
.string_arraylist => |r| {
defer r.deinit();
try sys_info_list.appendSlice(r.items);
},
}
}
} else if (conf) |c| {
for (modules_types.items, c.value.modules) |module_type, module| {
@@ -52,16 +59,14 @@ pub fn main() !void {
const rgb = try ascii.hexColorToRgb(module.key_color);
const key_color = try std.fmt.bufPrint(&buf, "\x1b[38;2;{d};{d};{d}m", .{ rgb.r, rgb.g, rgb.b });
if (module_type == config.ModuleType.net) {
var formatted_net_info_list = try formatters.getFormattedNetInfo(allocator, module.key, key_color);
defer formatted_net_info_list.deinit();
try sys_info_list.appendSlice(formatted_net_info_list.items);
continue;
const result = try formatters.formatters[@intFromEnum(module_type)](allocator, module.key, key_color);
switch (result) {
.string => |r| try sys_info_list.append(r),
.string_arraylist => |r| {
defer r.deinit();
try sys_info_list.appendSlice(r.items);
},
}
try sys_info_list.append(try formatters.formatters[@intFromEnum(module_type)](allocator, module.key, key_color));
}
}

116
src/utils.zig Normal file
View File

@@ -0,0 +1,116 @@
const std = @import("std");
const builtin = @import("builtin");
pub const TermSize = struct {
width: u16,
height: u16,
};
pub fn getTerminalSize() !TermSize {
// https://github.com/softprops/zig-termsize (https://github.com/softprops/zig-termsize/blob/main/src/main.zig)
const stdout = std.fs.File.stdout();
switch (builtin.os.tag) {
.windows => {
var buf: std.os.windows.CONSOLE_SCREEN_BUFFER_INFO = undefined;
switch (std.os.windows.kernel32.GetConsoleScreenBufferInfo(stdout.handle, &buf)) {
std.os.windows.TRUE => return TermSize{
.width = @intCast(buf.srWindow.Right - buf.srWindow.Left + 1),
.height = @intCast(buf.srWindow.Bottom - buf.srWindow.Top + 1),
},
else => return error.GetConsoleScreenBufferInfoFailed,
}
},
.linux, .macos => {
var buf: std.posix.winsize = undefined;
switch (std.posix.errno(
std.posix.system.ioctl(
stdout.handle,
std.posix.T.IOCGWINSZ,
@intFromPtr(&buf),
),
)) {
std.posix.E.SUCCESS => return TermSize{
.width = buf.col,
.height = buf.row,
},
else => return error.IoctlFailed,
}
},
else => return error.UnsupportedOperatingSystem,
}
}
test "getTerminalSize" {
const terminal_size = try getTerminalSize();
std.debug.print("Height: {}, Width {}\n", .{ terminal_size.height, terminal_size.width });
try std.testing.expect((terminal_size.height > 0) and (terminal_size.width > 0));
}
pub fn getLongestSysInfoStringLen(strings: []const []const u8) usize {
const ansi_reset = "\x1b[0m";
var longest_len: usize = 0;
// Ignore the username@host and the separator
for (strings[2..]) |s| {
const ansi_restet_index = std.mem.indexOf(u8, s, ansi_reset);
var start: usize = 0;
if (ansi_restet_index != null) {
// `start` is the index of the last character of the ANSI reset escape sequence + 1
start = ansi_restet_index.? + ansi_reset.len + 1;
if (start > s.len) continue;
}
longest_len = @max(longest_len, s[start..].len);
}
return longest_len;
}
test "getLongestSysInfoStringLen" {
const strings = [_][]const u8{ "", "", "test", "test-test", "test1" };
try std.testing.expectEqual(strings[3].len, getLongestSysInfoStringLen(strings[0..]));
}
pub fn countCodepoints(str: []const u8) !usize {
var count: usize = 0;
var i: usize = 0;
while (i < str.len) {
const byte_len = try std.unicode.utf8ByteSequenceLength(str[i]);
if ((i + byte_len > str.len) or (!std.unicode.utf8ValidateSlice(str[i .. i + byte_len]))) return error.InvalidUtf8;
count += 1;
i += byte_len;
}
return count;
}
test "countCodepoints" {
const str = " ████████████████";
try std.testing.expectEqual(28, try countCodepoints(str));
}
pub fn getLongestAsciiArtRowLen(ascii_art: []const []const u8) !usize {
var longest_len: usize = 0;
for (ascii_art) |ascii_row| {
longest_len = @max(longest_len, try countCodepoints(ascii_row));
}
return longest_len;
}
test "getLongestAsciiArtRowLen" {
const rows = [_][]const u8{ " ████████████████", "██░░░░██████████░░ ░░██████████░░░░██" };
try std.testing.expectEqual(40, try getLongestAsciiArtRowLen(rows[0..]));
}