chore: reimpl util.escape

should make use of stdlib when I can
This commit is contained in:
Rekai Nyangadzayi Musuka 2022-09-18 06:23:30 -03:00
parent 4af144fca2
commit fbe3de0eb3
1 changed files with 7 additions and 9 deletions

View File

@ -72,7 +72,7 @@ pub fn intToBytes(comptime T: type, value: anytype) [@sizeOf(T)]u8 {
/// This function returns a slice of the ASCII string without the null terminator(s) /// This function returns a slice of the ASCII string without the null terminator(s)
/// (essentially, a proper Zig/Rust/Any modern language String) /// (essentially, a proper Zig/Rust/Any modern language String)
pub fn span(title: *const [12]u8) []const u8 { pub fn span(title: *const [12]u8) []const u8 {
const end = std.mem.indexOfScalar(u8, title, "\x00"[0]); const end = std.mem.indexOfScalar(u8, title, '\x00');
return title[0 .. end orelse title.len]; return title[0 .. end orelse title.len];
} }
@ -117,19 +117,17 @@ test "span" {
try std.testing.expectEqualSlices(u8, "", span(example)); try std.testing.expectEqualSlices(u8, "", span(example));
} }
/// Copies a Title and returns either an identical or similar /// Creates a copy of a title with all Filesystem-invalid characters replaced
/// array consisting of ASCII that won't make any file system angry
/// ///
/// e.g. POKEPIN R/S to POKEPIN R_S /// e.g. POKEPIN R/S to POKEPIN R_S
pub fn escape(title: [12]u8) [12]u8 { pub fn escape(title: [12]u8) [12]u8 {
var result: [12]u8 = title; var ret: [12]u8 = title;
for (result) |*char| { //TODO: Add more replacements
if (char.* == '/' or char.* == '\\') char.* = '_'; std.mem.replaceScalar(u8, &ret, '/', '_');
if (char.* == 0) break; std.mem.replaceScalar(u8, &ret, '\\', '_');
}
return result; return ret;
} }
pub const FilePaths = struct { pub const FilePaths = struct {