~jan0sch/rig
Showing details for patch a6d4f963c5fb43b3727edf5dc082c14ed86960fa.
diff -rN -u old-rig/build.zig new-rig/build.zig --- old-rig/build.zig 1970-01-01 00:00:00.000000000 +0000 +++ new-rig/build.zig 2025-04-19 21:57:16.836063076 +0000 @@ -0,0 +1,66 @@ +const std = @import("std"); + +// Although this function looks imperative, note that its job is to +// declaratively construct a build graph that will be executed by an external +// runner. +pub fn build(b: *std.Build) void { + // Standard target options allows the person running `zig build` to choose + // what target to build for. Here we do not override the defaults, which + // means any target is allowed, and the default is native. Other options + // for restricting supported target set are available. + const target = b.standardTargetOptions(.{}); + + // Standard optimization options allow the person running `zig build` to select + // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not + // set a preferred release mode, allowing the user to decide how to optimize. + const optimize = b.standardOptimizeOption(.{}); + + const exe = b.addExecutable(.{ + .name = "rig", + .root_source_file = b.path("src/main.zig"), + .target = target, + .optimize = optimize, + }); + + // This declares intent for the executable to be installed into the + // standard location when the user invokes the "install" step (the default + // step when running `zig build`). + b.installArtifact(exe); + + // This *creates* a Run step in the build graph, to be executed when another + // step is evaluated that depends on it. The next line below will establish + // such a dependency. + const run_cmd = b.addRunArtifact(exe); + + // By making the run step depend on the install step, it will be run from the + // installation directory rather than directly from within the cache directory. + // This is not necessary, however, if the application depends on other installed + // files, this ensures they will be present and in the expected location. + run_cmd.step.dependOn(b.getInstallStep()); + + // This allows the user to pass arguments to the application in the build + // command itself, like this: `zig build run -- arg1 arg2 etc` + if (b.args) |args| { + run_cmd.addArgs(args); + } + + // This creates a build step. It will be visible in the `zig build --help` menu, + // and can be selected like this: `zig build run` + // This will evaluate the `run` step rather than the default, which is "install". + const run_step = b.step("run", "Run the app"); + run_step.dependOn(&run_cmd.step); + + const exe_unit_tests = b.addTest(.{ + .root_source_file = b.path("src/main.zig"), + .target = target, + .optimize = optimize, + }); + + const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests); + + // Similar to creating the run step earlier, this exposes a `test` step to + // the `zig build --help` menu, providing a way for the user to request + // running the unit tests. + const test_step = b.step("test", "Run unit tests"); + test_step.dependOn(&run_exe_unit_tests.step); +} diff -rN -u old-rig/build.zig.zon new-rig/build.zig.zon --- old-rig/build.zig.zon 1970-01-01 00:00:00.000000000 +0000 +++ new-rig/build.zig.zon 2025-04-19 21:57:16.836063076 +0000 @@ -0,0 +1,72 @@ +.{ + // This is the default name used by packages depending on this one. For + // example, when a user runs `zig fetch --save <url>`, this field is used + // as the key in the `dependencies` table. Although the user can choose a + // different name, most users will stick with this provided value. + // + // It is redundant to include "zig" in this name because it is already + // within the Zig package namespace. + .name = "rig", + + // This is a [Semantic Version](https://semver.org/). + // In a future version of Zig it will be used for package deduplication. + .version = "0.0.0", + + // This field is optional. + // This is currently advisory only; Zig does not yet do anything + // with this value. + //.minimum_zig_version = "0.11.0", + + // This field is optional. + // Each dependency must either provide a `url` and `hash`, or a `path`. + // `zig build --fetch` can be used to fetch all dependencies of a package, recursively. + // Once all dependencies are fetched, `zig build` no longer requires + // internet connectivity. + .dependencies = .{ + // See `zig fetch --save <url>` for a command-line interface for adding dependencies. + //.example = .{ + // // When updating this field to a new URL, be sure to delete the corresponding + // // `hash`, otherwise you are communicating that you expect to find the old hash at + // // the new URL. + // .url = "https://example.com/foo.tar.gz", + // + // // This is computed from the file contents of the directory of files that is + // // obtained after fetching `url` and applying the inclusion rules given by + // // `paths`. + // // + // // This field is the source of truth; packages do not come from a `url`; they + // // come from a `hash`. `url` is just one of many possible mirrors for how to + // // obtain a package matching this `hash`. + // // + // // Uses the [multihash](https://multiformats.io/multihash/) format. + // .hash = "...", + // + // // When this is provided, the package is found in a directory relative to the + // // build root. In this case the package's hash is irrelevant and therefore not + // // computed. This field and `url` are mutually exclusive. + // .path = "foo", + + // // When this is set to `true`, a package is declared to be lazily + // // fetched. This makes the dependency only get fetched if it is + // // actually used. + // .lazy = false, + //}, + }, + + // Specifies the set of files and directories that are included in this package. + // Only files and directories listed here are included in the `hash` that + // is computed for this package. Only files listed here will remain on disk + // when using the zig package manager. As a rule of thumb, one should list + // files required for compilation plus any license(s). + // Paths are relative to the build root. Use the empty string (`""`) to refer to + // the build root itself. + // A directory listed here means that all files within, recursively, are included. + .paths = .{ + "build.zig", + "build.zig.zon", + "src", + // For example... + //"LICENSE", + //"README.md", + }, +} diff -rN -u old-rig/src/main.zig new-rig/src/main.zig --- old-rig/src/main.zig 1970-01-01 00:00:00.000000000 +0000 +++ new-rig/src/main.zig 2025-04-19 21:57:16.840063069 +0000 @@ -0,0 +1,83 @@ +const std = @import("std"); +const fs = std.fs; + +const base_path = "share/rig"; + +pub fn main() !void { + var gpa_alloc = std.heap.GeneralPurposeAllocator(.{}){}; + const alloc = gpa_alloc.allocator(); + + var seed: u64 = undefined; + try std.posix.getrandom(std.mem.asBytes(&seed)); + var prng = std.rand.DefaultPrng.init(seed); + const random = prng.random(); + + const argv = std.os.argv; + + if (argv.len > 2) { + std.debug.print("Usage: {s} [country code]\n", .{argv[0]}); + return; + } + + var country: [:0]const u8 = "deu"; + if (argv.len == 2) { + const country_arg = argv[1]; + country = std.mem.span(country_arg); + } + + const home = std.posix.getenv("HOME"); + const root_path = if (home != null) home.? else "/usr"; + const local_path = if (home != null) ".local" else "local"; + + const forenames = try std.fmt.allocPrint(alloc, "{s}/{s}/{s}/forenames/{s}.txt", .{ root_path, local_path, base_path, country }); + defer alloc.free(forenames); + const surnames = try std.fmt.allocPrint(alloc, "{s}/{s}/{s}/surnames/{s}.txt", .{ root_path, local_path, base_path, country }); + defer alloc.free(surnames); + const zips = try std.fmt.allocPrint(alloc, "{s}/{s}/{s}/zips/{s}.tsv", .{ root_path, local_path, base_path, country }); + defer alloc.free(zips); + + const stdout_file = std.io.getStdOut().writer(); + var bw = std.io.bufferedWriter(stdout_file); + const stdout = bw.writer(); + + try stdout.print("Looking for {s}, {s}, {s}\n", .{ forenames, surnames, zips }); + + const f_lines = try readData(alloc, forenames); + defer f_lines.deinit(); + + const f_max: u32 = @intCast(f_lines.items.len - 1); + const f_rand = calculateRandomEntry(random, f_max); + std.debug.print("Using forename {d} of {d}.\n", .{ f_rand, f_max }); + + const f_name = f_lines.items[1]; + std.debug.print("n: {s}\n", .{&f_name}); + //try stdout.print("Got {s}.", .{f_name}); + + try bw.flush(); // don't forget to flush! +} + +fn calculateRandomEntry(random: std.Random, max: u32) u32 { + const result = random.intRangeAtMostBiased(u32, 0, max); + return result; +} + +fn readData(allocator: std.mem.Allocator, path: []const u8) !std.ArrayList([]const u8) { + const file = try fs.openFileAbsolute(path, .{}); + defer file.close(); + + const stat = try file.stat(); + const buffer = try file.readToEndAlloc(allocator, stat.size); + defer allocator.free(buffer); + var lines = std.mem.split(u8, buffer, "\n"); + errdefer allocator.free(lines); + var result = std.ArrayList([]const u8).init(allocator); + errdefer result.deinit(); + while (lines.next()) |line| { + result.append(line) catch |e| { + switch (e) { + else => std.debug.print("error: {any}", .{e}), + } + }; + } + return result; +}