wawa

.clang-format

@@ -3,7 +3,6 @@ AlignArrayOfStructures: Right
 AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: true
 AllowShortBlocksOnASingleLine: Always
-AllowShortCompoundRequirementOnASingleLine: true
 AllowShortEnumsOnASingleLine: true
 AllowShortFunctionsOnASingleLine: All
 AllowShortLoopsOnASingleLine: true

src/config/config.h

@@ -1,18 +1,16 @@
 #pragma once
 
-#include <cstdlib>
 #include <rfl.hpp>
 #include <rfl/Field.hpp>
-#include <rfl/default.hpp>
-#include <string>
 
 #include "../util/macros.h"
+#include "../util/types.h"
 #include "weather.h"
 
-using Location = std::variant<std::string, Coords>;
+using Location = std::variant<string, Coords>;
 
 struct General {
-  rfl::Field<"name", std::string> name = "user";
+  rfl::Field<"name", string> name = "user";
 };
 
 struct NowPlaying {
@@ -21,8 +19,8 @@ struct NowPlaying {
 
 struct Weather {
   Location location;
-  std::string api_key;
-  std::string units;
+  string   api_key;
+  string   units;
 
   [[nodiscard]] fn getWeatherInfo() const -> WeatherOutput;
 };

src/config/weather.cpp

@@ -46,18 +46,18 @@ fn WriteCacheToFile(const WeatherOutput& data) -> Result<> {
   return Ok();
 }
 
-fn WriteCallback(void* contents, size_t size, size_t nmemb, std::string* str) -> size_t {
+fn WriteCallback(void* contents, size_t size, size_t nmemb, string* str) -> size_t {
   size_t totalSize = size * nmemb;
   str->append(static_cast<char*>(contents), totalSize);
   return totalSize;
 }
 
 // Function to make API request
-fn MakeApiRequest(const std::string& url) -> Result<WeatherOutput> {
+fn MakeApiRequest(const string& url) -> Result<WeatherOutput> {
   fmt::println("Making API request to URL: {}", url);
 
   CURL*  curl = curl_easy_init();
-  std::string responseBuffer;
+  string responseBuffer;
 
   if (curl) {
     curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
@@ -103,14 +103,14 @@ fn Weather::getWeatherInfo() const -> WeatherOutput {
 
   WeatherOutput result;
 
-  if (holds_alternative<std::string>(location)) {
-    const std::string city = get<std::string>(location);
+  if (holds_alternative<string>(location)) {
+    const string city = get<string>(location);
 
     const char* loc = curl_easy_escape(nullptr, city.c_str(), static_cast<int>(city.length()));
 
     fmt::println("City: {}", loc);
 
-    const std::string apiUrl = fmt::format(
+    const string apiUrl = fmt::format(
       "https://api.openweathermap.org/data/2.5/"
       "weather?q={}&appid={}&units={}",
       loc,
@@ -124,7 +124,7 @@ fn Weather::getWeatherInfo() const -> WeatherOutput {
 
     fmt::println("Coordinates: lat = {:.3f}, lon = {:.3f}", lat, lon);
 
-    const std::string apiUrl = fmt::format(
+    const string apiUrl = fmt::format(
       "https://api.openweathermap.org/data/2.5/"
       "weather?lat={:.3f}&lon={:.3f}&appid={}&units={}",
       lat,

src/config/weather.h

@@ -1,19 +1,18 @@
 #pragma once
 
-#include <fmt/core.h>
 #include <rfl.hpp>
 #include <rfl/toml.hpp>
 #include <string>
 
-#include "../util/numtypes.h"
+#include "../util/types.h"
 
 using degrees    = rfl::Validator<u16, rfl::Minimum<0>, rfl::Maximum<360>>;
 using percentage = rfl::Validator<i8, rfl::Minimum<0>, rfl::Maximum<100>>;
 
 struct Condition {
-  std::string description;
-  std::string icon;
-  std::string main;
+  string description;
+  string icon;
+  string main;
   usize  id;
 };
 
@@ -40,7 +39,7 @@ struct Precipitation {
 };
 
 struct Sys {
-  std::string country;
+  string country;
   usize  id;
   usize  sunrise;
   usize  sunset;
@@ -64,8 +63,8 @@ struct WeatherOutput {
   rfl::Rename<"coord", Coords> coords;
   std::optional<Precipitation> rain;
   std::optional<Precipitation> snow;
-  std::string                  base;
-  std::string                  name;
+  string                       base;
+  string                       name;
   std::vector<Condition>       weather;
   Sys                          sys;
   usize                        cod;

src/main.cpp

@@ -6,9 +6,6 @@
 #include "config/config.h"
 #include "os/os.h"
 
-using std::future;
-using std::string;
-
 struct BytesToGiB {
   u64 value;
 };
@@ -28,10 +25,10 @@ struct fmt::formatter<BytesToGiB> : formatter<double> {
   }
 };
 
-fn GetDate() -> std::string {
+fn GetDate() -> string {
   const std::tm localTime = fmt::localtime(time(nullptr));
 
-  std::string date = fmt::format("{:%e}", localTime);
+  string date = fmt::format("{:%e}", localTime);
 
   if (!date.empty() && std::isspace(date.front()))
     date.erase(date.begin());
@@ -48,7 +45,9 @@ fn GetDate() -> std::string {
   return fmt::format("{:%B} {}, {:%-I:%0M %p}", localTime, date, localTime);
 }
 
-fn main() -> int {
+fn main() -> i32 {
+  using std::future;
+
   const Config& config = Config::getInstance();
 
   auto weatherFuture =
@@ -68,13 +67,13 @@ fn main() -> int {
   const bool   nowPlayingEnabled = nowPlayingEnabledFuture.get();
   const char*  version           = osVersionFuture.get();
   const string date              = dateFuture.get();
-  const std::string name              = config.general.get().name.get();
+  const string name              = config.general.get().name.get();
   const u64    mem               = memInfoFuture.get();
 
   fmt::println("Hello {}!", name);
   fmt::println("Today is: {}", date);
   fmt::println("It is {}°F in {}", temp, townName);
-  fmt::println("Installed RAM: {:.2f} GiB", BytesToGiB(mem));
+  fmt::println("Installed RAM: {:.2f}", BytesToGiB(mem));
   fmt::println("{}", version);
 
   if (nowPlayingEnabled)

src/os/linux.cpp

@@ -8,8 +8,6 @@
 
 #include "os.h"
 
-using std::string;
-
 fn ParseLineAsNumber(const string& input) -> u64 {
   // Find the first number
   string::size_type start = 0;
@@ -49,12 +47,12 @@ fn GetOSVersion() -> const char* {
     return nullptr;
   }
 
-  std::string       line;
-  const std::string prefix = "PRETTY_NAME=";
+  string       line;
+  const string prefix = "PRETTY_NAME=";
 
   while (std::getline(file, line)) {
     if (line.find(prefix) == 0) {
-      std::string prettyName = line.substr(prefix.size());
+      string prettyName = line.substr(prefix.size());
 
       // Remove surrounding quotes if present
       if (!prettyName.empty() && prettyName.front() == '"' && prettyName.back() == '"')
@@ -71,18 +69,18 @@ fn GetOSVersion() -> const char* {
   return nullptr;
 }
 
-fn GetMprisPlayers(sdbus::IConnection& connection) -> std::vector<std::string> {
+fn GetMprisPlayers(sdbus::IConnection& connection) -> std::vector<string> {
   const char *dbusInterface = "org.freedesktop.DBus", *dbusObjectPath = "/org/freedesktop/DBus",
              *dbusMethodListNames = "ListNames";
 
   const std::unique_ptr<sdbus::IProxy> dbusProxy =
     createProxy(connection, dbusInterface, dbusObjectPath);
 
-  std::vector<std::string> names;
+  std::vector<string> names;
 
   dbusProxy->callMethod(dbusMethodListNames).onInterface(dbusInterface).storeResultsTo(names);
 
-  std::vector<std::string> mprisPlayers;
+  std::vector<string> mprisPlayers;
 
   for (const std::basic_string<char>& name : names)
     if (const char* mprisInterfaceName = "org.mpris.MediaPlayer2";
@@ -92,26 +90,26 @@ fn GetMprisPlayers(sdbus::IConnection& connection) -> std::vector<std::string> {
   return mprisPlayers;
 }
 
-fn GetActivePlayer(const std::vector<std::string>& mprisPlayers) -> std::string {
+fn GetActivePlayer(const std::vector<string>& mprisPlayers) -> string {
   if (!mprisPlayers.empty())
     return mprisPlayers.front();
 
   return "";
 }
 
-fn GetNowPlaying() -> std::string {
+fn GetNowPlaying() -> string {
   try {
     const char *playerObjectPath    = "/org/mpris/MediaPlayer2",
                *playerInterfaceName = "org.mpris.MediaPlayer2.Player";
 
     std::unique_ptr<sdbus::IConnection> connection = sdbus::createSessionBusConnection();
 
-    std::vector<std::string> mprisPlayers = GetMprisPlayers(*connection);
+    std::vector<string> mprisPlayers = GetMprisPlayers(*connection);
 
     if (mprisPlayers.empty())
       return "";
 
-    std::string activePlayer = GetActivePlayer(mprisPlayers);
+    string activePlayer = GetActivePlayer(mprisPlayers);
 
     if (activePlayer.empty())
       return "";
@@ -119,13 +117,13 @@ fn GetNowPlaying() -> std::string {
     std::unique_ptr<sdbus::IProxy> playerProxy =
       sdbus::createProxy(*connection, activePlayer, playerObjectPath);
 
-    std::map<std::string, sdbus::Variant> metadata =
+    std::map<string, sdbus::Variant> metadata =
       playerProxy->getProperty("Metadata").onInterface(playerInterfaceName);
 
     if (const auto iter = metadata.find("xesam:title");
 
-        iter != metadata.end() && iter->second.containsValueOfType<std::string>())
-      return iter->second.get<std::string>();
+        iter != metadata.end() && iter->second.containsValueOfType<string>())
+      return iter->second.get<string>();
   } catch (const sdbus::Error& e) { std::cerr << "Error: " << e.what() << '\n'; }
 
   return "";

src/os/macos.cpp

@@ -14,9 +14,9 @@ fn GetMemInfo() -> u64 {
   return mem;
 }
 
-fn GetNowPlaying() -> std::string {
+fn GetNowPlaying() -> string {
   if (const char* title = GetCurrentPlayingTitle(); const char* artist = GetCurrentPlayingArtist())
-    return "Now Playing: " + std::string(artist) + " - " + std::string(title);
+    return "Now Playing: " + string(artist) + " - " + string(title);
 
   return "No song playing";
 }

src/os/os.h

@@ -1,9 +1,7 @@
 #pragma once
 
-#include <string>
-
 #include "../util/macros.h"
-#include "../util/numtypes.h"
+#include "../util/types.h"
 
 /**
  * @brief Get the amount of installed RAM in bytes.
@@ -13,7 +11,7 @@ fn GetMemInfo() -> u64;
 /**
  * @brief Get the currently playing song metadata.
  */
-fn GetNowPlaying() -> std::string;
+fn GetNowPlaying() -> string;
 
 /**
  * @brief Get the OS version.

src/util/result.h

@@ -1,11 +1,11 @@
 #pragma once
 
 #include <stdexcept>
-#include <string>
 #include <utility>
 #include <variant>
 
 #include "macros.h"
+#include "types.h"
 
 /**
  * @class Error
@@ -19,16 +19,16 @@ class Error {
    * @brief Constructs an Error with a message.
    * @param message The error message.
    */
-  explicit Error(std::string message) : m_Message(std::move(message)) {}
+  explicit Error(string message) : m_Message(std::move(message)) {}
 
   /**
    * @brief Retrieves the error message.
    * @return A constant reference to the error message string.
    */
-  [[nodiscard]] fn message() const -> const std::string& { return m_Message; }
+  [[nodiscard]] fn message() const -> const string& { return m_Message; }
 
  private:
-  std::string m_Message; ///< The error message.
+  string m_Message; ///< The error message.
 };
 
 // Primary template for Result with a default type of void

src/util/types.h

@@ -2,6 +2,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include <string>
 
 /**
  * @typedef u8
@@ -117,3 +118,10 @@ using usize = std::size_t;
  * subtracting two pointers.
  */
 using isize = std::ptrdiff_t;
+
+/**
+ * @typedef string
+ * @brief Represents a string.
+ */
+using string = std::string;
+