absolute mess

Author: oscartbeaumont

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

@@ -910,6 +910,7 @@ async fn get_video_metadata(path: PathBuf) -> Result<VideoRecordingMetadata, Str
                 .map(|s| recording_meta.path(&s.display.path))
                 .collect(),
         },
+        RecordingMetaInner::InProgress { .. } => todo!(),
     };
 
     let duration = display_paths
@@ -1389,19 +1390,31 @@ async fn save_file_dialog(
     }
 }
 
+// #[derive(Serialize, specta::Type)]
+// #[serde(tag = "status")]
+// pub enum RecordingStatus {
+//     Recording,
+//     Failed { error: String },
+//     Complete { mode: RecordingMode },
+// }
+//
+// #[serde(flatten)]
+// pub status: RecordingStatus,
+
 #[derive(Serialize, specta::Type)]
 pub struct RecordingMetaWithMode {
     #[serde(flatten)]
     pub inner: RecordingMeta,
-    pub mode: RecordingMode,
+    pub mode: Option<RecordingMode>,
 }
 
 impl RecordingMetaWithMode {
     fn new(inner: RecordingMeta) -> Self {
         Self {
             mode: match &inner.inner {
-                RecordingMetaInner::Studio(_) => RecordingMode::Studio,
-                RecordingMetaInner::Instant(_) => RecordingMode::Instant,
+                RecordingMetaInner::Studio(_) => Some(RecordingMode::Studio),
+                RecordingMetaInner::Instant(_) => Some(RecordingMode::Instant),
+                RecordingMetaInner::InProgress { .. } => None,
             },
             inner,
         }
@@ -2489,6 +2502,7 @@ fn open_project_from_path(path: &Path, app: AppHandle) -> Result<(), String> {
                 }
             }
         }
+        RecordingMetaInner::InProgress { recording } => todo!(),
     }
 
     Ok(())

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

@@ -285,6 +285,24 @@ pub async fn start_recording(
         RecordingMode::Studio => None,
     };
 
