Merge branch 'main' into release

.gitignore

@@ -14,6 +14,7 @@ dist-ssr
 .env
 .env.production
 .env.test
+target
 
 # Editor directories and files
 .vscode/*
@@ -26,4 +27,4 @@ dist-ssr
 *.sln
 *.sw?
 .turbo
-pnpm-lock.yaml
+pnpm-lock.yaml

Cargo.toml

@@ -0,0 +1,3 @@
+[workspace]
+resolver = "2"
+members = ["apps/desktop/src-tauri", "crates/*"]

apps/desktop/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "version": "0.2.7",
   "scripts": {
-    "dev": "tauri dev",
+    "dev": "RUST_BACKTRACE=1 tauri dev",
     "build": "tsc && next build",
     "tauri": "tauri"
   },

apps/desktop/src-tauri/Cargo.toml

@@ -14,7 +14,36 @@ tauri-build = { version = "1.5.1", features = [] }
 ffmpeg-sidecar = "0.5.1"
 
 [dependencies]
-tauri = { version = "1.6.1", features = [ "system-tray", "updater", "macos-private-api", "window-set-position", "fs-write-file", "fs-remove-file", "fs-read-file", "fs-rename-file", "fs-exists", "fs-remove-dir", "fs-read-dir", "fs-copy-file", "fs-create-dir", "window-set-ignore-cursor-events", "window-unminimize", "window-minimize", "window-close", "window-show", "window-start-dragging", "window-hide", "window-unmaximize", "window-maximize", "window-set-always-on-top", "shell-open", "devtools", "os-all", "http-all", "icon-png"] }
+tauri = { version = "1.6.1", features = [
+  "system-tray",
+  "updater",
+  "macos-private-api",
+  "window-set-position",
+  "fs-write-file",
+  "fs-remove-file",
+  "fs-read-file",
+  "fs-rename-file",
+  "fs-exists",
+  "fs-remove-dir",
+  "fs-read-dir",
+  "fs-copy-file",
+  "fs-create-dir",
+  "window-set-ignore-cursor-events",
+  "window-unminimize",
+  "window-minimize",
+  "window-close",
+  "window-show",
+  "window-start-dragging",
+  "window-hide",
+  "window-unmaximize",
+  "window-maximize",
+  "window-set-always-on-top",
+  "shell-open",
+  "devtools",
+  "os-all",
+  "http-all",
+  "icon-png",
+] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tauri-plugin-context-menu = "0.7.0"
@@ -35,7 +64,7 @@ dotenv_codegen = "0.15.0"
 byteorder = "1.4.3"
 bytemuck = "1.14.3"
 regex = "1"
-capture = { path = "./src/capture" }
+capture = { path = "../../../crates/capture" }
 image = "0.24.9"
 sentry = "0.32.2"
 fix-path-env = { git = "https://github.com/tauri-apps/fix-path-env-rs" }

apps/desktop/src-tauri/src/main.rs

@@ -1,27 +1,29 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-use std::collections::LinkedList;
-use std::sync::{Arc};
-use std::path::PathBuf;
 use cpal::Devices;
 use regex::Regex;
+use std::collections::LinkedList;
+use std::path::PathBuf;
+use std::sync::atomic::AtomicBool;
+use std::sync::Arc;
+use std::vec;
+use tauri::{
+    CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTraySubmenu, Window,
+};
+use tauri_plugin_oauth::start;
+use tauri_plugin_positioner::{Position, WindowExt};
 use tokio::sync::Mutex;
-use std::sync::atomic::{AtomicBool};
-use std::{vec};
-use tauri::{CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTraySubmenu, Window};
-use window_vibrancy::{apply_blur, apply_vibrancy, NSVisualEffectMaterial};
 use window_shadows::set_shadow;
-use tauri_plugin_positioner::{WindowExt, Position};
-use tauri_plugin_oauth::start;
+use window_vibrancy::{apply_blur, apply_vibrancy, NSVisualEffectMaterial};
 
+mod media;
 mod recording;
 mod upload;
 mod utils;
-mod media;
 
-use recording::{RecordingState, start_dual_recording, stop_all_recordings};
-use media::{enumerate_audio_devices};
-use utils::{has_screen_capture_access};
+use media::enumerate_audio_devices;
+use recording::{start_dual_recording, stop_all_recordings, RecordingState};
+use utils::has_screen_capture_access;
 
 use ffmpeg_sidecar::{
     command::ffmpeg_is_installed,