Bruce/nowopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support for multiple time windows in a day (e.g. mon: 1pm-2pm,

Browse Source 
5pm-6pm)
This commit is contained in:
Bruce Hill 2019-01-22 23:35:44 -08:00
parent 8449110c67
commit 6dde7b420d
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nowopen
View File

@ -63,7 +63,7 @@ local dsl = re.compile([=[
ws? ("(" ws? {:tags: {| {tag} (ws? "," ws? {tag})* ws? |} :} ")")? ws? ":" ws? ("(" ws? {:tags: {| {tag} (ws? "," ws? {tag})* ws? |} :} ")")? ws? ":"
({:times: {| ({:times: {|
((ws? comment? %nl)+ (%tab / " "^+2) ws? ((ws? comment? %nl)+ (%tab / " "^+2) ws?
{| days ws? ("closed" / {:open: time :} "-" {:close: time :}) |})+ {| days ws? ("closed" / (time_range (ws* "," ws* time_range)*)) |})+
|} :}) |} :})
|} |}
comment <- "#" [^%nl]* comment <- "#" [^%nl]*
@ -71,6 +71,7 @@ local dsl = re.compile([=[
({:from: {word} :} "-" {:to: {word} :} ":") ({:from: {word} :} "-" {:to: {word} :} ":")
/({:from: {word} :} ":") /({:from: {word} :} ":")
/({:from:''->'sun':} {:to:''->'sat':}) /({:from:''->'sun':} {:to:''->'sat':})
time_range <- {| {:open: time :} "-" {:close: time :} |}
time <- {| time <- {|
{:hour: {[0-9]+} :} (":" {:minute: {[0-9]+} :})? {:ampm: { "am" / "pm"} :} {:hour: {[0-9]+} :} (":" {:minute: {[0-9]+} :})? {:ampm: { "am" / "pm"} :}
/ ("noon" {:hour: {~''->'12'~} :} {:ampm: {~''->'pm'~} :}) / ("noon" {:hour: {~''->'12'~} :} {:ampm: {~''->'pm'~} :})
@ -124,11 +125,13 @@ for i,place in ipairs(places) do
while t < now do t = t + 24*60*60 end while t < now do t = t + 24*60*60 end
return t return t
end end
if today_times and today_times.open then if today_times and today_times[1] then
local until_open = t(today_times.open) - now for _, window in ipairs(today_times) do
local until_close = t(today_times.close) - now local until_open = t(window.open) - now
if until_close < until_open then local until_close = t(window.close) - now
table.insert(options, {name=place.name, until_close=until_close}) if until_close < until_open then
table.insert(options, {name=place.name, until_close=until_close})
end
end end
end end
::next_place:: ::next_place::