Merge branch 'develop' of ssh://git.idiopolis.nl:2222/dreamer/PreviouslyOnIFM into develop

This commit is contained in:
dreamer 2020-10-12 17:40:09 +02:00
commit 14a52ed217

View File

@ -1,4 +1,5 @@
local db = require("lapis.db")
local to_json = require("lapis.util").to_json
local autoload = require("lapis.util").autoload
local models = autoload("models")
@ -72,15 +73,21 @@ function Splhandler(self)
-- we have to split the `hr:min:sec` and `month/day/year` strings from SPL
local function Split(s, delimiter)
local result = {}
for match in (s..delimiter):gmatch("(.-)"..delimiter) do
if delimiter == "." then
for match in string.gmatch(s, "[^%.]+") do
table.insert(result, match)
end
else
for match in (s..delimiter):gmatch("(.-)"..delimiter) do
table.insert(result, match)
end
end
return result
end
local split_airtime = Split(airtime, ":")
local airtime_hr, airtime_min, airtime_sec = split_airtime[1], split_airtime[2], split_airtime[3]
local split_airdate = Split(airdate, "/")
local split_airdate = Split(airdate, ".")
local airdate_month, airdate_day, airdate_year = split_airdate[1], split_airdate[2], split_airdate[3]
local airtime_stamp = os.time{year=airdate_year, month=airdate_month, day=airdate_day, hour=airtime_hr, min=airtime_min, sec=airtime_sec}