luatz/gettime: Check that CLOCK constants exist

[etc/awesome.git] / luatz / init.lua

diff --git a/luatz/init.lua b/luatz/init.lua
index 26607154c3e3a88f78ccc9b5230aba8324e6eb66..1a6c83533c99a7c1c6274aca03d29352e69ef8db 100644 (file)
--- a/luatz/init.lua
+++ b/luatz/init.lua
@@ -1,13 +1,15 @@
 local _M = {
 local _M = {

+       gettime = require "luatz.gettime" ;

        parse = require "luatz.parse" ;
        strftime = require "luatz.strftime" ;
        timetable = require "luatz.timetable" ;
        parse = require "luatz.parse" ;
        strftime = require "luatz.strftime" ;
        timetable = require "luatz.timetable" ;

+       tzcache = require "luatz.tzcache" ;

 }
 
 --- Top-level aliases for common functions
 
 }
 
 --- 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
 
 
 --- Handy functions
 


@@ -15,4 +17,24 @@ _M.time_in = function ( tz , now )
        return _M.get_tz ( tz ):localize ( now )
 end
 
        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
 return _M