Mercurial Hosting > luan

annotate src/luan/modules/Time.luan @ 1098:bae624e455e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add Time.time_zone
author Franklin Schmidt <fschmidt@gmail.com>
date Wed, 29 Mar 2017 19:54:45 -0600
parents b2e4a22ffa5d
children 1f9d34a6f308
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1 -- incomplete, will add as needed
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
2
321
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
3 java()
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 610
diff changeset
4 local Luan = require "luan:Luan.luan"
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
5 local error = Luan.error
1084
aa967fd73b80 improve error message
Franklin Schmidt <fschmidt@gmail.com>
parents: 1079
diff changeset
6 local assert_long = Luan.assert_long or error()
610
b4f3dbe1c6e3 add Rpc and change Hosting to use Rpc
Franklin Schmidt <fschmidt@gmail.com>
parents: 587
diff changeset
7 local ipairs = Luan.ipairs or error()
1079
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
8 local Math = require "luan:Math.luan"
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
9 local floor = Math.floor or error()
693
ca169567ce07 module URIs must now include ".luan"
Franklin Schmidt <fschmidt@gmail.com>
parents: 610
diff changeset
10 local Table = require "luan:Table.luan"
321
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
11 local System = require "java:java.lang.System"
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
12 local Calendar = require "java:java.util.Calendar"
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
13 local Date = require "java:java.util.Date"
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
14 local TimeZone = require "java:java.util.TimeZone"
7f7708e8fdd4 remove import statement
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 320
diff changeset
15 local SimpleDateFormat = require "java:java.text.SimpleDateFormat"
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
16
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
17 local Time = {}
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
18
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
19 function Time.now()
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
20 return System.currentTimeMillis()
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
21 end
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
22
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
23 -- add more as needed
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
24 local fields = {
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
25 year = Calendar.YEAR;
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
26 month = Calendar.MONTH;
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
27 day_of_month = Calendar.DAY_OF_MONTH;
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
28 }
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
29
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
30 function Time.get( time, ... )
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
31 local cal = Calendar.getInstance()
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
32 cal.setTimeInMillis(time)
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
33 local rtn = {}
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
34 for i, v in ipairs{...} do
1079
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
35 local fld = fields[v]
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
36 fld or error("invalid field: "..v)
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
37 local n = cal.get(fld)
1097
b2e4a22ffa5d fix Time bugs
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
38 if v == "month" then
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
39 n = n + 1
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
40 end
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
41 rtn[i] = n
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
42 end
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
43 return Table.unpack(rtn)
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
44 end
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
45
1098
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
46 -- Time.time_zone set for other than default
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
47
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
48 function Time.get_time_zone()
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
49 local tz = Time.time_zone and TimeZone.getTimeZone(Time.time_zone) or TimeZone.getDefault()
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
50 return tz.getID().." - "..tz.getDisplayName()
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
51 end
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
52
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
53 local function set_time_zone(fmt)
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
54 Time.time_zone and fmt.setTimeZone( TimeZone.getTimeZone(Time.time_zone) )
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
55 end
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
56
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
57 function Time.format(time,pattern)
1084
aa967fd73b80 improve error message
Franklin Schmidt <fschmidt@gmail.com>
parents: 1079
diff changeset
58 time = assert_long(time)
587
Franklin Schmidt <fschmidt@gmail.com>
parents: 503
diff changeset
59 pattern = pattern or "yyyy-MM-dd HH:mm:ss"
1098
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
60 local fmt = SimpleDateFormat.new(pattern)
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
61 set_time_zone(fmt)
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
62 return fmt.format(Date.new(time))
254
e0fb8a49e031 add Time.luan
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
63 end
256
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
64
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
65 function Time.on( year, month, day, hour, minute, second, millis )
256
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
66 month = month - 1
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
67 local cal = Calendar.getInstance()
1097
b2e4a22ffa5d fix Time bugs
Franklin Schmidt <fschmidt@gmail.com>
parents: 1088
diff changeset
68 -- cal.setLenient(false)
256
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
69 cal.set( year, month, day, hour or 0, minute or 0, second or 0 )
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
70 cal.set( Calendar.MILLISECOND, millis or 0 )
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
71 return cal.getTimeInMillis()
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
72 end
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
73
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
74 function Time.period( t )
290
9a0cc6d9b27b add Time.period();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 283
diff changeset
75 local cal = Calendar.getInstance()
9a0cc6d9b27b add Time.period();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 283
diff changeset
76 cal.setTimeZone(TimeZone.getTimeZone("GMT"))
715
a82d385ec2c3 add Thread.schedule() and improve Time.period()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
77 local days = t.days or 0
290
9a0cc6d9b27b add Time.period();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 283
diff changeset
78 days = days + 1
715
a82d385ec2c3 add Thread.schedule() and improve Time.period()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
79 cal.set( 1970, 0, days, t.hours or 0, t.minutes or 0, t.seconds or 0 )
a82d385ec2c3 add Thread.schedule() and improve Time.period()
Franklin Schmidt <fschmidt@gmail.com>
parents: 693
diff changeset
80 cal.set( Calendar.MILLISECOND, t.millis or 0 )
290
9a0cc6d9b27b add Time.period();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 283
diff changeset
81 return cal.getTimeInMillis()
9a0cc6d9b27b add Time.period();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 283
diff changeset
82 end
9a0cc6d9b27b add Time.period();
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 283
diff changeset
83
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
84 function Time.parse( pattern, source )
1098
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
85 local fmt = SimpleDateFormat.new(pattern)
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
86 set_time_zone(fmt)
bae624e455e2 add Time.time_zone
Franklin Schmidt <fschmidt@gmail.com>
parents: 1097
diff changeset
87 return fmt.parse(source).getTime()
256
15122d724ce4 more Time functions
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 254
diff changeset
88 end
503
92c3d22745b8 make _ENV optional
Franklin Schmidt <fschmidt@gmail.com>
parents: 321
diff changeset
89
1079
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
90
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
91 local count_times = {
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
92 days = Time.period{days=1}
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
93 hours = Time.period{hours=1}
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
94 minutes = Time.period{minutes=1}
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
95 seconds = Time.period{seconds=1}
1079
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
96 }
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
97
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
98 function Time.count( time, ... )
1079
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
99 local cal = Calendar.getInstance()
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
100 cal.setTimeInMillis(time)
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
101 local rtn = {}
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
102 for i, v in ipairs{...} do
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
103 local t = count_times[v]
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
104 t or error("invalid field: "..v)
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
105 rtn[#rtn+1] = floor(time/t)
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
106 time = time%t
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
107 end
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
108 rtn[#rtn+1] = time
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
109 return Table.unpack(rtn)
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
110 end
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
111
53e77f60b789 add Time.count
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
112
1088
bae2d0c2576c change module naming convention
Franklin Schmidt <fschmidt@gmail.com>
parents: 1084
diff changeset
113 return Time