X-Git-Url: https://git.madduck.net/etc/awesome.git/blobdiff_plain/85c40964551cb74c3d6ef6bf61a12fd79013389b..c4d8a1bf5f96364056f744881037ca00b0465824:/luatz/init.lua?ds=sidebyside

diff --git a/luatz/init.lua b/luatz/init.lua
index 2660715..4423189 100644
--- a/luatz/init.lua
+++ b/luatz/init.lua
@@ -1,18 +1,40 @@
 local _M = {
-	parse = require "luatz.parse" ;
-	strftime = require "luatz.strftime" ;
-	timetable = require "luatz.timetable" ;
+	gettime = require "luatz.gettime";
+	parse = require "luatz.parse";
+	strftime = require "luatz.strftime";
+	timetable = require "luatz.timetable";
+	tzcache = require "luatz.tzcache";
 }
 
 --- Top-level aliases for common functions
 
-_M.time = require "luatz.gettime".gettime
-_M.get_tz = require "luatz.tzcache".get_tz
+_M.time = _M.gettime.gettime
+_M.get_tz = _M.tzcache.get_tz
 
 --- Handy functions
 
-_M.time_in = function ( tz , now )
-	return _M.get_tz ( tz ):localize ( now )
+_M.time_in = function(tz, now)
+	return _M.get_tz(tz):localize(now)
+end
+
+_M.now = function()
+	local ts = _M.gettime.gettime()
+	return _M.timetable.new_from_timestamp(ts)
+end
+
+--- C-like functions
+
+_M.gmtime = function(ts)
+	return _M.timetable.new_from_timestamp(ts)
+end
+
+_M.localtime = function(ts)
+	ts = _M.time_in(nil, ts)
+	return _M.gmtime(ts)
+end
+
+_M.ctime = function(ts)
+	return _M.strftime.asctime(_M.localtime(ts))
 end
 
 return _M