refactor(linux-packages): use new Io and Environ

This commit is contained in:
utox39
2026-02-12 20:28:56 +01:00
parent e9f34fa62d
commit 3c909aff0e

View File

@@ -1,15 +1,15 @@
const std = @import("std"); const std = @import("std");
const utils = @import("../utils.zig"); const utils = @import("../utils.zig");
pub fn getPackagesInfo(allocator: std.mem.Allocator) ![]const u8 { pub fn getPackagesInfo(allocator: std.mem.Allocator, io: std.Io, environ: std.process.Environ) ![]const u8 {
var packages_info = std.array_list.Managed(u8).init(allocator); var packages_info = std.array_list.Managed(u8).init(allocator);
defer packages_info.deinit(); defer packages_info.deinit();
const flatpak_packages = countFlatpakPackages() catch |err| if (err == error.FileNotFound) 0 else return err; const flatpak_packages = countFlatpakPackages(io) catch |err| if (err == error.FileNotFound) 0 else return err;
const nix_packages = countNixPackages(allocator) catch 0; const nix_packages = countNixPackages(allocator, io, environ) catch 0;
const dpkg_packages = countDpkgPackages(allocator) catch |err| if (err == error.FileNotFound) 0 else return err; const dpkg_packages = countDpkgPackages(allocator, io) catch |err| if (err == error.FileNotFound) 0 else return err;
const pacman_packages = countPacmanPackages() catch |err| if (err == error.FileNotFound) 0 else return err; const pacman_packages = countPacmanPackages(io) catch |err| if (err == error.FileNotFound) 0 else return err;
const xbps_packages = countXbpsPackages(allocator) catch |err| if (err == error.FileNotFound) 0 else return err; const xbps_packages = countXbpsPackages(allocator, io) catch |err| if (err == error.FileNotFound) 0 else return err;
var buffer: [32]u8 = undefined; var buffer: [32]u8 = undefined;
@@ -36,29 +36,29 @@ pub fn getPackagesInfo(allocator: std.mem.Allocator) ![]const u8 {
return try allocator.dupe(u8, packages_info.items); return try allocator.dupe(u8, packages_info.items);
} }
fn countFlatpakPackages() !usize { fn countFlatpakPackages(io: std.Io) !usize {
const flatpak_apps = try countFlatpakApps(); const flatpak_apps = try countFlatpakApps(io);
const flatpak_runtimes = try countFlatpakRuntimes(); const flatpak_runtimes = try countFlatpakRuntimes(io);
return flatpak_apps + flatpak_runtimes; return flatpak_apps + flatpak_runtimes;
} }
fn countFlatpakApps() !usize { fn countFlatpakApps(io: std.Io) !usize {
var dir = try std.fs.openDirAbsolute("/var/lib/flatpak/app/", .{ .iterate = true }); var dir = try std.Io.Dir.openDirAbsolute(io, "/var/lib/flatpak/app/", .{ .iterate = true });
defer dir.close(); defer dir.close(io);
var iter = dir.iterate(); var iter = dir.iterate();
var count: usize = 0; var count: usize = 0;
while (try iter.next()) |e| { while (try iter.next(io)) |e| {
if (e.kind != .directory) continue; if (e.kind != .directory) continue;
var sub_dir = try dir.openDir(e.name, .{}); var sub_dir = try dir.openDir(io, e.name, .{});
defer sub_dir.close(); defer sub_dir.close(io);
var current = sub_dir.openDir("current", .{}) catch continue; var current = sub_dir.openDir(io, "current", .{}) catch continue;
defer current.close(); defer current.close(io);
// If `current` was opened successfully, increment the count // If `current` was opened successfully, increment the count
count += 1; count += 1;
@@ -67,27 +67,27 @@ fn countFlatpakApps() !usize {
return count; return count;
} }
fn countFlatpakRuntimes() !usize { fn countFlatpakRuntimes(io: std.Io) !usize {
var dir = try std.fs.openDirAbsolute("/var/lib/flatpak/runtime/", .{ .iterate = true }); var dir = try std.Io.Dir.openDirAbsolute(io, "/var/lib/flatpak/runtime/", .{ .iterate = true });
defer dir.close(); defer dir.close(io);
var iter = dir.iterate(); var iter = dir.iterate();
var counter: usize = 0; var counter: usize = 0;
while (try iter.next()) |e| { while (try iter.next(io)) |e| {
if (std.mem.endsWith(u8, e.name, ".Locale") or std.mem.endsWith(u8, e.name, ".Debug")) continue; if (std.mem.endsWith(u8, e.name, ".Locale") or std.mem.endsWith(u8, e.name, ".Debug")) continue;
var arch_dir = try dir.openDir(e.name, .{ .iterate = true }); var arch_dir = try dir.openDir(io, e.name, .{ .iterate = true });
defer arch_dir.close(); defer arch_dir.close(io);
var arch_iter = arch_dir.iterate(); var arch_iter = arch_dir.iterate();
while (try arch_iter.next()) |arch_e| { while (try arch_iter.next(io)) |arch_e| {
if (arch_e.kind != .directory) continue; if (arch_e.kind != .directory) continue;
var sub_dir = try arch_dir.openDir(arch_e.name, .{ .iterate = true }); var sub_dir = try arch_dir.openDir(io, arch_e.name, .{ .iterate = true });
defer sub_dir.close(); defer sub_dir.close(io);
var sub_iter = sub_dir.iterate(); var sub_iter = sub_dir.iterate();
while (try sub_iter.next()) |_| { while (try sub_iter.next(io)) |_| {
counter += 1; counter += 1;
} }
} }
@@ -96,9 +96,9 @@ fn countFlatpakRuntimes() !usize {
return counter; return counter;
} }
fn countNixPackages(allocator: std.mem.Allocator) !usize { fn countNixPackages(allocator: std.mem.Allocator, io: std.Io, environ: std.process.Environ) !usize {
// `/run/current-system` is a sym-link, so we need to obtein the real path // `/run/current-system` is a sym-link, so we need to obtein the real path
const real_path = try std.fs.realpathAlloc(allocator, "/run/current-system"); const real_path = try std.Io.Dir.realPathFileAbsoluteAlloc(io, "/run/current-system", allocator);
defer allocator.free(real_path); defer allocator.free(real_path);
var hash: [32]u8 = undefined; var hash: [32]u8 = undefined;
@@ -109,10 +109,10 @@ fn countNixPackages(allocator: std.mem.Allocator) !usize {
var count: usize = 0; var count: usize = 0;
// Inspired by https://github.com/fastfetch-cli/fastfetch/blob/608382109cda6623e53f318e8aced54cf8e5a042/src/detection/packages/packages_nix.c#L81 // Inspired by https://github.com/fastfetch-cli/fastfetch/blob/608382109cda6623e53f318e8aced54cf8e5a042/src/detection/packages/packages_nix.c#L81
count = checkNixCache(allocator, hash_hex) catch |err| switch (err) { count = checkNixCache(allocator, io, environ, hash_hex) catch |err| switch (err) {
error.FileNotFound, error.InvalidCache => { error.FileNotFound, error.InvalidCache => {
// nix-store --query --requisites /run/current-system | wc -l // nix-store --query --requisites /run/current-system | wc -l
const result = try std.process.Child.run(.{ .allocator = allocator, .argv = &[_][]const u8{ const result = try std.process.run(allocator, io, .{ .argv = &[_][]const u8{
"sh", "sh",
"-c", "-c",
"nix-store --query --requisites /run/current-system | wc -l", "nix-store --query --requisites /run/current-system | wc -l",
@@ -124,7 +124,7 @@ fn countNixPackages(allocator: std.mem.Allocator) !usize {
count = try std.fmt.parseInt(usize, result_trimmed, 10); count = try std.fmt.parseInt(usize, result_trimmed, 10);
try writeNixCache(allocator, hash_hex, count); try writeNixCache(allocator, io, environ, hash_hex, count);
return count; return count;
}, },
@@ -134,44 +134,56 @@ fn countNixPackages(allocator: std.mem.Allocator) !usize {
return count; return count;
} }
fn getNixCachePath(allocator: std.mem.Allocator) ![]const u8 { fn getNixCachePath(allocator: std.mem.Allocator, environ: std.process.Environ) ![]const u8 {
var cache_dir_path = std.process.getEnvVarOwned(allocator, "XDG_CACHE_HOME") catch try allocator.dupe(u8, ""); const cache_dir_path = try getUnixCachePath(allocator, environ);
defer allocator.free(cache_dir_path);
return try std.fs.path.join(allocator, &.{ cache_dir_path, "zigfetch", "nix" });
}
fn getUnixCachePath(allocator: std.mem.Allocator, environ: std.process.Environ) ![]const u8 {
var cache_dir_path = std.process.Environ.getAlloc(environ, allocator, "XDG_CACHE_HOME") catch try allocator.dupe(u8, "");
if (cache_dir_path.len == 0) { if (cache_dir_path.len == 0) {
allocator.free(cache_dir_path); allocator.free(cache_dir_path);
const home = try std.process.getEnvVarOwned(allocator, "HOME"); const home = try std.process.Environ.getAlloc(environ, allocator, "HOME");
defer allocator.free(home); defer allocator.free(home);
cache_dir_path = try std.fs.path.join(allocator, &.{ home, ".cache", "zigfetch", "nix" }); cache_dir_path = try std.fs.path.join(allocator, &.{ home, ".cache" });
} else {
cache_dir_path = try std.fs.path.join(allocator, &.{ cache_dir_path, "zigfetch", "nix" });
} }
return cache_dir_path; return cache_dir_path;
} }
fn writeNixCache(allocator: std.mem.Allocator, hash: []const u8, count: usize) !void { fn writeNixCache(allocator: std.mem.Allocator, io: std.Io, environ: std.process.Environ, hash: []const u8, count: usize) !void {
const cache_dir_path = try getNixCachePath(allocator); const nix_cache_dir_path = try getNixCachePath(allocator, environ);
defer allocator.free(cache_dir_path); defer allocator.free(nix_cache_dir_path);
try std.fs.cwd().makePath(cache_dir_path); std.Io.Dir.accessAbsolute(io, nix_cache_dir_path, .{ .read = true }) catch {
var cache_dir = try std.fs.cwd().openDir(cache_dir_path, .{}); const cache_dir_path = try getUnixCachePath(allocator, environ);
defer cache_dir.close(); defer allocator.free(cache_dir_path);
var cache_file = try cache_dir.createFile("nix_cache", .{ .truncate = true });
defer cache_file.close();
const cache_content = try std.fmt.allocPrint(allocator, "{s}\n{d}", .{ hash, count }); const cache_dir = try std.Io.Dir.openDirAbsolute(io, cache_dir_path, .{});
try cache_dir.createDirPath(io, "zigfetch/nix");
};
var nix_cache_dir = try std.Io.Dir.openDirAbsolute(io, nix_cache_dir_path, .{});
defer nix_cache_dir.close(io);
var cache_file = try nix_cache_dir.createFile(io, "nix_cache", .{ .truncate = true });
defer cache_file.close(io);
const cache_content = try std.fmt.allocPrint(allocator, "{s}\n{d}\n", .{ hash, count });
defer allocator.free(cache_content); defer allocator.free(cache_content);
try cache_file.writeAll(cache_content); try cache_file.writePositionalAll(io, cache_content, 0);
} }
fn checkNixCache(allocator: std.mem.Allocator, hash: []const u8) !usize { fn checkNixCache(allocator: std.mem.Allocator, io: std.Io, environ: std.process.Environ, hash: []const u8) !usize {
const cache_dir_path = try getNixCachePath(allocator); const cache_dir_path = try getNixCachePath(allocator, environ);
defer allocator.free(cache_dir_path); defer allocator.free(cache_dir_path);
var cache_dir = try std.fs.cwd().openDir(cache_dir_path, .{}); var cache_dir = try std.Io.Dir.openDirAbsolute(io, cache_dir_path, .{});
defer cache_dir.close(); defer cache_dir.close(io);
var cache_file = try cache_dir.openFile("nix_cache", .{ .mode = .read_only }); var cache_file = try cache_dir.openFile(io, "nix_cache", .{ .mode = .read_only });
const cache_size = (try cache_file.stat()).size; defer cache_file.close(io);
const cache_content = try utils.readFile(allocator, cache_file, cache_size); const cache_size = (try cache_file.stat(io)).size;
const cache_content = try utils.readFile(allocator, io, cache_file, cache_size);
defer allocator.free(cache_content); defer allocator.free(cache_content);
var cache_iter = std.mem.splitScalar(u8, cache_content, '\n'); var cache_iter = std.mem.splitScalar(u8, cache_content, '\n');
@@ -185,13 +197,13 @@ fn checkNixCache(allocator: std.mem.Allocator, hash: []const u8) !usize {
return std.fmt.parseInt(usize, cache_iter.next().?, 10); return std.fmt.parseInt(usize, cache_iter.next().?, 10);
} }
fn countDpkgPackages(allocator: std.mem.Allocator) !usize { fn countDpkgPackages(allocator: std.mem.Allocator, io: std.Io) !usize {
const dpkg_status_path = "/var/lib/dpkg/status"; const dpkg_status_path = "/var/lib/dpkg/status";
const dpkg_file = try std.fs.cwd().openFile(dpkg_status_path, .{ .mode = .read_only }); const dpkg_file = try std.Io.Dir.openFileAbsolute(io, dpkg_status_path, .{ .mode = .read_only });
defer dpkg_file.close(); defer dpkg_file.close(io);
const file_size = (try dpkg_file.stat()).size; const file_size = (try dpkg_file.stat(io)).size;
const content = try utils.readFile(allocator, dpkg_file, file_size); const content = try utils.readFile(allocator, io, dpkg_file, file_size);
defer allocator.free(content); defer allocator.free(content);
var count: usize = 0; var count: usize = 0;
@@ -205,26 +217,26 @@ fn countDpkgPackages(allocator: std.mem.Allocator) !usize {
return count - 1; return count - 1;
} }
fn countPacmanPackages() !usize { fn countPacmanPackages(io: std.Io) !usize {
// Subtruct 1 to remove `ALPM_DB_VERSION` from the count // Subtruct 1 to remove `ALPM_DB_VERSION` from the count
return try utils.countEntries("/var/lib/pacman/local") - 1; return try utils.countEntries(io, "/var/lib/pacman/local") - 1;
} }
fn countXbpsPackages(allocator: std.mem.Allocator) !usize { fn countXbpsPackages(allocator: std.mem.Allocator, io: std.Io) !usize {
var dir = try std.fs.openDirAbsolute("/var/db/xbps/", .{ .iterate = true }); var dir = try std.Io.Dir.openDirAbsolute(io, "/var/db/xbps/", .{ .iterate = true });
defer dir.close(); defer dir.close(io);
var count: usize = 0; var count: usize = 0;
var dir_iter = dir.iterate(); var dir_iter = dir.iterate();
while (try dir_iter.next()) |e| { while (try dir_iter.next(io)) |e| {
if ((e.kind == .file) and std.mem.startsWith(u8, e.name, "pkgdb-")) { if ((e.kind == .file) and std.mem.startsWith(u8, e.name, "pkgdb-")) {
const pkgdb_file = try dir.openFile(e.name, .{ .mode = .read_only }); const pkgdb_file = try dir.openFile(io, e.name, .{ .mode = .read_only });
defer pkgdb_file.close(); defer pkgdb_file.close(io);
const file_size = (try pkgdb_file.stat()).size; const file_size = (try pkgdb_file.stat(io)).size;
const content = try utils.readFile(allocator, pkgdb_file, file_size); const content = try utils.readFile(allocator, io, pkgdb_file, file_size);
defer allocator.free(content); defer allocator.free(content);
var file_iter = std.mem.splitSequence(u8, content, "<string>installed</string>"); var file_iter = std.mem.splitSequence(u8, content, "<string>installed</string>");