From a757f79945882cc0397f97b417c1e04e207edee7 Mon Sep 17 00:00:00 2001
From: anulax1225 <anulax1225@icloud.com>
Date: Mon, 25 Mar 2024 22:19:00 +0100
Subject: [PATCH] Cleaned up time utilities

---
 src/bakatools/time/time.h       | 78 +--------------------------------
 src/bakatools/time/time_point.h | 48 ++++++++++++++++++++
 src/bakatools/time/time_span.h  | 40 +++++++++++++++++
 3 files changed, 90 insertions(+), 76 deletions(-)
 create mode 100644 src/bakatools/time/time_point.h
 create mode 100644 src/bakatools/time/time_span.h

diff --git a/src/bakatools/time/time.h b/src/bakatools/time/time.h
index 22948b9..7c18f36 100644
--- a/src/bakatools/time/time.h
+++ b/src/bakatools/time/time.h
@@ -1,78 +1,4 @@
 #pragma once
 
-#include <bakatoolspch.h>
-
-namespace Bk::Tools {
-    using Nanosecond = std::ratio<1,1000000000>;
-    using Microsecond = std::ratio<1,1000000>;
-    using Millisecond = std::ratio<1,1000>;
-    using Second = std::ratio<1,1>;
-    using Minute = std::ratio<60, 1>;
-    using Hour = std::ratio<3600, 1>;
-    using Day = std::ratio<84600, 1>;
-
-    using SysClock = std::chrono::system_clock;
-    using SteadyClock = std::chrono::steady_clock;
-
-    template<typename P>
-    struct TimeSpan 
-    {
-        TimeSpan(int interval = 0) 
-        : interval(std::chrono::duration<long int, P>(interval)) {}
-        TimeSpan(std::chrono::duration<long int, P> interval)
-        : interval(interval) {}
-
-        template<typename T>
-        TimeSpan<T> get_as()
-        {
-            return TimeSpan<T>(std::chrono::duration_cast<std::chrono::duration<long int, T>>(interval));
-        }
-
-        int count() { return interval.count(); }
-
-        TimeSpan<P> operator-(TimeSpan<P>& time_span)
-        {
-            return TimeSpan<P>(interval - time_span.interval);
-        }
-
-        std::chrono::duration<long int, P> interval;
-    };
-
-    template<typename C, typename P>
-    struct TimePoint
-    {
-        TimePoint() = default;
-        TimePoint(std::chrono::time_point<C> point)
-        {
-            this->point = std::chrono::time_point_cast<std::chrono::duration<long int, P>>(point);
-        }
-
-        template<typename T>
-        TimePoint<C, T> get_as()
-        {
-            return TimePoint<C, T>(std::chrono::time_point_cast<std::chrono::duration<long int, T>>(point));
-        }
-
-        TimeSpan<P> elasped()
-        {
-            return TimeSpan<P>(point.time_since_epoch());
-        }
-
-        bool is_steady()
-        {
-            return C::is_steady;
-        }
-
-        TimeSpan<P> operator-(TimePoint<C, P>& tp)
-        {
-            return TimeSpan<P>(point - tp.point);
-        }
-
-        static TimePoint<C, P> now() 
-        {
-            return TimePoint<C, P>(C::now());
-        }
-
-        std::chrono::time_point<C, std::chrono::duration<long int, P>> point;
-    };
-}
\ No newline at end of file
+#include <time/time_span.h>
+#include <time/time_point.h>
diff --git a/src/bakatools/time/time_point.h b/src/bakatools/time/time_point.h
new file mode 100644
index 0000000..33238ff
--- /dev/null
+++ b/src/bakatools/time/time_point.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <spch.h>
+#include "time_span.h"
+
+template<typename C, typename P>
+struct TimePoint
+{
+    TimePoint() = default;
+    TimePoint(std::chrono::time_point<C> point)
+    {
+        this->point = std::chrono::time_point_cast<std::chrono::duration<long int, P>>(point);
+    }
+
+    template<typename Pi>
+    TimePoint<C, Pi> as_unit()
+    {
+        return TimePoint<C, Pi>(std::chrono::time_point_cast<std::chrono::duration<long int, Pi>>(point));
+    }
+
+    template<typename Ci>
+    TimePoint<Ci, P> as_clock()
+    {
+        return TimePoint(std::chrono::clock_cast<Ci>(point));
+    }
+
+    TimeSpan<P> elasped()
+    {
+        return TimeSpan<P>(point.time_since_epoch());
+    }
+
+    bool is_steady()
+    {
+        return C::is_steady;
+    }
+
+    TimeSpan<P> operator-(TimePoint<C, P>& tp)
+    {
+        return TimeSpan<P>(point - tp.point);
+    }
+
+    static TimePoint<C, P> now() 
+    {
+        return TimePoint<C, P>(C::now());
+    }
+
+    std::chrono::time_point<C, std::chrono::duration<long int, P>> point;
+};
\ No newline at end of file
diff --git a/src/bakatools/time/time_span.h b/src/bakatools/time/time_span.h
new file mode 100644
index 0000000..966c2d4
--- /dev/null
+++ b/src/bakatools/time/time_span.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include <spch.h>
+
+using Nanosecond = std::ratio<1,1000000000>;
+using Microsecond = std::ratio<1,1000000>;
+using Millisecond = std::ratio<1,1000>;
+using Second = std::ratio<1,1>;
+using Minute = std::ratio<60, 1>;
+using Hour = std::ratio<3600, 1>;
+using Day = std::ratio<84600, 1>;
+
+using SysClock = std::chrono::system_clock;
+using SteadyClock = std::chrono::steady_clock;
+using FileClock = std::chrono::file_clock;
+using UtcClock = std::chrono::utc_clock;
+
+template<typename P>
+struct TimeSpan 
+{
+    TimeSpan(int interval = 0) 
+    : interval(std::chrono::duration<long int, P>(interval)) {}
+    TimeSpan(std::chrono::duration<long int, P> interval)
+    : interval(interval) {}
+
+    template<typename T>
+    TimeSpan<T> as_unit()
+    {
+        return TimeSpan<T>(std::chrono::duration_cast<std::chrono::duration<long int, T>>(interval));
+    }
+
+    int count() { return interval.count(); }
+
+    TimeSpan<P> operator-(TimeSpan<P>& time_span)
+    {
+        return TimeSpan<P>(interval - time_span.interval);
+    }
+
+    std::chrono::duration<long int, P> interval;
+};
\ No newline at end of file