mirrors/ly
1
0
Fork 0
mirror of https://github.com/fairyglade/ly.git synced 2025-12-20 19:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update zigini (fixes incorrect comment parsing)

Browse Source 
Signed-off-by: AnErrupTion <anerruption@disroot.org>
This commit is contained in:
AnErrupTion
2024-07-30 09:43:56 +02:00
parent 48185bdfe0
commit 5f2f21620a
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.zig
View File

@@ -92,8 +92,7 @@ pub fn main() !void {
if (save_path_alloc) allocator.free(save_path);
}
// Compatibility with v0.6.0
const mapped_config_fields = .{.{ "blank_password", "clear_password" }};
const comment_characters = "#";
if (res.args.config) |s| {
const trailing_slash = if (s[s.len - 1] != '/') "/" else "";
@@ -101,7 +100,7 @@ pub fn main() !void {
const config_path = try std.fmt.allocPrint(allocator, "{s}{s}config.ini", .{ s, trailing_slash });
defer allocator.free(config_path);
config = config_ini.readFileToStructWithMap(config_path, mapped_config_fields) catch _config: {
config = config_ini.readFileToStruct(config_path, comment_characters, migrator.configFieldHandler) catch _config: {
// We're using a literal error message here since the language file hasn't yet been loaded
try info_line.addMessage("unable to parse config file", @intCast(interop.termbox.TB_DEFAULT), @intCast(interop.termbox.TB_RED | interop.termbox.TB_BOLD));
break :_config Config{};
@@ -110,17 +109,19 @@ pub fn main() !void {
const lang_path = try std.fmt.allocPrint(allocator, "{s}{s}lang/{s}.ini", .{ s, trailing_slash, config.lang });
defer allocator.free(lang_path);
lang = lang_ini.readFileToStruct(lang_path) catch Lang{};
lang = lang_ini.readFileToStruct(lang_path, comment_characters, null) catch Lang{};
if (config.load) {
save_path = try std.fmt.allocPrint(allocator, "{s}{s}save.ini", .{ s, trailing_slash });
save_path_alloc = true;
var user_buf: [32]u8 = undefined;
save = save_ini.readFileToStruct(save_path) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file);
save = save_ini.readFileToStruct(save_path, comment_characters, null) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file);
}
} else {
config = config_ini.readFileToStructWithMap(build_options.data_directory ++ "/config.ini", mapped_config_fields) catch _config: {
const config_path = build_options.data_directory ++ "/config.ini";
config = config_ini.readFileToStruct(config_path, comment_characters, migrator.configFieldHandler) catch _config: {
// literal error message, due to language file not yet available
try info_line.addMessage("unable to parse config file", @intCast(interop.termbox.TB_DEFAULT), @intCast(interop.termbox.TB_RED | interop.termbox.TB_BOLD));
break :_config Config{};
@@ -129,11 +130,11 @@ pub fn main() !void {
const lang_path = try std.fmt.allocPrint(allocator, "{s}/lang/{s}.ini", .{ build_options.data_directory, config.lang });
defer allocator.free(lang_path);
lang = lang_ini.readFileToStruct(lang_path) catch Lang{};
lang = lang_ini.readFileToStruct(lang_path, comment_characters, null) catch Lang{};
if (config.load) {
var user_buf: [32]u8 = undefined;
save = save_ini.readFileToStruct(save_path) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file);
save = save_ini.readFileToStruct(save_path, comment_characters, null) catch migrator.tryMigrateSaveFile(&user_buf, config.save_file);
}
}
@@ -590,7 +591,7 @@ pub fn main() !void {
.user = login.text.items,
.session_index = desktop.current,
};
ini.writeFromStruct(save_data, file.writer(), null) catch break :save_last_settings;
ini.writeFromStruct(save_data, file.writer(), null, true, .{}) catch break :save_last_settings;
}
var shared_err = try SharedError.init();