From 8daa3dfbdf9290adb1f616032c306ec2ed2952bc Mon Sep 17 00:00:00 2001
From: XMLHexagram <i@hexagr.am>
Date: Tue, 3 Dec 2024 01:54:57 +0100
Subject: [PATCH 1/3] fix(macOS): Exit button in tray menu only hide window

---
 lib/utils/close_manager.dart | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/utils/close_manager.dart b/lib/utils/close_manager.dart
index 0e6d9bbfd..51abd903f 100644
--- a/lib/utils/close_manager.dart
+++ b/lib/utils/close_manager.dart
@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:bitsdojo_window/bitsdojo_window.dart';
+import 'package:flutter/services.dart';
 import 'package:local_notifier/local_notifier.dart';
 import 'package:flutter_window_close/flutter_window_close.dart';
 
@@ -40,7 +41,12 @@ class CloseManager {
 
   close() {
     forceClose = true;
-    appWindow.close();
+    
+    if (Platform.isMacOS) {
+      SystemNavigator.pop();
+    } else {
+      appWindow.close();
+    }
   }
 }
 

From 2d1e083c55405d54c9022d5ec4c86510b231b01e Mon Sep 17 00:00:00 2001
From: XMLHexagram <i@hexagr.am>
Date: Tue, 3 Dec 2024 02:27:56 +0100
Subject: [PATCH 2/3] lint: fix cargo clippy

---
 analysis/src/shared_utils/audio_metadata_reader.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/analysis/src/shared_utils/audio_metadata_reader.rs b/analysis/src/shared_utils/audio_metadata_reader.rs
index a5c16dce8..7e5e3986c 100644
--- a/analysis/src/shared_utils/audio_metadata_reader.rs
+++ b/analysis/src/shared_utils/audio_metadata_reader.rs
@@ -39,11 +39,11 @@ pub fn get_codec_information(track: &Track) -> Result<(u32, f64), symphonia::cor
     let sample_rate = track
         .codec_params
         .sample_rate
-        .ok_or_else(|| symphonia::core::errors::Error::Unsupported("No sample rate found"))?;
+        .ok_or(symphonia::core::errors::Error::Unsupported("No sample rate found"))?;
     let duration = track
         .codec_params
         .n_frames
-        .ok_or_else(|| symphonia::core::errors::Error::Unsupported("No duration found"))?;
+        .ok_or(symphonia::core::errors::Error::Unsupported("No duration found"))?;
 
     let time_base = track
         .codec_params

From 369f8c27d8375b2eb826d734f5b9360dfdab0da5 Mon Sep 17 00:00:00 2001
From: XMLHexagram <i@hexagr.am>
Date: Tue, 3 Dec 2024 02:40:27 +0100
Subject: [PATCH 3/3] lint: cargo fmt

---
 .../src/shared_utils/audio_metadata_reader.rs | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/analysis/src/shared_utils/audio_metadata_reader.rs b/analysis/src/shared_utils/audio_metadata_reader.rs
index 7e5e3986c..b58c49f1f 100644
--- a/analysis/src/shared_utils/audio_metadata_reader.rs
+++ b/analysis/src/shared_utils/audio_metadata_reader.rs
@@ -36,14 +36,20 @@ pub fn get_format(file_path: &str) -> Result<Box<dyn FormatReader>> {
 }
 
 pub fn get_codec_information(track: &Track) -> Result<(u32, f64), symphonia::core::errors::Error> {
-    let sample_rate = track
-        .codec_params
-        .sample_rate
-        .ok_or(symphonia::core::errors::Error::Unsupported("No sample rate found"))?;
-    let duration = track
-        .codec_params
-        .n_frames
-        .ok_or(symphonia::core::errors::Error::Unsupported("No duration found"))?;
+    let sample_rate =
+        track
+            .codec_params
+            .sample_rate
+            .ok_or(symphonia::core::errors::Error::Unsupported(
+                "No sample rate found",
+            ))?;
+    let duration =
+        track
+            .codec_params
+            .n_frames
+            .ok_or(symphonia::core::errors::Error::Unsupported(
+                "No duration found",
+            ))?;
 
     let time_base = track
         .codec_params