luatz/timetable.lua: Fix incorrect normalisation logic for negative day field

[etc/awesome.git] / luatz / parse.lua

diff --git a/luatz/parse.lua b/luatz/parse.lua
index f5cf735c7ac33a7878c27f1ae1c095c5fed4f2c4..648d538e2140372c2238452a82b0e352041ef498 100644 (file)
--- a/luatz/parse.lua
+++ b/luatz/parse.lua
@@ -6,9 +6,9 @@ local new_timetable = require "luatz.timetable".new
 -- If the timestamp is only partial (i.e. missing "Z" or time offset) then `tz_offset` will be nil
 -- TODO: Validate components are within their boundarys (e.g. 1 <= month <= 12)
 local function rfc_3339 ( str , init )
 -- If the timestamp is only partial (i.e. missing "Z" or time offset) then `tz_offset` will be nil
 -- TODO: Validate components are within their boundarys (e.g. 1 <= month <= 12)
 local function rfc_3339 ( str , init )

-       local year , month , day , hour , min , sec , patt_end = str:match ( "^(%d%d%d%d)%-(%d%d)%-(%d%d)[Tt](%d%d%.?%d*):(%d%d):(%d%d)()" , init )
+       local year , month , day , hour , min , sec , patt_end = str:match ( "^(%d%d%d%d)%-(%d%d)%-(%d%d)[Tt](%d%d%.?%d*):(%d%d):(%d%d)()" , init ) -- luacheck: ignore 631

        if not year then
        if not year then

-               error ( "Invalid RFC 3339 timestamp" )
+               return nil, "Invalid RFC 3339 timestamp"

        end
        year  = tonumber ( year )
        month = tonumber ( month )
        end
        year  = tonumber ( year )
        month = tonumber ( month )


@@ -26,8 +26,8 @@ local function rfc_3339 ( str , init )
                local hour_offset , min_offset = str:match ( "^([+-]%d%d):(%d%d)" , patt_end )
                if hour_offset then
                        tz_offset = tonumber ( hour_offset ) * 3600 + tonumber ( min_offset ) * 60
                local hour_offset , min_offset = str:match ( "^([+-]%d%d):(%d%d)" , patt_end )
                if hour_offset then
                        tz_offset = tonumber ( hour_offset ) * 3600 + tonumber ( min_offset ) * 60

-               else
-                       -- Invalid RFC 3339 timestamp offset (should be Z or (+/-)hour:min
+               else -- luacheck: ignore 542
+                       -- Invalid RFC 3339 timestamp offset (should be Z or (+/-)hour:min)

                        -- tz_offset will be nil
                end
        end
                        -- tz_offset will be nil
                end
        end