Merge pull request #13 from utox39/feat/custom-ascii

Feat/custom ascii

README.md

@@ -1,5 +1,12 @@
 # Zigfetch
 
+![Zig](https://img.shields.io/badge/Zig-%23F7A41D.svg?style=flat&logo=zig&logoColor=white)
+![GitHub Release](https://img.shields.io/github/v/release/utox39/zigfetch)
+![macOS](https://img.shields.io/badge/mac%20os-000000?style=flat&logo=macos&logoColor=F0F0F0)
+![Linux](https://img.shields.io/badge/Linux-FCC624?style=flat&logo=linux&logoColor=black)
+
+---
+
 -   [Description](#description)
 -   [Requirements](#requirements)
 -   [Installation](#installation)

build.zig.zon

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

src/ascii.zig

@@ -65,18 +65,23 @@ 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.array_list.Managed([]u8)) !void {
+pub fn printAsciiAndModules(allocator: std.mem.Allocator, ascii_art_path: ?[]u8, 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 ascii_art_data: []const u8 = undefined;
-    // var file = try std.fs.cwd().openFile(ascii_art_path, .{});
+    if (ascii_art_path) |ascii| {
-    // defer file.close();
+        var ascii_file = try std.fs.cwd().openFile(ascii, .{});
-    // const ascii_art_data = try file.readToEndAlloc(allocator, std.math.maxInt(usize));
+        defer ascii_file.close();
-    // defer allocator.free(ascii_art_data);
+        ascii_art_data = try ascii_file.readToEndAlloc(allocator, std.math.maxInt(usize));
+    } else {
+        ascii_art_data = @embedFile("./assets/ascii/guy_fawks.txt");
+    }
 
-    const ascii_art_data = @embedFile("./assets/ascii/guy_fawks.txt");
+    defer if (ascii_art_path != null) {
+        allocator.free(ascii_art_data);
+    };
 
     var lines = std.mem.splitScalar(u8, ascii_art_data, '\n');
 
@@ -110,7 +115,7 @@ pub fn printAscii(allocator: std.mem.Allocator, sys_info_list: std.array_list.Ma
     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);
+            const alignment_buffer = try allocator.alloc(u8, if (i < ascii_art_len) longest_ascii_art_row_len - (try utils.countCodepoints(ascii_art_items[i])) + spacing else longest_ascii_art_row_len + spacing);
             @memset(alignment_buffer, ' ');
 
             if (i < ascii_art_len) {

src/config.zig

@@ -9,6 +9,7 @@ pub const Module = struct {
 };
 
 pub const Config = struct {
+    ascii_abs_path: ?[]u8 = null,
     modules: []Module,
 };
 
@@ -29,6 +30,10 @@ pub const ModuleType = enum {
     custom,
 };
 
+pub fn getAsciiPath(config: ?std.json.Parsed(Config)) ?[]u8 {
+    return config.?.value.ascii_abs_path;
+}
+
 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);
 

src/main.zig

@@ -10,11 +10,11 @@ pub fn main() !void {
     const allocator = gpa.allocator();
     defer _ = gpa.deinit();
 
-    var sys_info_list = std.array_list.Managed([]u8).init(allocator);
+    var modules_list = std.array_list.Managed([]u8).init(allocator);
-    defer sys_info_list.deinit();
+    defer modules_list.deinit();
 
     errdefer {
-        for (sys_info_list.items) |info| {
+        for (modules_list.items) |info| {
             allocator.free(info);
         }
     }
@@ -27,7 +27,7 @@ pub fn main() !void {
 
     const username = try detection.user.getUsername(allocator);
     const hostname = try detection.system.getHostname(allocator);
-    try sys_info_list.append(try std.fmt.allocPrint(allocator, "{s}{s}{s}@{s}{s}{s}", .{
+    try modules_list.append(try std.fmt.allocPrint(allocator, "{s}{s}{s}@{s}{s}{s}", .{
         ascii.Yellow,
         username,
         ascii.Reset,
@@ -40,16 +40,16 @@ pub fn main() !void {
 
     const separtor_buffer = try allocator.alloc(u8, username.len + hostname.len + 1);
     @memset(separtor_buffer, '-');
-    try sys_info_list.append(separtor_buffer);
+    try modules_list.append(separtor_buffer);
 
     if (modules_types.items.len == 0) {
         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 => |r| try modules_list.append(r),
                 .string_arraylist => |r| {
                     defer r.deinit();
-                    try sys_info_list.appendSlice(r.items);
+                    try modules_list.appendSlice(r.items);
                 },
             }
         }
@@ -61,14 +61,14 @@ pub fn main() !void {
 
             const result = try formatters.formatters[@intFromEnum(module_type)](allocator, module.key, key_color);
             switch (result) {
-                .string => |r| try sys_info_list.append(r),
+                .string => |r| try modules_list.append(r),
                 .string_arraylist => |r| {
                     defer r.deinit();
-                    try sys_info_list.appendSlice(r.items);
+                    try modules_list.appendSlice(r.items);
                 },
             }
         }
     }
 
-    try ascii.printAscii(allocator, sys_info_list);
+    try ascii.printAsciiAndModules(allocator, config.getAsciiPath(conf), modules_list);
 }