From fb6da20b0c1de7a633bd1bea440fe8e71267e383 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Tue, 26 Jul 2022 18:09:25 +0200
Subject: [PATCH] Refactor: move date/time detection to own header

---
 src/detection/datetime.c |  1 +
 src/detection/datetime.h | 35 +++++++++++++++++++++++++++++++++++
 src/fastfetch.h          | 28 ----------------------------
 src/modules/date.c       |  1 +
 src/modules/datetime.c   |  1 +
 src/modules/time.c       |  1 +
 6 files changed, 39 insertions(+), 28 deletions(-)
 create mode 100644 src/detection/datetime.h

diff --git a/src/detection/datetime.c b/src/detection/datetime.c
index 356633d18..d96431b3d 100644
--- a/src/detection/datetime.c
+++ b/src/detection/datetime.c
@@ -1,4 +1,5 @@
 #include "fastfetch.h"
+#include "detection/datetime.h"
 
 #include <time.h>
 #include <pthread.h>
diff --git a/src/detection/datetime.h b/src/detection/datetime.h
new file mode 100644
index 000000000..7f6956e61
--- /dev/null
+++ b/src/detection/datetime.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#ifndef FF_INCLUDED_detection_datetime
+#define FF_INCLUDED_detection_datetime
+
+#include "fastfetch.h"
+
+typedef struct FFDateTimeResult
+{
+    //Examples for 21.02.2022 - 15:18:37
+    uint16_t year; //2022
+    uint8_t yearShort; //22
+    uint8_t month; //2
+    FFstrbuf monthPretty; //02
+    FFstrbuf monthName; //February
+    FFstrbuf monthNameShort; //Feb
+    uint8_t week; //8
+    FFstrbuf weekday; //Monday
+    FFstrbuf weekdayShort; //Mon
+    uint16_t dayInYear; //52
+    uint8_t dayInMonth; //21
+    uint8_t dayInWeek; //1
+    uint8_t hour; //15
+    FFstrbuf hourPretty; //15
+    uint8_t hour12; //3
+    FFstrbuf hour12Pretty; //03
+    uint8_t minute; //18
+    FFstrbuf minutePretty; //18
+    uint8_t second; //37
+    FFstrbuf secondPretty; //37
+} FFDateTimeResult;
+
+const FFDateTimeResult* ffDetectDateTime(const FFinstance* instance);
+
+#endif
diff --git a/src/fastfetch.h b/src/fastfetch.h
index ceccfa0d5..44e3a7c8b 100644
--- a/src/fastfetch.h
+++ b/src/fastfetch.h
@@ -211,31 +211,6 @@ typedef struct FFMediaResult
     FFstrbuf url;
 } FFMediaResult;
 
-typedef struct FFDateTimeResult
-{
-    //Examples for 21.02.2022 - 15:18:37
-    uint16_t year; //2022
-    uint8_t yearShort; //22
-    uint8_t month; //2
-    FFstrbuf monthPretty; //02
-    FFstrbuf monthName; //February
-    FFstrbuf monthNameShort; //Feb
-    uint8_t week; //8
-    FFstrbuf weekday; //Monday
-    FFstrbuf weekdayShort; //Mon
-    uint16_t dayInYear; //52
-    uint8_t dayInMonth; //21
-    uint8_t dayInWeek; //1
-    uint8_t hour; //15
-    FFstrbuf hourPretty; //15
-    uint8_t hour12; //3
-    FFstrbuf hour12Pretty; //03
-    uint8_t minute; //18
-    FFstrbuf minutePretty; //18
-    uint8_t second; //37
-    FFstrbuf secondPretty; //37
-} FFDateTimeResult;
-
 //////////////////////
 // Init functions //
 //////////////////////
@@ -269,9 +244,6 @@ const FFTempsResult* ffDetectTemps(const FFinstance* instance);
 //detection/media.c
 const FFMediaResult* ffDetectMedia(FFinstance* instance);
 
-//detection/dateTime.c
-const FFDateTimeResult* ffDetectDateTime(const FFinstance* instance);
-
 //detection/vulkan.c
 const FFVulkanResult* ffDetectVulkan(const FFinstance* instance);
 
diff --git a/src/modules/date.c b/src/modules/date.c
index 5eb102a69..96ea03e1e 100644
--- a/src/modules/date.c
+++ b/src/modules/date.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/datetime.h"
 
 #define FF_DATE_MODULE_NAME "Date"
 
diff --git a/src/modules/datetime.c b/src/modules/datetime.c
index c6e6e2db6..61745c16a 100644
--- a/src/modules/datetime.c
+++ b/src/modules/datetime.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/datetime.h"
 
 #define FF_DATETIME_MODULE_NAME "Date & Time"
 #define FF_DATETIME_NUM_FORMAT_ARGS 20
diff --git a/src/modules/time.c b/src/modules/time.c
index 9d236e5be..d06b5b714 100644
--- a/src/modules/time.c
+++ b/src/modules/time.c
@@ -1,5 +1,6 @@
 #include "fastfetch.h"
 #include "common/printing.h"
+#include "detection/datetime.h"
 
 #define FF_TIME_MODULE_NAME "Time"