Compare commits
2 Commits
9c6fb1b463
...
e7bbe67c19
Author | SHA1 | Date |
---|---|---|
gg | e7bbe67c19 | |
gg | 49abaafc6b |
|
@ -6,7 +6,7 @@ function main()
|
||||||
zone = localzone()
|
zone = localzone()
|
||||||
s = WeatherNews.get_schedule()
|
s = WeatherNews.get_schedule()
|
||||||
pretty_table(s,
|
pretty_table(s,
|
||||||
header=["caster", "title", "Asia/Tokyo", zone.name, "diff"],
|
header=["caster", "title", "Asia/Tokyo", zone.name, "until"],
|
||||||
formatters=WeatherNews.fmt)
|
formatters=WeatherNews.fmt)
|
||||||
localtime = now(localzone())
|
localtime = now(localzone())
|
||||||
japantime = now(tz"Asia/Tokyo")
|
japantime = now(tz"Asia/Tokyo")
|
||||||
|
|
|
@ -44,11 +44,7 @@ end
|
||||||
|
|
||||||
function massage_fn(zone, leading_zero)
|
function massage_fn(zone, leading_zero)
|
||||||
td = Date(now(tz"Asia/Tokyo"))
|
td = Date(now(tz"Asia/Tokyo"))
|
||||||
zero_adjustment = if leading_zero
|
zero_adjustment = if leading_zero 0 else 1 end
|
||||||
0
|
|
||||||
else
|
|
||||||
1
|
|
||||||
end
|
|
||||||
ymd = yearmonthday(td)
|
ymd = yearmonthday(td)
|
||||||
zn = ZonedDateTime(now(), localzone())
|
zn = ZonedDateTime(now(), localzone())
|
||||||
return function massage(item)
|
return function massage(item)
|
||||||
|
@ -61,10 +57,10 @@ function massage_fn(zone, leading_zero)
|
||||||
t = ZonedDateTime(ymd..., hms..., tz"Asia/Tokyo")
|
t = ZonedDateTime(ymd..., hms..., tz"Asia/Tokyo")
|
||||||
n = DataStructures.OrderedDict{Symbol,Any}()
|
n = DataStructures.OrderedDict{Symbol,Any}()
|
||||||
n[:caster] = item[:caster]
|
n[:caster] = item[:caster]
|
||||||
n[:title] = TITLES[item[:title]]
|
n[:title] = TITLES[item[:title]]
|
||||||
n[:t] = t
|
n[:t] = t
|
||||||
n[:t2] = astimezone(t, zone)
|
n[:t2] = astimezone(t, zone)
|
||||||
n[:diff] = n[:t] - zn
|
n[:diff] = n[:t] - zn
|
||||||
return n
|
return n
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue