]> git.madduck.net Git - etc/awesome.git/blobdiff - src/timetable.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:

src/init: Export timetable from main module
[etc/awesome.git] / src / timetable.lua
index aef8ca42e1ed89681e49d8c97ee90d4c3acfd613..d1cd534a624f8c8653929b72dd556e1966601027 100644 (file)
@@ -75,7 +75,9 @@ local function unpack_tm ( tm )
                assert ( tm.day   , "day required" ) ,
                tm.hour or 12 ,
                tm.min  or 0 ,
-               tm.sec  or 0
+               tm.sec  or 0 ,
+               tm.yday ,
+               tm.wday
 end
 
 -- Modify parameters so they all fit within the "normal" range
@@ -149,14 +151,23 @@ function timetable_methods:rfc_3339 ( )
        return strformat ( "%04u-%02u-%02uT%02u:%02u:%06.4g" , unpack_tm ( self ) )
 end
 
-local timetable_mt = {
+local timetable_mt
+
+local function coerce_arg ( t )
+       if getmetatable ( t ) == timetable_mt then
+               return t:timestamp ( )
+       end
+       return t
+end
+
+timetable_mt = {
        __index    = timetable_methods ;
        __tostring = timetable_methods.rfc_3339 ;
        __eq = function ( a , b )
-               return a:timestamp() == b:timestamp()
+               return coerce_arg ( a ) == coerce_arg ( b )
        end ;
        __lt = function ( a , b )
-               return a:timestamp() < b:timestamp()
+               return coerce_arg ( a ) < coerce_arg ( b )
        end ;
 }
 
@@ -164,7 +175,7 @@ local function cast_timetable ( tm )
        return setmetatable ( tm , timetable_mt )
 end
 
-local function new_timetable ( year , month , day , hour , min , sec )
+local function new_timetable ( year , month , day , hour , min , sec , yday , wday )
        return cast_timetable {
                year  = year ;
                month = month ;
@@ -172,9 +183,15 @@ local function new_timetable ( year , month , day , hour , min , sec )
                hour  = hour ;
                min   = min ;
                sec   = sec ;
+               yday  = yday ;
+               wday  = wday ;
        }
 end
 
+function timetable_methods:clone ( )
+       return new_timetable ( unpack_tm ( self ) )
+end
+
 local function new_from_timestamp ( ts )
        return new_timetable ( 1970 , 1 , 1 , 0 , 0 , ts )
 end