fixes and macos stuff

src/os/macos.cpp

@@ -9,7 +9,7 @@
 #include "os.h"
 #include "src/util/types.h"
 
-fn GetMemInfo() -> Result<u64, String> {
+fn os::GetMemInfo() -> Result<u64, String> {
   u64   mem  = 0;
   usize size = sizeof(mem);
 
@@ -19,15 +19,15 @@ fn GetMemInfo() -> Result<u64, String> {
   return mem;
 }
 
-fn GetNowPlaying() -> Result<String, NowPlayingError> { return GetCurrentPlayingInfo(); }
+fn os::GetNowPlaying() -> Result<String, NowPlayingError> { return GetCurrentPlayingInfo(); }
 
-fn GetOSVersion() -> Result<String, String> { return GetMacOSVersion(); }
+fn os::GetOSVersion() -> Result<String, String> { return GetMacOSVersion(); }
 
-fn GetDesktopEnvironment() -> Option<String> { return None; }
+fn os::GetDesktopEnvironment() -> Option<String> { return None; }
 
-fn GetWindowManager() -> String { return "Yabai"; }
+fn os::GetWindowManager() -> String { return "Yabai"; }
 
-fn GetKernelVersion() -> String {
+fn os::GetKernelVersion() -> String {
   std::array<char, 256> kernelVersion {};
   usize                 kernelVersionLen = sizeof(kernelVersion);
 
@@ -35,7 +35,7 @@ fn GetKernelVersion() -> String {
   return kernelVersion.data();
 }
 
-fn GetHost() -> String {
+fn os::GetHost() -> String {
   std::array<char, 256> hwModel {};
   size_t                hwModelLen = sizeof(hwModel);
 
@@ -195,7 +195,7 @@ fn GetHost() -> String {
   return String(modelNameByHwModel[hwModel.data()]);
 }
 
-fn GetDiskUsage() -> std::pair<u64, u64> {
+fn os::GetDiskUsage() -> std::pair<u64, u64> {
   struct statvfs vfs;
 
   if (statvfs("/", &vfs) != 0)
@@ -204,6 +204,6 @@ fn GetDiskUsage() -> std::pair<u64, u64> {
   return { (vfs.f_blocks - vfs.f_bfree) * vfs.f_frsize, vfs.f_blocks * vfs.f_frsize };
 }
 
-fn GetShell() -> String { return ""; }
+fn os::GetShell() -> String { return ""; }
 
 #endif

src/os/macos/bridge.mm

@@ -95,15 +95,15 @@ extern "C++" {
         return;
       }
 
-      NSDictionary* metadata = *metadataResult;
+      const NSDictionary* const metadata = *metadataResult;
       if (!metadata) {
         result = std::unexpected(NowPlayingError { NowPlayingCode::NoPlayers });
         dispatch_semaphore_signal(semaphore);
         return;
       }
 
-      NSString* title  = metadata[@"kMRMediaRemoteNowPlayingInfoTitle"];
-      NSString* artist = metadata[@"kMRMediaRemoteNowPlayingInfoArtist"];
+      const NSString* const title  = metadata[@"kMRMediaRemoteNowPlayingInfoTitle"];
+      const NSString* const artist = metadata[@"kMRMediaRemoteNowPlayingInfoArtist"];
 
       if (!title && !artist)
         result = std::unexpected(NowPlayingError { "No metadata" });

src/os/os.h

@@ -54,4 +54,5 @@ namespace os {
    * @return std::pair<u64, u64> Used space/total space
    */
   fn GetDiskUsage() -> Pair<u64, u64>;
-}
+}
+