Browse Source

Create namespace "time" for time module

public 2 years ago
parent
commit
4de5cc83f0

+ 43 - 37
include/ls_std/time/Date.hpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2022-05-05
+ * Changed:         2022-05-07
  *
  * */
 
@@ -15,43 +15,49 @@
 
 namespace ls
 {
-  class Date : public ls::Class
+  namespace std
   {
-    public:
-
-      Date();
-      ~Date() override = default;
-
-      // arithmetic operators
-
-      ls::Date &operator+(int _value);
-      ls::Date &operator-(int _value);
-      ls::Date &operator+=(int _value);
-      ls::Date &operator-=(int _value);
-
-      // additional functionality
-
-      bool after(const ls::Date &_foreignDate) const;
-      bool before(const ls::Date &_foreignDate) const;
-      int getDay();
-      int getHour();
-      int getMinute();
-      int getMonth();
-      int getSecond();
-      time_t getTime() const;
-      int getYear();
-      void setTime(time_t _timestamp);
-      ::std::string toString();
-
-    private:
-
-      time_t timestamp{};
-      tm *localTime{};
-
-      void _decrementByDays(int _value);
-      void _incrementByDays(int _value);
-      void _init();
-  };
+    namespace time
+    {
+      class Date : public ls::Class
+      {
+        public:
+
+          Date();
+          ~Date() override = default;
+
+          // arithmetic operators
+
+          ls::std::time::Date &operator+(int _value);
+          ls::std::time::Date &operator-(int _value);
+          ls::std::time::Date &operator+=(int _value);
+          ls::std::time::Date &operator-=(int _value);
+
+          // additional functionality
+
+          bool after(const ls::std::time::Date &_foreignDate) const;
+          bool before(const ls::std::time::Date &_foreignDate) const;
+          int getDay();
+          int getHour();
+          int getMinute();
+          int getMonth();
+          int getSecond();
+          time_t getTime() const;
+          int getYear();
+          void setTime(time_t _timestamp);
+          ::std::string toString();
+
+        private:
+
+          time_t timestamp{};
+          tm *localTime{};
+
+          void _decrementByDays(int _value);
+          void _incrementByDays(int _value);
+          void _init();
+      };
+    }
+  }
 }
 
 #endif

+ 2 - 2
source/ls_std/io/logging/Logger.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2022-05-06
+ * Changed:         2022-05-07
  *
  * */
 
@@ -90,7 +90,7 @@ void ls::Logger::_assignWriter(const ::std::shared_ptr<ls::IWriter> &_writer)
 
 void ls::Logger::_log(const ls::byte *_data, const ls::LogLevel &_logLevel)
 {
-  ls::Date date{};
+  ls::std::time::Date date{};
   ::std::string message = "[" + date.toString() + "] " + ls::std::boxing::String{_logLevel.toString() + ":"}.padRight(10, ' ') + ::std::string(_data) + ls::NewLine::getUnixNewLine();
   this->writer->write(message);
 }

+ 24 - 24
source/ls_std/time/Date.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2022-05-05
+ * Changed:         2022-05-07
  *
  * */
 
@@ -11,106 +11,106 @@
 #include <sstream>
 #include <ls_std/time/Date.hpp>
 
-ls::Date::Date() : ls::Class("Date")
+ls::std::time::Date::Date() : ls::Class("Date")
 {
-  this->timestamp = std::time(nullptr);
+  this->timestamp = ::std::time(nullptr);
   this->_init();
 }
 
-ls::Date &ls::Date::operator+(int _value)
+ls::std::time::Date &ls::std::time::Date::operator+(int _value)
 {
   this->_incrementByDays(_value);
   return *this;
 }
 
-ls::Date &ls::Date::operator-(int _value)
+ls::std::time::Date &ls::std::time::Date::operator-(int _value)
 {
   this->_decrementByDays(_value);
   return *this;
 }
 
-ls::Date &ls::Date::operator+=(int _value)
+ls::std::time::Date &ls::std::time::Date::operator+=(int _value)
 {
   this->_incrementByDays(_value);
   return *this;
 }
 
-ls::Date &ls::Date::operator-=(int _value)
+ls::std::time::Date &ls::std::time::Date::operator-=(int _value)
 {
   this->_decrementByDays(_value);
   return *this;
 }
 
-bool ls::Date::after(const ls::Date &_foreignDate) const
+bool ls::std::time::Date::after(const ls::std::time::Date &_foreignDate) const
 {
   return this->timestamp > _foreignDate.getTime();
 }
 
-bool ls::Date::before(const ls::Date &_foreignDate) const
+bool ls::std::time::Date::before(const ls::std::time::Date &_foreignDate) const
 {
   return this->timestamp < _foreignDate.getTime();
 }
 
-int ls::Date::getDay()
+int ls::std::time::Date::getDay()
 {
   return this->localTime->tm_mday;
 }
 
-int ls::Date::getHour()
+int ls::std::time::Date::getHour()
 {
   return this->localTime->tm_hour;
 }
 
-int ls::Date::getMinute()
+int ls::std::time::Date::getMinute()
 {
   return this->localTime->tm_min;
 }
 
-int ls::Date::getMonth()
+int ls::std::time::Date::getMonth()
 {
   return this->localTime->tm_mon + 1;
 }
 
-int ls::Date::getSecond()
+int ls::std::time::Date::getSecond()
 {
   return this->localTime->tm_sec;
 }
 
-int ls::Date::getYear()
+int ls::std::time::Date::getYear()
 {
   return this->localTime->tm_year + 1900;
 }
 
-time_t ls::Date::getTime() const
+time_t ls::std::time::Date::getTime() const
 {
   return this->timestamp;
 }
 
