lobo/wttr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Return 404 instead of defaulting to London if no location found

Browse source
This commit is contained in:
Emil Lerch 2025-12-19 15:42:36 -08:00
parent 50f8889e6e
commit 62e7b83d1b
Signed by: lobo
GPG key ID: A7B62D657EF764F8
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/http/handler.zig
View file

@ -2,7 +2,6 @@ const std = @import("std");
const httpz = @import("httpz"); const httpz = @import("httpz");
const WeatherProvider = @import("../weather/Provider.zig"); const WeatherProvider = @import("../weather/Provider.zig");
const Resolver = @import("../location/resolver.zig").Resolver; const Resolver = @import("../location/resolver.zig").Resolver;
const Location = @import("../location/resolver.zig").Location;
const QueryParams = @import("query.zig").QueryParams; const QueryParams = @import("query.zig").QueryParams;
const ansi = @import("../render/ansi.zig"); const ansi = @import("../render/ansi.zig");
const line = @import("../render/line.zig"); const line = @import("../render/line.zig");
@ -87,12 +86,18 @@ fn handleWeatherInternal(
res: *httpz.Response, res: *httpz.Response,
location_query: []const u8, location_query: []const u8,
) !void { ) !void {
const req_alloc = req.arena;
// Resolve location // Resolve location. By the time we get here, we really
const location = if (location_query.len == 0) // should have a location from the path, query string, or
Location{ .name = "London", .coords = .{ .latitude = 51.5074, .longitude = -0.1278 } } // client IP lookup. So if we have an empty location parameter, it
else // is better to 404 than to fake it with a London response
opts.resolver.resolve(location_query) catch |err| { if (location_query.len == 0) {
res.status = 404;
res.body = "Location not found\n";
return;
}
const location = opts.resolver.resolve(location_query) catch |err| {
switch (err) { switch (err) {
error.LocationNotFound => { error.LocationNotFound => {
res.status = 404; res.status = 404;
@ -106,7 +111,6 @@ fn handleWeatherInternal(
}, },
} }
}; };
const req_alloc = req.arena;
// Fetch weather using coordinates // Fetch weather using coordinates
const weather = opts.provider.fetch(req_alloc, location.coords) catch |err| { const weather = opts.provider.fetch(req_alloc, location.coords) catch |err| {