]> git.madduck.net Git - etc/awesome.git/blobdiff - luatz/init.lua

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Whitespace removal
[etc/awesome.git] / luatz / init.lua
index 8ab7cfcc87acd1f54422524a67b521e5f7a05b6a..4423189304874c46efb00e07f3f52077561549f5 100644 (file)
@@ -1,9 +1,9 @@
 local _M = {
-       gettime = require "luatz.gettime" ;
-       parse = require "luatz.parse" ;
-       strftime = require "luatz.strftime" ;
-       timetable = require "luatz.timetable" ;
-       tzcache = require "luatz.tzcache" ;
+       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
@@ -13,23 +13,28 @@ _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 ):normalise ( )
+_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 )
+_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 ) )
+_M.ctime = function(ts)
+       return _M.strftime.asctime(_M.localtime(ts))
 end
 
 return _M