merge conflicts

This commit is contained in:
dreamer 2020-10-12 18:06:12 +02:00
commit 0796dafb8d

View File

@ -75,7 +75,6 @@ function Splhandler(self)
local function Split(s, delimiters)
for i, delimiter in ipairs(delimiters) do
print(delimiter)
local result = {}
if delimiter == "." then
@ -99,7 +98,7 @@ function Splhandler(self)
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}