+    let date_time = if cfg!(windows) {
+        // Windows doesn't support colon in file paths
+        chrono::Local::now().format("%Y-%m-%d %H.%M.%S")
+    } else {
+        chrono::Local::now().format("%Y-%m-%d %H:%M:%S")
+    };
+
+    let meta = RecordingMeta {
+        platform: Some(Platform::default()),
+        project_path: recording_dir.clone(),
+        sharing: None, // TODO: Is this gonna be problematic as it was previously always set
+        pretty_name: format!("{target_name} {date_time}"),
+        inner: RecordingMetaInner::InProgress { recording: true },
+    };
+
+    meta.save_for_project()
+        .map_err(|e| format!("Failed to save recording meta: {e}"))?;
+
     match &inputs.capture_target {
         ScreenCaptureTarget::Window { id: _id } => {
             if let Some(show) = inputs
@@ -843,21 +861,9 @@ async fn handle_recording_finish(
         }
     };
 
-    let date_time = if cfg!(windows) {
-        // Windows doesn't support colon in file paths
-        chrono::Local::now().format("%Y-%m-%d %H.%M.%S")
-    } else {
-        chrono::Local::now().format("%Y-%m-%d %H:%M:%S")
-    };
-
-    let meta = RecordingMeta {
-        platform: Some(Platform::default()),
-        project_path: recording_dir.clone(),
-        sharing,
-        pretty_name: format!("{target_name} {date_time}"),
-        inner: meta_inner,
-    };
-
+    // TODO: Can we avoid reloading it from disk by parsing as arg?
+    let mut meta = RecordingMeta::load_for_project(&recording_dir).unwrap();
+    meta.inner = meta_inner;
     meta.save_for_project()
         .map_err(|e| format!("Failed to save recording meta: {e}"))?;
 

apps/desktop/src/routes/(window-chrome)/settings/recordings.tsx

@@ -187,7 +187,7 @@ function RecordingItem(props: {
 	onCopyVideoToClipboard: () => void;
 }) {
 	const [imageExists, setImageExists] = createSignal(true);
-	const mode = () => props.recording.meta.mode;
+	const mode = () => props.recording.meta.mode || "other"; // TODO: Fix this
 	const firstLetterUpperCase = () =>
 		mode().charAt(0).toUpperCase() + mode().slice(1);
 
@@ -210,6 +210,8 @@ function RecordingItem(props: {
 					/>
 				</Show>
 				<div class="flex flex-col gap-2">
+					{"recording" in props.recording.meta ? "TRUE" : "FALSE"}
+
 					<span>{props.recording.prettyName}</span>
 					<div
 						class={cx(

apps/desktop/src/utils/tauri.ts

@@ -420,8 +420,8 @@ export type ProjectConfiguration = { aspectRatio: AspectRatio | null; background
 export type ProjectRecordingsMeta = { segments: SegmentRecordings[] }
 export type RecordingDeleted = { path: string }
 export type RecordingEvent = { variant: "Countdown"; value: number } | { variant: "Started" } | { variant: "Stopped" } | { variant: "Failed"; error: string }
-export type RecordingMeta = (StudioRecordingMeta | InstantRecordingMeta) & { platform?: Platform | null; pretty_name: string; sharing?: SharingMeta | null }
-export type RecordingMetaWithMode = ((StudioRecordingMeta | InstantRecordingMeta) & { platform?: Platform | null; pretty_name: string; sharing?: SharingMeta | null }) & { mode: RecordingMode }
+export type RecordingMeta = (StudioRecordingMeta | InstantRecordingMeta | { recording: boolean }) & { platform?: Platform | null; pretty_name: string; sharing?: SharingMeta | null }
+export type RecordingMetaWithMode = ((StudioRecordingMeta | InstantRecordingMeta | { recording: boolean }) & { platform?: Platform | null; pretty_name: string; sharing?: SharingMeta | null }) & { mode: RecordingMode | null }
 export type RecordingMode = "studio" | "instant"
 export type RecordingOptionsChanged = null
 export type RecordingSettingsStore = { target: ScreenCaptureTarget | null; micName: string | null; cameraId: DeviceOrModelID | null; mode: RecordingMode | null; systemAudio: boolean }

crates/project/src/meta.rs

@@ -8,7 +8,6 @@ use std::{
     path::{Path, PathBuf},
 };
 use tracing::{debug, info, warn};
-// use tracing::{debug, warn};
 
 use crate::{CaptionsData, CursorEvents, CursorImage, ProjectConfiguration, XY};
 
@@ -70,15 +69,27 @@ pub struct RecordingMeta {
     pub sharing: Option<SharingMeta>,
     #[serde(flatten)]
     pub inner: RecordingMetaInner,
+    // #[serde(default)]
+    // pub upload: UploadState, // TODO: Put in `StudioRecordingMeta`, etc
 }
 
-impl specta::Flatten for RecordingMetaInner {}
+// impl specta::Flatten for RecordingMetaInner {}
+
+#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+pub enum UploadState {
+    Uploading,
+    Failed(String),
+    Complete,
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
 #[serde(untagged, rename_all = "camelCase")]
 pub enum RecordingMetaInner {
     Studio(StudioRecordingMeta),
     Instant(InstantRecordingMeta),
+    // This is set while the recording is still active.
+    InProgress { recording: bool },
+    // Failed { error: String },
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Type)]
@@ -91,6 +102,7 @@ impl RecordingMeta {
     pub fn path(&self, relative: &RelativePathBuf) -> PathBuf {
         relative.to_path(&self.project_path)
     }
+
     pub fn load_for_project(project_path: &Path) -> Result<Self, Box<dyn Error>> {
         let meta_path = project_path.join("recording-meta.json");
         let mut meta: Self = serde_json::from_str(&std::fs::read_to_string(&meta_path)?)?;
@@ -135,6 +147,7 @@ impl RecordingMeta {
         match &self.inner {
             RecordingMetaInner::Instant(_) => self.project_path.join("content/output.mp4"),
             RecordingMetaInner::Studio(_) => self.project_path.join("output").join("result.mp4"),
+            RecordingMetaInner::InProgress { recording } => todo!(),
         }
     }