11 Commits

Author SHA1 Message Date
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
6 changed files with 44 additions and 2 deletions

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.8.1",
.version = "0.10.0",
// Together with name, this represents a globally unique package
// identifier. This field is generated by the Zig toolchain when the

View File

@@ -26,6 +26,7 @@ pub const ModuleType = enum {
net,
terminal,
locale,
custom,
};
pub fn getModulesTypes(allocator: std.mem.Allocator, config: ?std.json.Parsed(Config)) !std.ArrayList(ModuleType) {

View File

@@ -22,6 +22,7 @@ pub const formatters = [_]*const fn (allocator: std.mem.Allocator, key: []const
&getFormattedNetInfo,
&getFormattedTerminalNameInfo,
&getFormattedLocaleInfo,
&getFormattedCustom,
};
pub const default_formatters = [_]*const fn (allocator: std.mem.Allocator) anyerror!Result{
@@ -207,3 +208,7 @@ pub fn getFormattedNetInfo(allocator: std.mem.Allocator, key: []const u8, key_co
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

@@ -22,9 +22,26 @@ pub fn getShell(allocator: std.mem.Allocator) ![]u8 {
_ = try child.wait();
if (std.mem.indexOf(u8, shell, "bash") != null) {
const bash_version = parseBashVersion(output);
defer allocator.free(output);
return try std.fmt.allocPrint(allocator, "{s} {s}", .{ "bash", bash_version.? });
}
return output;
}
fn parseBashVersion(shell_version_output: []u8) ?[]u8 {
const end_index = std.mem.indexOf(u8, shell_version_output, "(");
if (end_index == null) return null;
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_program = std.process.getEnvVarOwned(allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
return allocator.dupe(u8, "Unknown");

View File

@@ -25,9 +25,26 @@ pub fn getShell(allocator: std.mem.Allocator) ![]u8 {
_ = try child.wait();
if (std.mem.indexOf(u8, shell, "bash") != null) {
const bash_version = parseBashVersion(output);
defer allocator.free(output);
return try std.fmt.allocPrint(allocator, "{s} {s}", .{ "bash", bash_version.? });
}
return output;
}
fn parseBashVersion(shell_version_output: []u8) ?[]u8 {
const end_index = std.mem.indexOf(u8, shell_version_output, "(");
if (end_index == null) return null;
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_program = std.process.getEnvVarOwned(allocator, "TERM_PROGRAM") catch |err| if (err == error.EnvironmentVariableNotFound) {
return allocator.dupe(u8, "Unknown");

View File

@@ -9,7 +9,7 @@ pub const TermSize = struct {
pub fn getTerminalSize() !TermSize {
// https://github.com/softprops/zig-termsize (https://github.com/softprops/zig-termsize/blob/main/src/main.zig)
const stdout = std.io.getStdIn();
const stdout = std.io.getStdOut();
switch (builtin.os.tag) {
.windows => {
@@ -62,6 +62,8 @@ pub fn getLongestSysInfoStringLen(strings: []const []const u8) usize {
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);