Fix incorrect sunrise/sunset calculation on non-UTC timezone

Changes

2 changed files (+10/-12)

• src/RunOptions.zig
  • @@ -30,7 +30,6 @@ utc: bool = false,
    debug: bool = false, report_sunrise: c.OnOff = c.ONOFF_ON, report_sunset: c.OnOff = c.ONOFF_ON, - utc_bias_hours: f64 = 0, command: CommandOptions = .poll, pub const ParseArgsError = error{
  • @@ -425,6 +424,9 @@ }),
    else => getTargetDay(now, .{ .is_utc = self.utc }), }; + // This effectful function updates `c.timezone`. + c.tzset(); + return c.runStruct{ .latitude = self.latitude orelse c.DEFAULT_LATITUDE, .longitude = self.longitude orelse c.DEFAULT_LONGITUDE,
  • @@ -448,6 +450,6 @@ .listDays = switch (self.command) {
    .list => |opts| opts.days, else => c.DEFAULT_LIST, }, - .utcBiasHours = self.utc_bias_hours, + .utcBiasHours = @as(f64, @floatFromInt(c.timezone)) / 60.0 / 60.0, }; }
• tests/report.zig
  • @@ -106,11 +106,9 @@ });
    defer std.testing.allocator.free(new.stderr); defer std.testing.allocator.free(new.stdout); - return error.SkipZigTest; - // TODO: Uncomment below once tz offset is handled - // try std.testing.expectEqual(legacy.term.Exited, new.term.Exited); - // try std.testing.expectEqualStrings(legacy.stderr, new.stderr); - // try std.testing.expectEqualStrings(legacy.stdout, new.stdout); + try std.testing.expectEqual(legacy.term.Exited, new.term.Exited); + try std.testing.expectEqualStrings(legacy.stderr, new.stderr); + try std.testing.expectEqualStrings(legacy.stdout, new.stdout); } test "Should behave same with date parameter" {
  • @@ -150,9 +148,7 @@ });
    defer std.testing.allocator.free(new.stderr); defer std.testing.allocator.free(new.stdout); - return error.SkipZigTest; - // TODO: Uncomment below once tz offset is handled - // try std.testing.expectEqual(legacy.term.Exited, new.term.Exited); - // try std.testing.expectEqualStrings(legacy.stderr, new.stderr); - // try std.testing.expectEqualStrings(legacy.stdout, new.stdout); + try std.testing.expectEqual(legacy.term.Exited, new.term.Exited); + try std.testing.expectEqualStrings(legacy.stderr, new.stderr); + try std.testing.expectEqualStrings(legacy.stdout, new.stdout); }