From 2dccb0e09af035f3c113aa777beff80b665d799a Mon Sep 17 00:00:00 2001
From: ollo <ollo@olloThinkPad>
Date: Sat, 14 May 2016 12:25:55 +0200
Subject: [PATCH] Integrated unixtime to year, month, day, hour, minute,
 second, dayofweek convertion into the timecore module

---
 timecore.lua       | 85 ++++++++++++++++++++++++++++++++++++++++++++++
 unit/unix2time.lua | 83 +-------------------------------------------
 2 files changed, 86 insertions(+), 82 deletions(-)

diff --git a/timecore.lua b/timecore.lua
index 013ffc1..e9f6787 100644
--- a/timecore.lua
+++ b/timecore.lua
@@ -75,3 +75,88 @@ function convertMonth(str)
   return 0
  end
 end
+
+----------------------------------------------------------
+-- Here comes some code to extract the year, month, day, hour, minute, second and day of week of a unix timestamp
+
+-- Source:
+-- http://www.jbox.dk/sanos/source/lib/time.c.html
+
+YEAR0=1900
+
+EPOCH_YR=1970
+--SECS_DAY=(24L * 60L * 60L)
+SECS_DAY=86400
+
+ytab = {}
+ytab[0] = {}
+ytab[1] = {}
+ytab[0][0] = 31
+ytab[0][1] = 28
+ytab[0][2] = 31
+ytab[0][3] = 30
+ytab[0][4] = 31
+ytab[0][5] = 30
+ytab[0][6] = 31
+ytab[0][7] = 31
+ytab[0][8] = 30
+ytab[0][9] = 31
+ytab[0][10] = 30
+ytab[0][11] = 31
+ytab[1][0] =  31
+ytab[1][1] = 29
+ytab[1][2] = 31
+ytab[1][3] = 30
+ytab[1][4] = 31
+ytab[1][5] = 30
+ytab[1][6] = 31
+ytab[1][7] = 31
+ytab[1][8] = 30
+ytab[1][9] = 31
+ytab[1][10] = 30
+ytab[1][11] = 31
+
+
+leapyear = function(year)
+    return  ( not ((year) % 4) and (((year) % 100) or not ((year) % 400)))
+end
+
+yearsize = function(year)
+ if leapyear(year) then
+  return 366
+ else
+  return 365
+ end
+end
+
+gettime = function(unixtimestmp)
+  local year = EPOCH_YR
+  local dayclock = math.floor(unixtimestmp % SECS_DAY)
+  local dayno = math.floor(unixtimestmp / SECS_DAY)
+
+  local sec = dayclock % 60
+  local min = math.floor( (dayclock % 3600) / 60)
+  local hour = math.floor(dayclock / 3600)
+  local wday = math.floor( (dayno + 4) % 7) -- Day 0 was a thursday
+
+  while (dayno >= yearsize(year))
+  do
+    dayno = dayno - yearsize(year);
+    year=year + 1
+  end
+  local yday = dayno
+  local mon = 0
+
+  isleap=0 if leapyear(year) then isleap=1 end
+  while (dayno >= ytab[isleap][mon])
+  do
+      dayno = dayno - ytab[isleap][mon];
+      mon = mon + 1
+      isleap=0 if leapyear(year) then isleap=1 end
+   end
+   mday = dayno + 1
+
+  return year, mon, mday, hour, min, sec, wday
+end
+
+
diff --git a/unit/unix2time.lua b/unit/unix2time.lua
index 0c21db8..699d1e0 100644
--- a/unit/unix2time.lua
+++ b/unit/unix2time.lua
@@ -1,83 +1,2 @@
----
--- Source:
--- http://www.jbox.dk/sanos/source/lib/time.c.html
-
-YEAR0=1900
-
-EPOCH_YR=1970
---SECS_DAY=(24L * 60L * 60L)
-SECS_DAY=86400
-
-ytab = {}
-ytab[0] = {} 
-ytab[1] = {} 
-ytab[0][0] = 31
-ytab[0][1] = 28
-ytab[0][2] = 31
-ytab[0][3] = 30
-ytab[0][4] = 31
-ytab[0][5] = 30
-ytab[0][6] = 31
-ytab[0][7] = 31
-ytab[0][8] = 30
-ytab[0][9] = 31
-ytab[0][10] = 30
-ytab[0][11] = 31
-ytab[1][0] =  31
-ytab[1][1] = 29
-ytab[1][2] = 31
-ytab[1][3] = 30
-ytab[1][4] = 31
-ytab[1][5] = 30
-ytab[1][6] = 31
-ytab[1][7] = 31
-ytab[1][8] = 30
-ytab[1][9] = 31
-ytab[1][10] = 30
-ytab[1][11] = 31
-
-
-leapyear = function(year)
-    return  ( not ((year) % 4) and (((year) % 100) or not ((year) % 400)))
-end
-
-yearsize = function(year)
- if leapyear(year) then
-  return 366
- else
-  return 365
- end
-end
-
-gettime = function(unixtimestmp)
-  local year = EPOCH_YR
-  local dayclock = math.floor(unixtimestmp % SECS_DAY)
-  local dayno = math.floor(unixtimestmp / SECS_DAY)
-
-  local sec = dayclock % 60
-  local min = math.floor( (dayclock % 3600) / 60)
-  local hour = math.floor(dayclock / 3600)
-  local wday = math.floor( (dayno + 4) % 7) -- Day 0 was a thursday
-
-  while (dayno >= yearsize(year))
-  do
-    dayno = dayno - yearsize(year);
-    year=year + 1
-  end
-  local yday = dayno
-  local mon = 0
- 
-  isleap=0 if leapyear(year) then isleap=1 end
-  while (dayno >= ytab[isleap][mon]) 
-  do
-      dayno = dayno - ytab[isleap][mon];
-      mon = mon + 1
-      isleap=0 if leapyear(year) then isleap=1 end
-   end
-   mday = dayno + 1
-
-  return year, mon, mday, hour, min, sec, wday
-end
-
+dofile("../timecore.lua")
 print( gettime(1462391501) )
-