-void ls::Date::setTime(time_t _timestamp)
+void ls::std::time::Date::setTime(time_t _timestamp)
 {
   this->timestamp = _timestamp;
   this->_init();
 }
 
-std::string ls::Date::toString()
+std::string ls::std::time::Date::toString()
 {
-  std::stringstream _stream{};
-  _stream << std::put_time(this->localTime, "%Y-%m-%d %H:%M:%S");
+  ::std::stringstream _stream{};
+  _stream << ::std::put_time(this->localTime, "%Y-%m-%d %H:%M:%S");
 
   return _stream.str();
 }
 
-void ls::Date::_decrementByDays(int _value)
+void ls::std::time::Date::_decrementByDays(int _value)
 {
   this->timestamp -= (_value * 86400);
 }
 
-void ls::Date::_incrementByDays(int _value)
+void ls::std::time::Date::_incrementByDays(int _value)
 {
   this->timestamp += (_value * 86400);
 }
 
-void ls::Date::_init()
+void ls::std::time::Date::_init()
 {
-  this->localTime = std::localtime(&this->timestamp);
+  this->localTime = ::std::localtime(&this->timestamp);
 }

+ 26 - 26
test/cases/time/DateTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-14
- * Changed:         2022-05-05
+ * Changed:         2022-05-07
  *
  * */
 
@@ -31,7 +31,7 @@ namespace
 
   TEST_F(DateTest, operator_add)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     time_t timestamp = date.getTime();
 
     date = date + 1;
@@ -40,7 +40,7 @@ namespace
 
   TEST_F(DateTest, operator_add_with_negative_value)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     time_t timestamp = date.getTime();
 
     date = date + (-1);
@@ -49,7 +49,7 @@ namespace
 
   TEST_F(DateTest, operator_subtraction)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     time_t timestamp = date.getTime();
 
     date = date - 1;
@@ -58,7 +58,7 @@ namespace
 
   TEST_F(DateTest, operator_subtraction_with_negative_value)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     time_t timestamp = date.getTime();
 
     date = date - (-1);
@@ -67,7 +67,7 @@ namespace
 
   TEST_F(DateTest, operator_plus_equals)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     time_t timestamp = date.getTime();
 
     date += 2;
@@ -77,7 +77,7 @@ namespace
 
   TEST_F(DateTest, operator_plus_equals_with_negative_value)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     time_t timestamp = date.getTime();
 
     date += -2;
@@ -87,7 +87,7 @@ namespace
 
   TEST_F(DateTest, operator_minus_equals)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     time_t timestamp = date.getTime();
 
     date -= 2;
@@ -97,7 +97,7 @@ namespace
 
   TEST_F(DateTest, operator_minus_equals_with_negative_value)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     time_t timestamp = date.getTime();
 
     date -= -2;
@@ -109,9 +109,9 @@ namespace
 
   TEST_F(DateTest, after)
   {
-    ls::Date date{}; // today
+    ls::std::time::Date date{}; // today
 
-    ls::Date referenceDate{};
+    ls::std::time::Date referenceDate{};
     referenceDate = referenceDate - 1; // yesterday
 
     ASSERT_TRUE(date.after(referenceDate));
@@ -119,8 +119,8 @@ namespace
 
   TEST_F(DateTest, after_is_before_refernce_date)
   {
-    ls::Date date{}; // is today
-    ls::Date referenceDate{};
+    ls::std::time::Date date{}; // is today
+    ls::std::time::Date referenceDate{};
 
     referenceDate = referenceDate + 1; // is tomorrow
 
@@ -129,18 +129,18 @@ namespace
 
   TEST_F(DateTest, before)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     date = date - 1; // yesterday
 
-    ls::Date referenceDate{}; // today
+    ls::std::time::Date referenceDate{}; // today
 
     ASSERT_TRUE(date.before(referenceDate));
   }
 
   TEST_F(DateTest, before_is_after_reference_date)
   {
-    ls::Date date{}; // today
-    ls::Date referenceDate{};
+    ls::std::time::Date date{}; // today
+    ls::std::time::Date referenceDate{};
 
     referenceDate = referenceDate - 1; // yesterday
 
@@ -149,7 +149,7 @@ namespace
 
   TEST_F(DateTest, getDay)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     date.setTime(1597433693);
 
     ASSERT_EQ(14, date.getDay());
@@ -157,7 +157,7 @@ namespace
 
   TEST_F(DateTest, getHour)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     date.setTime(1597433693);
 
     ASSERT_EQ(21, date.getHour());
@@ -165,7 +165,7 @@ namespace
 
   TEST_F(DateTest, getMinute)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     date.setTime(1597433693);
 
     ASSERT_EQ(34, date.getMinute());
@@ -173,7 +173,7 @@ namespace
 
   TEST_F(DateTest, getMonth)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     date.setTime(1597433693);
 
     ASSERT_EQ(8, date.getMonth());
@@ -181,7 +181,7 @@ namespace
 
   TEST_F(DateTest, getSecond)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     date.setTime(1597433693);
 
     ASSERT_EQ(53, date.getSecond());
@@ -189,13 +189,13 @@ namespace
 
   TEST_F(DateTest, getTime)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     ASSERT_TRUE(date.getTime() > 0);
   }
 
   TEST_F(DateTest, getYear)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     date.setTime(1597433693);
 
     ASSERT_EQ(2020, date.getYear());
@@ -203,7 +203,7 @@ namespace
 
   TEST_F(DateTest, setTime)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     ASSERT_TRUE(date.getTime() > 1000000);
 
     date.setTime(1000);
@@ -212,7 +212,7 @@ namespace
 
   TEST_F(DateTest, toString)
   {
-    ls::Date date{};
+    ls::std::time::Date date{};
     std::string regexSearchString = R"((\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}))";
     std::regex _regex{regexSearchString};
     std::string dateString = date.toString();